Changeset 9276 for extensions/PHP_Optimisateur/include/main.php

Timestamp:

Feb 18, 2011, 5:34:50 PM (13 years ago)

Author:

mistic100

Message:

[extensions] PHP Optimisateur

• fix many path bugs
• debug some plugins
• add ratio detection for ConvertPan

File:

• extensions/PHP_Optimisateur/include/main.php (modified) (3 diffs)

extensions/PHP_Optimisateur/include/main.php

@@ -71 +71 @@
         preg_match('#(.*)/(.*).([a-z]{3})$#', $FilesSortie[$i], $matches);
         $FileFolder = $matches[1].'/'; // dossier de sortie
-        $FileName = $matches[2].'.jpg'; // nom final
+        $FileName = $matches[2]; // nom final
         $FileExt = $matches[3]; // extension orginale
                 
@@ -101 +101 @@
         // Compresse les fichiers dans le dossier de sortie
         if (!isset($BlockNormal)) { 
-                exec('include\nconvert.exe -q '.$CONF['Qnormal'].' -out jpeg -o "'.$FileFolder.$FileName.'" -dpi 72 '.$CONF['convOptions'].' -resize '.$CONF['DIMnormal'].' '.$CONF['DIMnormal'].' '.$CONF['copyNormal'].' "'.$FilesSource[$i].'"');
+                exec('include\nconvert.exe -q '.$CONF['Qnormal'].' -out jpeg -o "'.$FileFolder.$FileName.'.jpg" -dpi 72 '.$CONF['convOptions'].' -resize '.$CONF['DIMnormal'].' '.$CONF['DIMnormal'].' '.$CONF['copyNormal'].' "'.$FilesSource[$i].'"');
         }
         if (!isset($BlockThumbnail)) { 
-                exec('include\nconvert.exe -q '.$CONF['Qthumbnail'].' -out jpeg -o "'.$FileFolder.'thumbnail/'.$CONF['prefixe_mini'].$FileName.'" -dpi 72 '.$CONF['convOptions'].' -resize '.$CONF['DIMthumbnail'].' '.$CONF['DIMthumbnail'].' -rmeta -rexifthumb "'.$FilesSource[$i].'"');
+                exec('include\nconvert.exe -q '.$CONF['Qthumbnail'].' -out jpeg -o "'.$FileFolder.'thumbnail/'.$CONF['prefixe_mini'].$FileName.'.jpg" -dpi 72 '.$CONF['convOptions'].' -resize '.$CONF['DIMthumbnail'].' '.$CONF['DIMthumbnail'].' -rmeta -rexifthumb "'.$FilesSource[$i].'"');
         }
         if (!isset($BlockHigh) AND $CONF['DIRhighORNOT']) {
                 if ($CONF['DIMhdORNOT']) {
-                        exec('include\nconvert.exe -q '.$CONF['Qhd'].' -out jpeg -o "'.$FileFolder.'pwg_high/'.$FileName.'" -dpi '.$CONF['DPI'].' '.$CONF['convOptions'].' -resize '.$CONF['DIMhd'].' '.$CONF['DIMhd'].' '.$CONF['copyHD'].' "'.$FilesSource[$i].'"');
+                        exec('include\nconvert.exe -q '.$CONF['Qhd'].' -out jpeg -o "'.$FileFolder.'pwg_high/'.$FileName.'.jpg" -dpi '.$CONF['DPI'].' '.$CONF['convOptions'].' -resize '.$CONF['DIMhd'].' '.$CONF['DIMhd'].' '.$CONF['copyHD'].' "'.$FilesSource[$i].'"');
                 } else if (!in_array($FileExt, $CONF['JPGexts'])) {
-                        exec('include\nconvert.exe -q '.$CONF['Qhd'].' -out jpeg -o "'.$FileFolder.'pwg_high/'.$FileName.'" "'.$FilesSource[$i].'"');
+                        exec('include\nconvert.exe -q '.$CONF['Qhd'].' -out jpeg -o "'.$FileFolder.'pwg_high/'.$FileName.'.jpg" "'.$FilesSource[$i].'"');
                 } else {
-                        copy($FilesSource[$i], $FileFolder.'pwg_high/'.$FileName);
+                        copy($FilesSource[$i], $FileFolder.'pwg_high/'.$FileName.'.jpg');
                 }
         }
@@ -132 +132 @@
                 rmdir($dir);
         } else if ($CONF['indexORNOT']) {
-                copy('includes/index.php', $dir.'/index.php');
+                copy('include/index.php', $dir.'/index.php');
         }
 }