Changeset 10293 for trunk/admin/include

Timestamp:

Apr 11, 2011, 12:30:56 PM (13 years ago)

Author:

patdenice

Message:

feature:2260
Keep only two states for plugins (active and inactive)

File:

• trunk/admin/include/plugins.class.php (modified) (5 diffs)

trunk/admin/include/plugins.class.php

@@ -79 +79 @@
     {
       case 'install':
-        if (!empty($crt_db_plugin))
-        {
-          array_push($errors, 'CANNOT INSTALL - ALREADY INSTALLED');
-          break;
-        }
-        if (!isset($this->fs_plugins[$plugin_id]))
-        {
-          array_push($errors, 'CANNOT INSTALL - NO SUCH PLUGIN');
+        if (!empty($crt_db_plugin) or !isset($this->fs_plugins[$plugin_id]))
+        {
           break;
         }
@@ -110 +104 @@
         if (!isset($crt_db_plugin))
         {
-          array_push($errors, 'CANNOT ACTIVATE - NOT INSTALLED');
+          $errors = $this->perform_action('install', $plugin_id);
+        }
+        elseif ($crt_db_plugin['state'] == 'active')
+        {
           break;
         }
-        if ($crt_db_plugin['state'] != 'inactive')
-        {
-          array_push($errors, 'invalid current state ' . $crt_db_plugin['state']);
-          break;
-        }
-        if (file_exists($file_to_include))
+        if (empty($errors) and file_exists($file_to_include))
         {
           include_once($file_to_include);
@@ -137 +129 @@
 
       case 'deactivate':
-        if (!isset($crt_db_plugin))
-        {
-          die ('CANNOT DEACTIVATE - NOT INSTALLED');
-        }
-        if ($crt_db_plugin['state'] != 'active')
-        {
-          die('invalid current state ' . $crt_db_plugin['state']);
+        if (!isset($crt_db_plugin) or $crt_db_plugin['state'] != 'active')
+        {
+          break;
         }
         $query = '
@@ -161 +149 @@
         if (!isset($crt_db_plugin))
         {
-          die ('CANNOT UNINSTALL - NOT INSTALLED');
+          break;
+        }
+        if ($crt_db_plugin['state'] == 'active')
+        {
+          $this->perform_action('deactivate', $plugin_id);
         }
         $query = '
@@ -176 +168 @@
         break;
 
+      case 'restore':
+        $this->perform_action('uninstall', $plugin_id);
+        unset($this->db_plugins_by_id[$plugin_id]);
+        $errors = $this->perform_action('activate', $plugin_id);
+        break;
+
       case 'delete':
         if (!empty($crt_db_plugin))
         {
-          array_push($errors, 'CANNOT DELETE - PLUGIN IS INSTALLED');
-          break;
+          $this->perform_action('uninstall', $plugin_id);
         }
         if (!isset($this->fs_plugins[$plugin_id]))
         {
-          array_push($errors, 'CANNOT DELETE - NO SUCH PLUGIN');
           break;
         }