Changeset 23821 for trunk/admin/include/updates.class.php

Timestamp:

Jul 7, 2013, 1:28:12 PM (11 years ago)

Author:

mistic100

Message:

bug:2898 make some updates methods static + factorize code from plugins, themes & languages

File:

• trunk/admin/include/updates.class.php (modified) (7 diffs)

trunk/admin/include/updates.class.php

@@ -34 +34 @@
   }
 
-  function check_piwigo_upgrade()
+  static function check_piwigo_upgrade()
   {
     $_SESSION['need_update'] = null;
@@ -243 +243 @@
   }
 
-  function deltree($path, $move_to_trash=false)
-  {
-    if (is_dir($path))
-    {
-      $fh = opendir($path);
-      while ($file = readdir($fh))
-      {
-        if ($file != '.' and $file != '..')
-        {
-          $pathfile = $path . '/' . $file;
-          if (is_dir($pathfile))
-          {
-            self::deltree($pathfile, $move_to_trash);
-          }
-          else
-          {
-            @unlink($pathfile);
-          }
-        }
-      }
-      closedir($fh);
-      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;
-      }
-    }
-  }
-
-  function process_obsolete_list($file)
+  static function process_obsolete_list($file)
   {
     if (file_exists(PHPWG_ROOT_PATH.$file)
@@ -300 +259 @@
         elseif (is_dir($path))
         {
-          self::deltree($path, true);
-        }
-      }
-    }
-  }
-
-  function dump_database($include_history=false)
+          deltree($path, PHPWG_ROOT_PATH.'_trash');
+        }
+      }
+    }
+  }
+
+  static function dump_database($include_history=false)
   {
     global $page, $conf, $cfgBase;
@@ -351 +310 @@
 
       @readfile($backupFile);
-      self::deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
+      deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
       exit();
     }
@@ -360 +319 @@
   }
 
-  function upgrade_to($upgrade_to, &$step, $check_current_version=true)
+  static function upgrade_to($upgrade_to, &$step, $check_current_version=true)
   {
     global $page, $conf, $template;
@@ -450 +409 @@
           {
             self::process_obsolete_list($obsolete_list);
-            self::deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
+            deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
             invalidate_user_cache(true);
             $template->delete_compiled_templates();
@@ -478 +437 @@
         else
         {
-          self::deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
+          deltree(PHPWG_ROOT_PATH.$conf['data_location'].'update');
           array_push($page['errors'], l10n('An error has occured during upgrade.'));
         }