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

extensions/PHP_Optimisateur/plugins/convert_pan/main.php

@@ -2 +2 @@
 /***************************************\
 |                       PHP OPTIMISATEUR                        |
-|                 Plugin ConvertPan 1.1                 |
+|                 Plugin ConvertPan 1.2                 |
 \***************************************/
 
@@ -8 +8 @@
 ## Crée des miniatures rognées pour ne pas avoir de minuscules images
 
-$NAMEpanorama = $CONF['Plugins']['convert_pan']['NAMEpanorama']; // Suffixe des panoramas
-$DIMpanorama = $CONF['Plugins']['convert_pan']['DIMpanorama']; // Hauteur des panoramas normaux
-$RatioPanThumb = $CONF['Plugins']['convert_pan']['RatioPanThumb']; // Ratio des miniatures
+$CP_namepanorama = $CONF['Plugins']['convert_pan']['NAMEpanorama'];     // Suffixe des panoramas
+$CP_detectmode = $CONF['Plugins']['convert_pan']['DetectMode'];                 // Mode de détection
+$CP_dimpanorama = $CONF['Plugins']['convert_pan']['DIMpanorama'];               // Hauteur des panoramas normaux
+$CP_ratiopan = $CONF['Plugins']['convert_pan']['RatioPan'];                     // Ratio des panoramas
+$CP_ratiopanthumb = $CONF['Plugins']['convert_pan']['RatioPanThumb'];   // Ratio des miniatures
 
-if (strpos($FileName, $NAMEpanorama) !== false) {
-        if (!isset($BlockNormal) AND $DIMpanorama != 0) { 
-                exec('files\nconvert.exe -q '.$CONF['Qnormal'].' -out jpeg -o "'.$FileFolder.$FileName.'" -dpi 72 '.$CONF['convOptions'].' -resize 0 '.$DIMpanorama.' '.$CONF['copyNormal'].' "'.$FilesSource[$i].'"');
-                $BlockNormal = true;
+if (($CP_detectmode == 'name' AND strpos($FileName,$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].'"');
+                $BlockNormal['convert_pan'] = true;
         }
         
-        if (!isset($BlockThumbnail) AND $RatioPanThumb != 0) { 
-                $DIMthumbnailV = $CONF['DIMthumbnail']/$CONF['Plugins']['convert_pan']['RatioPanThumb'];
+        if (!isset($BlockThumbnail) AND $CP_ratiopanthumb != 0) { 
+                $DIMthumbnailV = $CONF['DIMthumbnail']/$CP_ratiopanthumb;
                 
                 // on prend la miniature au milieu du panorama
@@ -25 +28 @@
                 $offset_x = ($tmp_x - $CONF['DIMthumbnail']) / 2;
                 
-                exec('files\nconvert.exe -q '.$CONF['Qthumbnail'].' -out jpeg -o "'.$FileFolder.'thumbnail/'.$CONF['prefixe_mini'].$FileName.'" -dpi 72 '.$CONF['convOptions'].' -resize 0 '.$DIMthumbnailV.' -crop '.$offset_x.' 0 '.$CONF['DIMthumbnail'].' '.$DIMthumbnailV.' -rmeta -rexifthumb "'.$FilesSource[$i].'"');
-                $BlockThumbnail = true;
+                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].'"');
+                $BlockThumbnail['convert_pan'] = true;
         }
 }