Changeset 10337 for extensions/PHP_Optimisateur/plugins/convert_pan/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/plugins/convert_pan/main.php (modified) (3 diffs)

extensions/PHP_Optimisateur/plugins/convert_pan/main.php

@@ -2 +2 @@
 /***************************************\
 |                       PHP OPTIMISATEUR                        |
-|                 Plugin ConvertPan 1.2                 |
+|                 Plugin ConvertPan 1.3                 |
 \***************************************/
 
@@ -14 +14 @@
 $CP_ratiopanthumb = $CONF['Plugins']['convert_pan']['RatioPanThumb'];   // Ratio des miniatures
 
-if (($CP_detectmode == 'name' AND strpos($FileName,$CP_namepanorama) !== false) OR ($CP_detectmode == 'ratio' AND $FileInfos['Width']/$FileInfos['Height'] >= $CP_ratiopan)) {
+if (!isset($BlockAll)) {
+
+if (
+        ($CP_detectmode == 'name' AND strpos($file['name'],$CP_namepanorama) !== false) OR 
+        ($CP_detectmode == 'ratio' AND $FileInfos['Width']/$FileInfos['Height'] >= $CP_ratiopan)
+) {
 
         if (!isset($BlockNormal) AND $CP_dimpanorama != 0) { 
-                exec('include\nconvert.exe -q '.$CONF['Qnormal'].' -out jpeg -o "'.$FileFolder.$FileName.'.jpg" -dpi 72 '.$CONF['convOptions'].' -resize 0 '.$CP_dimpanorama.' '.$CONF['copyNormal'].' "'.$FilesSource[$i].'"');
+                nconvert('-q '.$CONF['Qnormal'].' -out jpeg -o "'.$file['folder_out'].$file['name'].'.jpg" -dpi 72 '.$CONF['convOptions'].' -resize 0 '.$CP_dimpanorama.' '.$CONF['copyNormal'].' "'.$FilesSource[$i].'"');
                 $BlockNormal['convert_pan'] = true;
         }
@@ -28 +33 @@
                 $offset_x = ($tmp_x - $CONF['DIMthumbnail']) / 2;
                 
-                exec('include\nconvert.exe -q '.$CONF['Qthumbnail'].' -out jpeg -o "'.$FileFolder.'thumbnail/'.$CONF['prefixe_mini'].$FileName.'.jpg" -dpi 72 '.$CONF['convOptions'].' -resize 0 '.$DIMthumbnailV.' -crop '.$offset_x.' 0 '.$CONF['DIMthumbnail'].' '.$DIMthumbnailV.' -rmeta -rexifthumb "'.$FilesSource[$i].'"');
+                nconvert('-q '.$CONF['Qthumbnail'].' -out jpeg -o "'.$file['folder_out'].'thumbnail/'.$CONF['prefixe_mini'].$file['name'].'.jpg" -dpi 72 '.$CONF['convOptions'].' -resize 0 '.$DIMthumbnailV.' -crop '.$offset_x.' 0 '.$CONF['DIMthumbnail'].' '.$DIMthumbnailV.' -rmeta -rexifthumb "'.$FilesSource[$i].'"');
                 $BlockThumbnail['convert_pan'] = true;
         }
 }
+
+}
 ?>