Changeset 10563 for trunk/include/ws_functions.inc.php

Timestamp:

Apr 22, 2011, 1:34:57 PM (14 years ago)

Author:

patdenice

Message:

feature:2274
pwg.images.resize method is able to create or regenerate image from image path.

File:

• trunk/include/ws_functions.inc.php (modified) (4 diffs)

trunk/include/ws_functions.inc.php

@@ -2674 +2674 @@
   }
 
+  if (empty($params['image_id']) and empty($params['image_path']))
+  {
+    return new PwgError(403, "image_id or image_path is missing");
+  }
+
   $resize_params = array('maxwidth', 'maxheight', 'quality', 'crop', 'follow_orientation');
   $type = $params['type'] == 'thumbnail' ? 'thumb' : 'websize';
@@ -2682 +2687 @@
   }
 
-  $query='
+  include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
+  include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
+
+  if (!empty($params['image_id']))
+  {
+    $query='
 SELECT id, path, tn_ext, has_high
-FROM '.IMAGES_TABLE.'
-WHERE id = '.(int)$params['image_id'].'
+  FROM '.IMAGES_TABLE.'
+  WHERE id = '.(int)$params['image_id'].'
 ;';
-  $image = pwg_db_fetch_assoc(pwg_query($query));
-
-  if ($image == null)
-  {
-    return new PwgError(403, "image_id not found");
-  }
-
-  include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
-
-  if (!is_valid_image_extension(get_extension($image['path'])))
+    $image = pwg_db_fetch_assoc(pwg_query($query));
+
+    if ($image == null)
+    {
+      return new PwgError(403, "image_id not found");
+    }
+
+    $image_path = $image['path'];
+    $thumb_path = get_thumbnail_path($image);
+    $hd_path = get_high_path($image);
+  }
+  else
+  {
+    $image_path = $params['image_path'];
+    $thumb_path = file_path_for_type($image_path, 'thumb');
+    $hd_path = file_path_for_type($image_path, 'high');
+  }
+
+  if (!is_valid_image_extension(get_extension($image_path)))
   {
     return new PwgError(403, "image can't be resized");
   }
 
-  if ($params['type'] == 'thumbnail' and !empty($image['tn_ext']))
-  {
-    trigger_event(
+  $result = false;
+
+  if ($params['type'] == 'thumbnail' and file_exists($image_path))
+  {
+    prepare_directory(dirname($thumb_path));
+
+    $result = trigger_event(
       'upload_thumbnail_resize',
       false,
-      $image['path'],
-      get_thumbnail_path($image),
+      $image_path,
+      $thumb_path,
       $params['maxwidth'],
       $params['maxheight'],
@@ -2715 +2738 @@
       get_boolean($params['follow_orientation'])
     );
-    return true;
-  }
-  elseif (!empty($image['has_high']))
-  {
-    trigger_event(
+  }
+  elseif (file_exists($hd_path))
+  {
+    $result = trigger_event(
       'upload_image_resize',
       false,
-      file_path_for_type($image['path'], 'high'),
-      $image['path'],
+      $hd_path,
+      $image_path,
       $params['maxwidth'],
       $params['maxheight'],
@@ -2730 +2752 @@
       );
 
-    $conf['use_exif'] = false;
-    $conf['use_iptc'] = false;
-    update_metadata(array($image['id'] => $image['path']));
-
-    return true;
-  }
-  return false;
+    if (!empty($image['has_high']))
+    {
+      $conf['use_exif'] = false;
+      $conf['use_iptc'] = false;
+      update_metadata(array($image['id'] => $image['path']));
+    }
+  }
+  return $result;
 }