Changeset 6196 for extensions/autoupdate/trunk/include/functions.inc.php

Timestamp:

May 16, 2010, 5:57:12 PM (14 years ago)

Author:

patdenice

Message:

Webmaster status is required to launch any upgrade process.
Display "save template directory" fielset only if Piwigo version < 2.1.
Add random parameter in all_version url (to avoid cache server).
Move empty directory to trash is rmdir fail.

File:

• extensions/autoupdate/trunk/include/functions.inc.php (modified) (5 diffs)

extensions/autoupdate/trunk/include/functions.inc.php

@@ -1 +1 @@
 <?php
 
-function autoupdate_deltree($path)
+if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+
+function autoupdate_deltree($path, $move_to_trash=false)
 {
   if (is_dir($path))
@@ -13 +15 @@
         if (is_dir($pathfile))
         {
-          autoupdate_deltree($pathfile);
+          autoupdate_deltree($pathfile, $move_to_trash);
         }
         else
@@ -22 +24 @@
     }
     closedir($fh);
-    return @rmdir($path);
+    if (@rmdir($path))
+    {
+      return true;
+    }
+    elseif ($move_to_trash)
+    {
+      $trash = PHPWG_ROOT_PATH.'_trash';
+      if (!is_dir($trash))
+      {
+        @mkgetdir($trash);
+      }
+      return @rename($path, $trash . '/'.md5(uniqid(rand(), true)));
+    }
+    else
+    {
+      return false;
+    }
   }
 }
@@ -65 +83 @@
       elseif (is_dir($path))
       {
-        autoupdate_deltree($path);
+        autoupdate_deltree($path, true);
       }
     }
@@ -399 +417 @@
 }
 
+if (!function_exists('is_webmaster'))
+{
+  function is_webmaster($user_status = '')
+  {
+    return is_autorize_status(ACCESS_WEBMASTER, $user_status);
+  }
+}
+
 define('AU_DEFAULT_INDEX', file_get_contents(AUTOUPDATE_PATH.'index.php'));
 ?>