Changeset 10100 for trunk/admin/plugins_list.php

Timestamp:

Apr 6, 2011, 12:30:06 PM (13 years ago)

Author:

patdenice

Message:

feature:2250
Deactivate and uninstall obsolete plugins.

File:

• trunk/admin/plugins_list.php (modified) (5 diffs)

trunk/admin/plugins_list.php

@@ -70 +70 @@
 $plugins->get_merged_extensions();
 $plugins->get_incompatible_plugins();
-$merged_plugins = array();
+$merged_plugins = false;
 
 foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
@@ -93 +93 @@
     );
 
-  if (isset($fs_plugin['extension']) and in_array($fs_plugin['extension'], $_SESSION['merged_extensions']))
-  {
-    $tpl_plugin['STATE'] = 'merged';
-    array_push($merged_plugins, $tpl_plugin);
-    continue;
-  }
-
   if (isset($plugins->db_plugins_by_id[$plugin_id]))
   {
@@ -109 +102 @@
   }
 
+  if (isset($fs_plugin['extension']) and in_array($fs_plugin['extension'], $_SESSION['merged_extensions']))
+  {
+    switch($tpl_plugin['STATE'])
+    {
+      case 'active': $plugins->perform_action('deactivate', $plugin_id);
+      case 'inactive': $plugins->perform_action('uninstall', $plugin_id);
+    }
+    $tpl_plugin['STATE'] = 'merged';
+    $tpl_plugin['DESC'] = l10n("THIS PLUGIN IS NOW PART OF PIWIGO CORE. UNINSTALL IT NOW.");
+    $merged_plugins = true;
+  }
+
   $template->append('plugins', $tpl_plugin);
 }
@@ -115 +120 @@
 $template->append('plugin_states', 'inactive');
 $template->append('plugin_states', 'uninstalled');
+
+if ($merged_plugins)
+{
+  $template->append('plugin_states', 'merged');
+}
 
 $missing_plugin_ids = array_diff(
@@ -139 +149 @@
 }
 
-if (count($merged_plugins) > 0)
-{
-  foreach($merged_plugins as $tpl_plugin)
-  {
-    $tpl_plugin['DESC'] = l10n("THIS PLUGIN IS NOW PART OF PIWIGO CORE. UNINSTALL IT NOW.");
-    $template->append('plugins', $tpl_plugin);
-  }
-  $template->append('plugin_states', 'merged');
-}
-
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins');
 ?>