Changeset 10337 for extensions/PHP_Optimisateur/plugins/create_custom_thumbs

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

Location:

extensions/PHP_Optimisateur/plugins/create_custom_thumbs

Files:

• lang (deleted)
• language (added)
• language/en_UK.php (added)
• language/fr_FR.php (added)
• main.php (modified) (5 diffs)
• setup.php (modified) (3 diffs)

extensions/PHP_Optimisateur/plugins/create_custom_thumbs/main.php

@@ -2 +2 @@
 /***************************************\
 |                       PHP OPTIMISATEUR                        |
-|         Plugin CreateCustomThumbs 1.0.a       |
+|         Plugin CreateCustomThumbs 1.1         |
 \***************************************/
 
@@ -8 +8 @@
 ## Dépend de la valeur de $CONF['DIMthumbnail']
 
+if (!isset($BlockAll)) {
+
 // CreateCustomThumbs à la priorité sur ConvertPan
 if (isset($BlockThumbnail['convert_pan']) OR !isset($BlockThumbnail)) { 
 
-        $FileSource = $FilesSource[$i]; // fichier de travail
+        if(!isset($CCT_filesource)) $CCT_filesource = $FilesSource[$i]; // fichier de travail
         $CCT_dimthumbnail = $CONF['Plugins']['create_custom_thumbs']['DIMthumbnailV']; // Hauteur de l'image
         $CCT_frameparams = $CONF['Plugins']['create_custom_thumbs']['FRAMEparams']; // Paramètres du cadre
@@ -30 +32 @@
                 }
                 
-                $offset_x = ($tmp_x - $CONF['DIMthumbnail']) / 2;
-                $offset_y = ($tmp_y - $CCT_dimthumbnail) / 2;
+                $offset_x = ceil(($tmp_x - $CONF['DIMthumbnail']) / 2);
+                $offset_y = ceil(($tmp_y - $CCT_dimthumbnail) / 2);
                 
-                exec('include\nconvert.exe -overwrite -q '.$CONF['Qthumbnail'].' -out jpeg -o "'.$FileFolder.'thumbnail/'.$CONF['prefixe_mini'].$FileName.'.jpg" -dpi 72 '.$CONF['convOptions'].' -resize '.$resize_param.' -crop '.$offset_x.' '.$offset_y.' '.$CONF['DIMthumbnail'].' '.$CCT_dimthumbnail.' -rmeta -rexifthumb        "'.$FileSource.'"');
+                nconvert('-overwrite -q '.$CONF['Qthumbnail'].' -out jpeg -o "'.$file['folder_out'].'thumbnail/'.$CONF['prefixe_mini'].$file['name'].'.jpg" -dpi 72 '.$CONF['convOptions'].' -resize '.$resize_param.' -crop '.$offset_x.' '.$offset_y.' '.$CONF['DIMthumbnail'].' '.$CCT_dimthumbnail.' -rmeta -rexifthumb "'.$CCT_filesource.'"');
                 
                 $BlockThumbnail['create_custom_thumbs'] = true;
-                $FileSource = $FileFolder.'thumbnail/'.$CONF['prefixe_mini'].$FileName.'.jpg';
+                $CCT_filesource = $file['folder_out'].'thumbnail/'.$CONF['prefixe_mini'].$file['name'].'.jpg';
         }
 
@@ -42 +44 @@
         if ($CCT_frameparams['size1'] != 0 OR $CCT_frameparams['size2'] != 0) {
                 // Si la miniature n'a pas encore été générée il faut le faire
-                if ($FileSource == $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].'"');
-                        $FileSource = $FileFolder.'thumbnail/'.$CONF['prefixe_mini'].$FileName.'.jpg';
+                if ($CCT_filesource == $FilesSource[$i]) {
+                        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].'"');
+                        $CCT_filesource = $file['folder_out'].'thumbnail/'.$CONF['prefixe_mini'].$file['name'].'.jpg';
                 }
 
-                $img = imagecreatefromjpeg($FileSource);
+                $img = imagecreatefromjpeg($CCT_filesource);
                 $x = imagesx($img)-1;
                 $y = imagesy($img)-1;
@@ -63 +65 @@
                 }
                 
-                imagejpeg($img, $FileFolder.'thumbnail/'.$CONF['prefixe_mini'].$FileName.'.jpg', $CONF['Qthumbnail']);
+                imagejpeg($img, $file['folder_out'].'thumbnail/'.$CONF['prefixe_mini'].$file['name'].'.jpg', $CONF['Qthumbnail']);
                 imagedestroy($img);
                 
                 $BlockThumbnail['create_custom_thumbs'] = true;
-                $FileSource = $FileFolder.'thumbnail/'.$CONF['prefixe_mini'].$FileName.'.jpg';
+                $CCT_filesource = $file['folder_out'].'thumbnail/'.$CONF['prefixe_mini'].$file['name'].'.jpg';
         }
 }
 
+}
 ?>

extensions/PHP_Optimisateur/plugins/create_custom_thumbs/setup.php

@@ -1 +1 @@
 <?php
+load_plugin_lang('create_custom_thumbs');
+
 switch ($PLUGIN_ACTION) {
         // Affichage simple de la configuration
         case 'read_config':
-                load_plugin_lang('create_custom_thumbs');
-                
                 $plugin_config['FRAMEparams']['color1'] = nice_hex_color($plugin_config['FRAMEparams']['color1']);
                 $plugin_config['FRAMEparams']['color2'] = nice_hex_color($plugin_config['FRAMEparams']['color2']);
                 
-                $PAGE_CONTENT[0] .= '
+                $PAGE['content'] .= '
                 <table>
                         <tr>
                                 <td>'.l10n('create_custom_thumbs.DIMthumbnailV').' :</td>
-                                <td>'.bool_to_string($plugin_config['DIMthumbnailV']).'</td>
+                                <td>'.bool_to_string($plugin_config['DIMthumbnailV']).' px</td>
                         </tr>
                         <tr>
@@ -36 +36 @@
         // Actions avant enregistrement
         case 'save_config':
-                $_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['color1'] = str_replace('#','', $_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['color1']);
-                $_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['color2'] = str_replace('#','', $_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['color2']);
+                $_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['color1'] = str_replace('#',null, $_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['color1']);
+                $_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['color2'] = str_replace('#',null, $_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['color2']);
                 
                 if (!is_decimal($_POST['Plugins']['create_custom_thumbs']['DIMthumbnailV'])) {
                         $_POST['Plugins']['create_custom_thumbs']['DIMthumbnailV'] = 0;
-                        $Errors['ErrorConfig'] = 'notice';
+                        $ERRORS['conf'][] = array(l10n('create_custom_thumbs.DIMthumbnailV'), 'must_be_integer');
                 }
                 if (!is_decimal($_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['size1'])) {
                         $_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['size1'] = 0;
-                        $Errors['ErrorConfig'] = 'notice';
+                        $ERRORS['conf'][] = array(l10n('create_custom_thumbs.FRAMEparams').' 1', 'must_be_integer');
                 }
                 if (!is_decimal($_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['size2'])) {
                         $_POST['Plugins']['create_custom_thumbs']['FRAMEparams']['size2'] = 0;
-                        $Errors['ErrorConfig'] = 'notice';
+                        $ERRORS['conf'][] = array(l10n('create_custom_thumbs.FRAMEparams').' 2', 'must_be_integer');
                 }
                 
@@ -57 +57 @@
         // Formulaire d'édition
         case 'edit_config':
-                load_plugin_lang('create_custom_thumbs');
-
                 $plugin_config['FRAMEparams']['color1'] = nice_hex_color($plugin_config['FRAMEparams']['color1']);
                 $plugin_config['FRAMEparams']['color2'] = nice_hex_color($plugin_config['FRAMEparams']['color2']);
                 
-                $PAGE_CONTENT[0] .='
+                $PAGE['content'] .='
                 <table>
                         <tr>
                                 <td>'.l10n('create_custom_thumbs.DIMthumbnailV').' :</td>
                                 <td>
-                                        <input type="text" name="Plugins[create_custom_thumbs][DIMthumbnailV]" value="'.$plugin_config['DIMthumbnailV'].'" size="3"/>
+                                        <input type="text" name="Plugins[create_custom_thumbs][DIMthumbnailV]" value="'.$plugin_config['DIMthumbnailV'].'" size="3"/>px
                                         <i>'.l10n('create_custom_thumbs.unactive').'</i>
                                 </td>