Changeset 16981 for extensions/rotateImage/ws_functions.inc.php

Timestamp:

Jul 24, 2012, 7:18:01 PM (12 years ago)

Author:

plg

Message:

Insert a new tab "Rotate" on the photo administration screen (requires Piwigo 2.4.2)

File:

• extensions/rotateImage/ws_functions.inc.php (modified) (3 diffs)

extensions/rotateImage/ws_functions.inc.php

@@ -2 +2 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
+include_once(dirname(__FILE__).'/functions.inc.php');
 
 $service = &$arr[0];
@@ -28 +29 @@
   }
 
-  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.php');
-  include_once(PHPWG_ROOT_PATH.'admin/include/image.class.php');
+  /* if (empty($params['pwg_token']) or get_pwg_token() != $params['pwg_token']) */
+  /* { */
+  /*   return new PwgError(403, 'Invalid security token'); */
+  /* } */
 
   $image_id=(int)$params['image_id'];
-  
+
   $query='
 SELECT
-    id,
-    path,
-    representative_ext,
-    rotation
+    id
   FROM '.IMAGES_TABLE.'
   WHERE id = '.$image_id.'
@@ -53 +48 @@
   }
 
-  $base_angle = pwg_image::get_rotation_angle_from_code($row['rotation']);
-
-  if (get_boolean($params['rotate_hd'])) {
-    if ('auto' == $angle) {
-      $angle = pwg_image::get_rotation_angle($row['path']);
-      $rotation_code = 0;
-    }
-    else {
-      // the angle is based on what the user sees (the thumbnail) and not on
-      // the original, which may have a different angle
-      $angle = ($base_angle + $params['angle']) % 360;
-
-      // the derivatives must not be rotated
-      $rotation_code = 4;
-    }
-
-    if (isset($conf['rotate_image_jpegtran']) and $conf['rotate_image_jpegtran']) {
-      $angle = ($angle + 180) % 360;
-      $command = 'jpegtran -copy all -rotate '.$angle.' -outfile '.$row['path'].' '.$row['path'];
-      exec($command);
-    }
-    else {
-      $image = new pwg_image($row['path']);
-      $image->set_compression_quality(98);
-      $image->rotate($angle);
-      $image->write($row['path']);
-    }
-
-    $conf['use_exif'] = false;
-    $conf['use_iptc'] = false;
-    sync_metadata(array($row['id']));
-
-    single_update(
-      IMAGES_TABLE,
-      array('rotation' => $rotation_code),
-      array('id' => $row['id'])
-    );
-  }
-  elseif ('auto' != $params['angle']) {
-    $new_angle = ($base_angle + $params['angle']) % 360;
-    $rotation_code = pwg_image::get_rotation_code_from_angle($new_angle);
-
-    // to show that it's a manual rotation, we use 4,5,6,7 instead of 0,1,2,3
-    $rotation_code+= 4;
-
-    single_update(
-      IMAGES_TABLE,
-      array('rotation' => $rotation_code),
-      array('id' => $row['id'])
-    );
-  }
-
-  delete_element_derivatives($row);
+  rotate_image($image_id, get_boolean($params['rotate_hd']), $params['angle']);
   
   return true;