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

Timestamp:

Apr 12, 2011, 7:45:22 PM (13 years ago)

Author:

mistic100

Message:

new version 1.4, new plugin for Charlies Content, NConvert updated

File:

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

extensions/PHP_Optimisateur/include/main.php

@@ -17 +17 @@
                         $path = $dir.'/'.$file;
                         $new_path = $dir.'/'.delete_special_car($file);
-                        rename($path, $new_path);
+                        
+                        if ($path != $new_path) {
+                                rename_log($path, $new_path);
+                        }
                         
                         if (is_dir($new_path)) {
@@ -47 +50 @@
 
 $CONF['convOptions'] = '-ratio -rtype lanczos -rflag decr';
-$CONF['JPGexts'] = array('jpg', 'JPG'); // extensions admises pour le jpg
+$CONF['allowedExt'] = array('jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff');
 
 
@@ -68 +71 @@
 // Boucle sur tous les fichiers
 for ($i=0; $i<count($FilesSource); $i++) {
-        // Découpe le nom de fichier : dossier/fichier
-        preg_match('#(.*)/(.*).((?i)[a-z0-9]{3,4})$#', $FilesSortie[$i], $matches);
-        $FileFolder = $matches[1].'/'; // dossier de sortie
-        $FileName = $matches[2]; // nom final
-        $FileExt = $matches[3]; // extension orginale
-                
+        // Découpe le nom de fichier : dossier/fichier/extension
+        preg_match('#^(.*)/(.*)\.([a-z0-9]{2,4})$#', $FilesSource[$i], $matches);
+        $file['folder_src'] = $matches[1].'/'; // dossier d'entrée
+        $file['folder_out'] = str_replace($CONF['DIRsource'], $CONF['DIRsortie'], $file['folder_src']); // dossier de sortie
+        $file['name'] = $matches[2]; // nom final
+        $file['ext'] = $matches[3]; // extension orginale
+                        
         // Crée les sous-dossiers de sortie & 'pwg_high' & 'thumbnail'
-        if (!file_exists($FileFolder.'pwg_high') AND $CONF['DIRhighORNOT']) {
-                mkdir($FileFolder.'pwg_high', 0777, true);
+        if (!file_exists($file['folder_out'].'pwg_high') AND $CONF['DIRhighORNOT']) {
+                mkdir_log($file['folder_out'].'pwg_high');
         }
-        if (!file_exists($FileFolder.'thumbnail')) {
-                mkdir($FileFolder.'thumbnail', 0777, true);
+        if (!file_exists($file['folder_out'].'thumbnail')) {
+                mkdir_log($file['folder_out'].'thumbnail');
         }
         
-        // Informations sur le fichier
-        exec('include\nconvert.exe -info "'.$FilesSource[$i].'"', $FileInfos);
-        for ($m=0; $m<=5; $m++) {
-                unset($FileInfos[$m]);
+        if (!in_arrayi($file['ext'], $CONF['allowedExt'])) {
+                $BlockAll['main'] = true;
+                $LOG[] = 'Not image file : '.$FilesSource[$i];
         }
-        foreach ($FileInfos as $key) {
-                $a = explode(':', $key);
-                $FileInfos[trim($a[0])] = trim($a[1]);
+        
+        if (!isset($BlockAll)) {
+                // Informations sur le fichier
+                exec('include\nconvert.exe -info "'.$FilesSource[$i].'"', $FileInfos);
+                
+                for ($m=0; $m<=5; $m++) {
+                        unset($FileInfos[$m]);
+                }
+                foreach ($FileInfos as $key) {
+                        if ($key != '') {
+                                $a = explode(':', $key);
+                                $FileInfos[trim($a[0])] = trim($a[1]);
+                        }
+                }
         }
                 
@@ -107 +121 @@
         
         // Compresse les fichiers dans le dossier de sortie
-        if (!isset($BlockNormal)) { 
-                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($BlockNormal) AND !isset($BlockAll)) { 
+                nconvert('-q '.$CONF['Qnormal'].' -out jpeg -o "'.$file['folder_out'].$file['name'].'.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.'.jpg" -dpi 72 '.$CONF['convOptions'].' -resize '.$CONF['DIMthumbnail'].' '.$CONF['DIMthumbnail'].' -rmeta -rexifthumb "'.$FilesSource[$i].'"');
+        if (!isset($BlockThumbnail) AND !isset($BlockAll)) { 
+                nconvert('-q '.$CONF['Qthumbnail'].' -out jpeg -o "'.$file['folder_out'].'thumbnail/'.$CONF['prefixe_mini'].$file['name'].'.jpg" -dpi 72 '.$CONF['convOptions'].' -resize '.$CONF['DIMthumbnail'].' '.$CONF['DIMthumbnail'].' -rmeta -rexifthumb "'.$FilesSource[$i].'"');
         }
-        if (!isset($BlockHigh) AND $CONF['DIRhighORNOT']) {
+        if (!isset($BlockHigh) AND $CONF['DIRhighORNOT'] AND !isset($BlockAll)) {
                 if ($CONF['DIMhdORNOT']) {
-                        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.'.jpg" "'.$FilesSource[$i].'"');
+                        nconvert('-q '.$CONF['Qhd'].' -out jpeg -o "'.$file['folder_out'].'pwg_high/'.$file['name'].'.jpg" -dpi '.$CONF['DPI'].' '.$CONF['convOptions'].' -resize '.$CONF['DIMhd'].' '.$CONF['DIMhd'].' '.$CONF['copyHD'].' "'.$FilesSource[$i].'"');
+                } else if (strtolower($file['ext']) != 'jpg') {
+                        nconvert('-q '.$CONF['Qhd'].' -out jpeg -o "'.$file['folder_out'].'pwg_high/'.$file['name'].'.jpg" "'.$FilesSource[$i].'"');
                 } else {
-                        copy($FilesSource[$i], $FileFolder.'pwg_high/'.$FileName.'.jpg');
+                        copy_log($FilesSource[$i], $file['folder_out'].'pwg_high/'.$file['name'].'.jpg');
                 }
         }
         
-        // Réinitialise les bloqueurs
-        unset($FileInfos);
-        unset($BlockNormal);
-        unset($BlockThumbnail);
-        unset($BlockHigh);
+        // Réinitialise les variables
+        unset($file, $FileInfos, $BlockNormal, $BlockThumbnail, $BlockHigh, $BlockAll);
+        $LOG[] = "\r\n";
 }
 
@@ -139 +151 @@
                 rmdir($dir);
         } else if ($CONF['indexORNOT']) {
-                copy('include/index.php', $dir.'/index.php');
+                copy_log('include/index.php', $dir.'/index.php');
         }
 }