Changeset 12417

Timestamp:

Oct 12, 2011, 8:40:15 PM (13 years ago)

Author:

Dsls

Message:

rotateImage v0.3 :

• thumbnails are correctly refreshed
• strengthened ws
• small tuning on form display
• it is now possible to select whether HD should be rotated or not

Location:

extensions/rotateImage

Files:

• language/fr_FR/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• rotate_image.tpl (modified) (4 diffs)
• ws_functions.inc.php (modified) (4 diffs)

extensions/rotateImage/language/fr_FR/plugin.lang.php

@@ -2 +2 @@
 $lang['Images rotation in progress...'] = 'Rotation des images en cours...';
 $lang['Rotate images'] = 'Pivoter les images';
-$lang['Rotate 90° right'] = 'Rotation de 90° à droite';
-$lang['Rotate 90° left'] = 'Rotation de 90° à gauche';
-$lang['Rotate 180°'] = 'Rotation de 180°';
-
+$lang['Angle'] = 'Angle';
+$lang['Also rotate HD image'] = 'Pivoter aussi l\'image HD';
+$lang['90° right'] = '90° à droite';
+$lang['90° left'] = '90° à gauche';
+$lang['180°'] = '180°';
 ?>

extensions/rotateImage/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Rotate Image
-Version: 0.2
+Version: 0.3
 Description: enables to rotate images in batch processing
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=578
@@ -10 +10 @@
 add_event_handler('loc_begin_element_set_global', 'rotate_image_set_template_data');
 add_event_handler('ws_add_methods', 'add_image_rotate_method');
+add_event_handler('element_set_global_action', 'rotate_image_element_action', 50, 2);
 
 function add_image_rotate_method($arr)
 {
-  include_once('ws_functions.inc.php');
+ include_once('ws_functions.inc.php');
 }
 
 function rotate_image_set_template_data() {
-        global $template,$lang;
-    load_language('plugin.lang', dirname(__FILE__).'/');
-        $template->set_filename('rotate_image', realpath(dirname(__FILE__).'/rotate_image.tpl'));
-        $template->append('element_set_global_plugins_actions', array(
+  global $template,$lang;
+  load_language('plugin.lang', dirname(__FILE__).'/');
+  $angles = array (
+    array('value' => 90, 'name' => l10n('90° left')),
+    array('value' => 270, 'name' => l10n('90° right')),
+    array('value' => 180, 'name' => l10n('180°'))
+  );
+  
+  $template->assign(array(
+    'RI_PWG_TOKEN' => get_pwg_token(),
+    'angles' => $angles,
+    'angle_value' => 90
+  ));
+  $template->set_filename('rotate_image', realpath(dirname(__FILE__).'/rotate_image.tpl'));
+  $template->append('element_set_global_plugins_actions', array(
     'ID' => 'rotateImg',
     'NAME' => l10n('Rotate images'),
-    'CONTENT' => $template->parse('rotate_image', true),
-    )
+    'CONTENT' => $template->parse('rotate_image', true))
   );
 }
 
-
+function rotate_image_element_action($action, $collection) {
+  global $template;
+  if ($action == 'rotateImg') {
+    //flush thumbnails links by regenerating ramdom ids to uris
+    $template->delete_compiled_templates();
+  }
+}
 
 ?>

extensions/rotateImage/rotate_image.tpl

@@ -1 @@
-{footer_script}
+{footer_script}
 var rotateImagesMessage = "{'Images rotation in progress...'|@translate}";
-
+var ri_pwg_token = '{$RI_PWG_TOKEN}';
 {literal}
   jQuery('#applyAction').click(function(e) {
@@ -10 +10 @@
     else if (jQuery('[name="selectAction"]').val() == 'rotateImg')
     {
-      angle = jQuery('input[name="rotate_angle"]:checked').val();
+      angle = jQuery('select[name="rotate_angle"]').val();
       e.stopPropagation();
     }
@@ -55 +55 @@
           format: 'json',
           angle: angle,
+          pwg_token: ri_pwg_token,
           image_id: elements[i]
         },
@@ -68 +69 @@
 
 <div id="rotate_image" class="bulkAction">
-  <p>{'Select angle :'|@translate}</p>
-  <label><input type="radio" name="rotate_angle" value="90" checked="checked"> {'Rotate 90° left'|@translate}</label>
-  <label><input type="radio" name="rotate_angle" value="270"> {'Rotate 90° right'|@translate}</label>
-  <label><input type="radio" name="rotate_angle" value="180"> {'Rotate 180°'|@translate}</label>
+      <table style="margin-left:20px;">
+        <tr>
+          <th id="thumb_width_th">{'Angle'|@translate}</th>
+          <td>
+          <select name="rotate_angle">
+            {foreach from=$angles item=angle}
+              <option value="{$angle.value}" {if $saved_angle eq $angle.value}selected="selected"{/if}>{$angle.name}</option>
+            {/foreach}
+          </select>
+          </td>
+        </tr>
+        <tr>
+          <th><label for="rotate_hd">{'Also rotate HD image'|@translate}</label></th>
+          <td><input type="checkbox" name="rotate_hd" id="rotate_hd" {if $upload_form_settings.thumb_crop}checked="checked"{/if}></td>
+        </tr>
+      </table>
 </div>

extensions/rotateImage/ws_functions.inc.php

@@ -9 +9 @@
   'image_id'=>array(),
   'angle'=>array('default'=>"90"),
+  'pwg_token' => array(),
+  'rotate_hd' => array('default'=>0)
   ),
   'Rotates a given image'
@@ -25 +27 @@
   }
 
+  if (empty($params['pwg_token']) or get_pwg_token() != $params['pwg_token'])
+  {
+    return new PwgError(403, 'Invalid security token');
+  }
+
   include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
   include_once(PHPWG_ROOT_PATH.'admin/include/image.class.php');
   $image_id=(int)$params['image_id'];
   $angle=(int)$params['angle'];
+  $rotate_hd = (int) $params['rotate_hd'];
   $query='
 SELECT id, path, tn_ext, has_high
@@ -49 +57 @@
   $img->write($image_path);
   update_metadata(array($image_id=>$image_path));
+  if ($rotate_hd) {
+    $sizes = array('thumb','high');
+  } else {
+    $sizes = array('thumb');
+  }
   
-  foreach (array('thumb','high') as $size) {
+  foreach ($sizes as $size) {
     $resized_path = file_path_for_type($image_path,$size);
     if (file_exists($resized_path)) {
@@ -59 +72 @@
   }
   return true;
-  
 }