Changeset 12917 for trunk/admin/include/functions.php

Timestamp:

Jan 17, 2012, 10:02:16 PM (13 years ago)

Author:

rvelices

Message:

feature 2548 multisize - implement delete_element_derivatives

File:

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

trunk/admin/include/functions.php

@@ -3 +3 @@
 // | Piwigo - a PHP based photo gallery                                    |
 // +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
 // | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
 // | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
@@ -176 +176 @@
   }
 
-  include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
-  
   $new_ids = array();
 
@@ -184 +182 @@
     id,
     path,
-    tn_ext,
-    has_high,
     representative_ext
   FROM '.IMAGES_TABLE.'
@@ -197 +193 @@
       continue;
     }
-    
+
     $files = array();
     $files[] = get_element_path($row);
@@ -216 +212 @@
       }
     }
-    
+
     if ($ok)
     {
+      delete_element_derivatives($row);
       $new_ids[] += $row['id'];
     }
@@ -389 +386 @@
 {
   $orphan_tags = get_orphan_tags();
-  
+
   if (count($orphan_tags) > 0)
   {
@@ -413 +410 @@
 {
   $orphan_tags = array();
-  
+
   $query = '
 SELECT
@@ -1390 +1387 @@
     return false;
   }
-  
+
   $query = '
 DELETE
@@ -1397 +1394 @@
 ;';
   pwg_query($query);
-  
+
   $query = '
 DELETE
@@ -2039 +2036 @@
 {
   $result = pwg_query($query);
-  
+
   $taglist = array();
   while ($row = pwg_db_fetch_assoc($result))
@@ -2058 +2055 @@
       $row['name'] = preg_replace('#\[lang=(.*?)\](.*?)\[/lang\]#is', null, $row['name']);
     }
-    
+
     if (strlen($row['name']) > 0)
     {
@@ -2070 +2067 @@
     }
   }
-  
+
   $cmp = create_function('$a,$b', 'return strcasecmp($a["name"], $b["name"]);');
   usort($taglist, $cmp);
@@ -2137 +2134 @@
     return;
   }
-  
+
   // make sure categories are private and select uppercats or subcats
   $cat_ids = (isset($_POST['apply_on_sub'])) ? implode(',', get_subcat_ids($category_ids)).",".implode(',', get_uppercat_ids($category_ids)) : implode(',', get_uppercat_ids($category_ids));
@@ -2153 +2150 @@
     return;
   }
-  
+
   // We must not reinsert already existing lines in user_access table
   $granteds = array();
@@ -2160 +2157 @@
     $granteds[$cat_id] = array();
   }
-  
+
   $query = '
 SELECT
@@ -2176 +2173 @@
 
   $inserts = array();
-  
+
   foreach ($private_cats as $cat_id)
   {
     $grant_to_users = array_diff($user_ids, $granteds[$cat_id]);
-    
+
     foreach ($grant_to_users as $user_id)
     {
@@ -2208 +2205 @@
     $status_list[] = 'webmaster';
   }
-  
+
   $query = '
 SELECT
@@ -2246 +2243 @@
     $pattern .= derivative_to_url($types[0]);
   }
-  
+
   $pattern.='(_[a-zA-Z0-9]+)*\.[a-zA-Z0-9]{3,4}$#';
   if ($contents = opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR))
@@ -2295 +2292 @@
     }
     closedir($contents);
-    
+
     if ($rmdir)
     {
@@ -2309 +2306 @@
 }
 
-function delete_element_derivatives($ids)
-{
-  // todo
-  if (!is_array($ids))
-  {
-    $ids = array($ids);
-  }
-
-  // for now I do a massive clear, to be removed once the function is
-  // properly implemented
-  clear_derivative_cache();
+function delete_element_derivatives($infos)
+{
+  $path = $infos['path'];
+  if (!empty($infos['representative_ext']))
+  {
+    $path = original_to_representative( $path, $infos['representative_ext']);
+  }
+  if (substr_compare($path, '../', 0, 3)==0)
+  {
+    $path = substr($path, 3);
+  }
+  $dot = strpos($path, '.');
+  $path = substr_replace($path, '-*', $dot, 0);
+  foreach( glob(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$path) as $file)
+  {
+    @unlink($file);
+  }
 }
 ?>