Changeset 2199 for plugins/dcAdvancedCleaner/inc/class.dc.uninstaller.php

Timestamp:

04/16/10 16:51:19 (13 years ago)

Author:

JcDenis

Message:

dcAdvancedCleaner 0.4:

• Fixed list of tables (closes #440)
• Fixed direct uninstaller
• Added readable errors return
• Added DC 2.2 compatibility (new settings)
• Changed admin design

File:

• plugins/dcAdvancedCleaner/inc/class.dc.uninstaller.php (modified) (8 diffs)

plugins/dcAdvancedCleaner/inc/class.dc.uninstaller.php

@@ -3 +3 @@
 # This file is part of dcAdvancedCleaner, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009 JC Denis and contributors
+# Copyright (c) 2009-2010 JC Denis and contributors
 # jcdenis@gdwd.com
 # 
@@ -41 +41 @@
      */
      protected static $allowed_properties = array(
+          'versions' => array(
+               'delete' => 'delete version in dc'
+          ),
           'settings' => array(
                'delete_global' => 'delete global settings',
@@ -61 +64 @@
                'empty' => 'empty cache folder',
                'delete' => 'delete cache folder'
-          ),
-          'versions' => array(
-               'delete' => 'delete version in dc'
           )
+     );
+
+     protected static $priority_properties = array(
+          'versions','settings','tables','themes','plugins','caches'
      );
 
@@ -96 +100 @@
           $this->path = explode(PATH_SEPARATOR,$path);
 
-          foreach ($this->path as $root) {
-               $this->loadModule($root);
+          foreach ($this->path as $root)
+          {
+               if (!is_dir($root) || !is_readable($root)) continue;
+
+               if (substr($root,-1) != '/') $root .= '/';
+
+               if (($d = @dir($root)) === false) continue;
+
+               while (($entry = $d->read()) !== false)
+               {
+                    $full_entry = $root.'/'.$entry;
+
+                    if ($entry != '.' && $entry != '..' && is_dir($full_entry))
+                    {
+                         $this->loadModule($full_entry);
+                    }
+               }
+               $d->close();
           }
 
@@ -113 +133 @@
      public function loadModule($root)
      {
-          if (!is_dir($root) || !is_readable($root)) return;;
-
-          if (substr($root,-1) != '/') $root .= '/';
-
-          if (($d = @dir($root)) === false) return;
-
-          while (($entry = $d->read()) !== false)
-          {
-               $full_entry = $root.'/'.$entry;
-
-               if ($entry != '.' && $entry != '..' && is_dir($full_entry)
-                && file_exists($full_entry.'/_define.php')
-                && file_exists($full_entry.'/_uninstall.php')) {
-
-                    $this->id = $entry;
-                    $this->mroot = $full_entry;
-
-                    require $full_entry.'/_define.php';
-                    require $full_entry.'/_uninstall.php';
-
-                    $this->id = null;
-                    $this->mroot = null;
-               }
-          }
-          $d->close();
+          if (file_exists($root.'/_define.php')
+           && file_exists($root.'/_uninstall.php')) {
+
+               $this->id = basename($root);
+               $this->mroot = $root;
+
+               require $root.'/_define.php';
+               require $root.'/_uninstall.php';
+
+               $this->id = null;
+               $this->mroot = null;
+          }
      }
      
@@ -208 +215 @@
      }
 
-     private function addAction($group,$type,$action,$ns,$desc='')
+     private function addAction($group,$type,$action,$ns,$desc)
      {
           $group = self::group($group);
@@ -229 +236 @@
      /**
      Returns modules <var>$id</var> predefined actions associative array
+     ordered by priority
      
      @param    id        <b>string</b>       Optionnal module ID
@@ -249 +257 @@
           if (!isset($this->actions[$group][$id])) return array();
 
-          return $this->actions[$group][$id];
+          $res = array();
+          foreach(self::$priority_properties as $k => $v)
+          {
+               if (!isset($this->actions[$group][$id][$v])) continue;
+               $res[$v] = $this->actions[$group][$id][$v];
+          }
+
+          return $res;
      }