Changeset 16973 for extensions/rotateImage/main.inc.php

Timestamp:

Jul 24, 2012, 3:38:35 PM (12 years ago)

Author:

plg

Message:

compatibility with Piwigo 2.4

ability to use jpegtran with $confrotate_image_jpegtran = true : lossless photo rotation

File:

• extensions/rotateImage/main.inc.php (modified) (4 diffs)

extensions/rotateImage/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Rotate Image
-Version: 0.6
+Version: auto
 Description: enables to rotate images in batch processing
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=578
@@ -8 +8 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-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)
 {
@@ -17 +14 @@
 }
 
+add_event_handler('loc_begin_element_set_global', 'rotate_image_set_template_data');
 function rotate_image_set_template_data() {
   global $template,$lang;
   load_language('plugin.lang', dirname(__FILE__).'/');
+
+  include_once(PHPWG_ROOT_PATH.'admin/include/image.class.php');
+
   $angles = array (
-    array('value' => 90, 'name' => l10n('90° left')),
     array('value' => 270, 'name' => l10n('90° right')),
+    array('value' =>  90, 'name' => l10n('90° left')),
     array('value' => 180, 'name' => l10n('180°'))
   );
@@ -40 +41 @@
 }
 
+add_event_handler('element_set_global_action', 'rotate_image_element_action', 50, 2);
 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();
+    add_event_handler('get_derivative_url', 'rotate_image_force_refresh', EVENT_HANDLER_PRIORITY_NEUTRAL, 4);
   }
 }
 
+function rotate_image_force_refresh($root_url, $params, $src_image, $rel_url)
+{
+  global $collection;
+
+  if (in_array($src_image->id, $collection))
+  {
+    if (strpos($root_url, '?') === false)
+    {
+      $root_url.= '?';
+    }
+    else
+    {
+      $root_url.= '&';
+    }
+
+    $root_url.= 'rand='.md5(uniqid(rand(), true));
+  }
+
+  return $root_url;
+}
 ?>