Changeset 12819 for extensions/PHP_Optimisateur/plugins/convert_pan/main.php

Timestamp:

Jan 1, 2012, 10:09:17 PM (12 years ago)

Author:

mistic100

Message:

fix detection regex and watermark position

File:

• extensions/PHP_Optimisateur/plugins/convert_pan/main.php (modified) (2 diffs)

extensions/PHP_Optimisateur/plugins/convert_pan/main.php

@@ -1 +1 @@
 <?php
 /***************************************\
-|                       PHP OPTIMISATEUR                        |
-|                 Plugin ConvertPan 1.3                 |
+|            PHP OPTIMISATEUR           |
+|          Plugin ConvertPan 1.3        |
 \***************************************/
 
@@ -8 +8 @@
 ## Crée des miniatures rognées pour ne pas avoir de minuscules images
 
-$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
+$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 (!isset($BlockAll)) {
 
 if (
-        ($CP_detectmode == 'name' AND strpos($file['name'],$CP_namepanorama) !== false) OR 
-        ($CP_detectmode == 'ratio' AND $FileInfos['Width']/$FileInfos['Height'] >= $CP_ratiopan)
+  ($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) { 
-                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;
-        }
-        
-        if (!isset($BlockThumbnail) AND $CP_ratiopanthumb != 0) { 
-                $DIMthumbnailV = $CONF['DIMthumbnail']/$CP_ratiopanthumb;
-                
-                // on prend la miniature au milieu du panorama
-                $tmp_x = $FileInfos['Width'] * $DIMthumbnailV / $FileInfos['Height'];
-                $offset_x = ($tmp_x - $CONF['DIMthumbnail']) / 2;
-                
-                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;
-        }
+  if (!isset($BlockNormal) AND $CP_dimpanorama != 0) { 
+    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;
+  }
+  
+  if (!isset($BlockThumbnail) AND $CP_ratiopanthumb != 0) { 
+    $DIMthumbnailV = $CONF['DIMthumbnail']/$CP_ratiopanthumb;
+    
+    // on prend la miniature au milieu du panorama
+    $tmp_x = $FileInfos['Width'] * $DIMthumbnailV / $FileInfos['Height'];
+    $offset_x = ($tmp_x - $CONF['DIMthumbnail']) / 2;
+    
+    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;
+  }
 }