Changeset 12797 for trunk/admin

Timestamp:

Dec 27, 2011, 9:26:49 PM (12 years ago)

Author:

rvelices

Message:

feature 2541 multisize

• nicer presentation on picture.php
• added a maintenance purge derivatives action

Location:

trunk/admin

Files:

• include/functions.php (modified) (1 diff)
• maintenance.php (modified) (2 diffs)
• rating.php (modified) (1 diff)
• themes/default/template/maintenance.tpl (modified) (1 diff)

trunk/admin/include/functions.php

@@ -2247 +2247 @@
   return array_from_query($query, 'user_id');
 }
+
+function clear_derivative_cache($type='all')
+{
+  $pattern='#.*-';
+  if ($type == 'all')
+  {
+    $type_urls = array();
+    foreach(ImageStdParams::get_all_types() as $dtype)
+    {
+      $type_urls[] = derivative_to_url($dtype);
+    }
+    $type_urls[] = derivative_to_url(IMG_CUSTOM);
+    $pattern .= '(' . implode('|',$type_urls) . ')';
+  }
+  else
+  {
+    $pattern .= derivative_to_url($type);
+  }
+  $pattern.='(_[a-zA-Z0-9]+)*\.[a-zA-Z0-9]{3,4}$#';
+  if ($contents = opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR))
+  {
+    while (($node = readdir($contents)) !== false)
+    {
+      if ($node != '.'
+          and $node != '..'
+          and is_dir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$node))
+      {
+        clear_derivative_cache_rec(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$node, $pattern);
+      }
+    }
+    closedir($contents);
+  }
+}
+
+function clear_derivative_cache_rec($path, $pattern)
+{
+  $rmdir = true;
+  $rm_index = false;
+
+  if ($contents = opendir($path))
+  {
+    while (($node = readdir($contents)) !== false)
+    {
+      if ($node == '.' or $node == '..')
+        continue;
+      if (is_dir($path.'/'.$node))
+      {
+        $rmdir &= clear_derivative_cache_rec($path.'/'.$node, $pattern);
+      }
+      else
+      {
+        if (preg_match($pattern, $node))
+        {
+          unlink($path.'/'.$node);
+        }
+        elseif ($node=='index.htm')
+        {
+          $rm_index = true;
+        }
+        else
+        {
+          $rmdir = false;
+        }
+      }
+    }
+    closedir($contents);
+    
+    if ($rmdir)
+    {
+      if ($rm_index)
+      {
+        unlink($path.'/index.htm');
+      }
+      clearstatcache();
+      rmdir($path);
+    }
+    return $rmdir;
+  }
+}
 ?>

trunk/admin/maintenance.php

@@ -122 +122 @@
     break;
   }
-  case 'compiled-templates' :
+  case 'compiled-templates':
   {
     $template->delete_compiled_templates();
     FileCombiner::clear_combined_files();
+    break;
+  }
+  case 'derivatives':
+  {
+    clear_derivative_cache();
     break;
   }
@@ -155 +160 @@
     'U_MAINT_SEARCH' => sprintf($url_format, 'search'),
     'U_MAINT_COMPILED_TEMPLATES' => sprintf($url_format, 'compiled-templates'),
+    'U_MAINT_DERIVATIVES' => sprintf($url_format, 'derivatives'),
     'U_HELP' => get_root_url().'admin/popuphelp.php?page=maintenance',
     )

trunk/admin/rating.php

@@ -173 +173 @@
     i.path,
     i.file,
-    i.tn_ext,
+    i.representative_ext,
     i.rating_score       AS score,
     MAX(r.date)          AS recently_rated,

trunk/admin/themes/default/template/maintenance.tpl

@@ -30 +30 @@
         <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate|@escape:'javascript'}');">{'Purge search history'|@translate}</a></li>
         <li><a href="{$U_MAINT_COMPILED_TEMPLATES}">{'Purge compiled templates'|@translate}</a></li>
+        <li><a href="{$U_MAINT_DERIVATIVES}">{'Purge derivative image cache'|@translate}</a></li>
 </ul>