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

Timestamp:

Aug 1, 2012, 9:03:17 PM (12 years ago)

Author:

rvelices

Message:

merge-r17295 from branch 2.4 feature 2708: in admin, display allowed custom derivatives and ability to delete them

File:

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

trunk/admin/include/functions.php

@@ -1570 +1570 @@
     return false;
   }
-  
+
   // let's first break links with all albums but their "storage album"
   $query = '
@@ -1580 +1580 @@
 ;';
   pwg_query($query);
-    
+
   if (is_array($categories) and count($categories) > 0)
   {
@@ -2277 +2277 @@
 function clear_derivative_cache($types='all')
 {
-  $pattern='#.*-';
-  if ($types == 'all')
+  if ($types === 'all')
   {
     $types = ImageStdParams::get_all_types();
@@ -2288 +2287 @@
   }
 
+  for ($i=0; $i<count($types); $i++)
+  {
+    $type = $types[$i];
+    if ($type == IMG_CUSTOM)
+    {
+      $type = derivative_to_url($type).'[a-zA-Z0-9]+';
+    }
+    elseif (in_array($type, ImageStdParams::get_all_types()))
+    {
+      $type = derivative_to_url($type);
+    }
+    else
+    {//assume a custom type
+      $type = derivative_to_url(IMG_CUSTOM).'_'.$type;
+    }
+    $types[$i] = $type;
+  }
+
+  $pattern='#.*-';
   if (count($types)>1)
   {
-    $type_urls = array();
-    foreach($types as $dtype)
-    {
-      $type_urls[] = derivative_to_url($dtype);
-    }
-    $pattern .= '(' . implode('|',$type_urls) . ')';
+    $pattern .= '(' . implode('|',$types) . ')';
   }
   else
   {
-    $pattern .= derivative_to_url($types[0]);
-  }
-
-  $pattern.='(_[a-zA-Z0-9]+)*\.[a-zA-Z0-9]{3,4}$#';
+    $pattern .= $types[0];
+  }
+  $pattern.='\.[a-zA-Z0-9]{3,4}$#';
+
   if ($contents = @opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR))
   {