Changeset 6873 for trunk/admin/include

Timestamp:

Sep 9, 2010, 10:10:50 PM (14 years ago)

Author:

rvelices

Message:

feature 1845 : be able to delete photos added through ftp synchronization

File:

• trunk/admin/include/functions.php (modified) (4 diffs)

trunk/admin/include/functions.php

@@ -132 +132 @@
 //    - all the links between categories and elements
 //    - all the favorites associated to elements
+// @return number of deleted elements
 function delete_elements($ids, $physical_deletion=false)
 {
   if (count($ids) == 0)
   {
-    return;
+    return 0;
   }
   trigger_action('begin_delete_elements', $ids);
@@ -143 +144 @@
   {
     include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
-
-    // we can currently delete physically only photo with no
-    // storage_category_id (added via pLoader)
-    //
-    // we assume that the element is a photo, with no representative
+    $new_ids=array();
+
     $query = '
 SELECT
@@ -153 +151 @@
     path,
     tn_ext,
-    has_high
+    has_high,
+    representative_ext
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', $ids).')
-    AND storage_category_id IS NULL
 ;';
     $result = pwg_query($query);
     while ($row = pwg_db_fetch_assoc($result))
     {
-      $file_path = $row['path'];
-      $thumbnail_path = get_thumbnail_path($row);
-      $high_path = null;
-      if (isset($row['has_high']) and get_boolean($row['has_high']))
+      if (url_is_remote($row['path']))
+        continue;
+      $files = array();
+      $files[] = get_element_path($row);
+      if (!empty($row['tn_ext']))
+        $files[] = get_thumbnail_path($row);
+      if (!empty($row['has_high']) and get_boolean($row['has_high']))
+        $files[] = get_high_path($row);
+      if (!empty($row['representative_ext']))
       {
-        $high_path = get_high_path($row);
+        $pi = pathinfo($row['path']);
+        $file_wo_ext = get_filename_wo_extension($pi['basename']);
+        $files[] = PHPWG_ROOT_PATH.$pi['dirname'].'/pwg_representative/'.$file_wo_ext.'.'.$element_info['representative_ext'];
       }
 
-      foreach (array($file_path, $thumbnail_path, $high_path) as $path)
+      $ok = true;
+      foreach ($files as $path)
       {
-        if (isset($path) and is_file($path) and !unlink($path))
+        if (is_file($path) and !unlink($path))
         {
-          die('"'.$path.'" cannot be removed');
+          $ok = false;
+          trigger_error('"'.$path.'" cannot be removed', E_USER_WARNING);
+          break;
         }
       }
+      if ($ok)
+        $new_ids[] += $row['id'];
+      else
+        break;
+    }
+    $ids = $new_ids;
+    if (count($ids)==0)
+    {
+      return 0;
     }
   }
@@ -250 +267 @@
 
   trigger_action('delete_elements', $ids);
+  return count($ids);
 }