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

Timestamp:

Feb 7, 2012, 10:25:20 PM (12 years ago)

Author:

rvelices

Message:

upgrade jquery to 1.7.1
mouseout on index drop down bozes
improved multisize center of interest

File:

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

trunk/admin/include/functions.php

@@ -203 +203 @@
 
     $ok = true;
-                if (!isset($conf['never_delete_originals']))
-                {
-                        foreach ($files as $path)
-                        {
-                                if (is_file($path) and !unlink($path))
-                                {
-                                        $ok = false;
-                                        trigger_error('"'.$path.'" cannot be removed', E_USER_WARNING);
-                                        break;
-                                }
-                        }
-                }
+    if (!isset($conf['never_delete_originals']))
+    {
+      foreach ($files as $path)
+      {
+        if (is_file($path) and !unlink($path))
+        {
+          $ok = false;
+          trigger_error('"'.$path.'" cannot be removed', E_USER_WARNING);
+          break;
+        }
+      }
+    }
 
     if ($ok)
@@ -2307 +2307 @@
 }
 
-function delete_element_derivatives($infos)
+function delete_element_derivatives($infos, $type='all')
 {
   $path = $infos['path'];
@@ -2318 +2318 @@
     $path = substr($path, 3);
   }
-  $dot = strpos($path, '.');
-  $path = substr_replace($path, '-*', $dot, 0);
+  $dot = strrpos($path, '.');
+  if ($type=='all')
+  {
+    $pattern = '-*';
+  }
+  else
+  {
+    $pattern = '-'.derivative_to_url($type).'*';
+  }
+  $path = substr_replace($path, $pattern, $dot, 0);
   foreach( glob(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$path) as $file)
   {