Changeset 4712

Timestamp:

Jan 20, 2010, 7:03:37 PM (15 years ago)

Author:

patdenice

Message:

code simplification

Location:

extensions/autoupdate

Files:

• class.inc.php (modified) (3 diffs)
• remote.php (modified) (1 diff)

extensions/autoupdate/class.inc.php

@@ -99 +99 @@
       include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php');
       $plugins = new plugins();
-      $plugin_list = array();
       $ignore_list = unserialize($conf['autoupdate_ignore_list']);
 
@@ -123 +122 @@
       if (!empty($_SESSION['plugins_need_update']))
       {
-        $plugin_list = $_SESSION['plugins_need_update'];
-
-        // Check ignore list
-        foreach ($plugin_list as $plugin_id => $version)
-        {
-          if (in_array($plugins->fs_plugins[$plugin_id]['name'], $ignore_list))
-          {
-            unset($plugin_list[$plugin_id]);
-          }
-        }
-
-        if (!empty($plugin_list))
-        {
-          return l10n('Some upgrades are available for you plugins').'<br>'
-            . '<a href="admin.php?page=plugins_update">'.l10n('Click here see upgrade plugins page').'</a>';
-        }
+        return l10n('Some upgrades are available for you plugins').'<br>'
+          . '<a href="admin.php?page=plugins_update">'.l10n('Click here see upgrade plugins page').'</a>';
       }
     }
 
-    if ($_SESSION['need_update'] === false and $plugin_list === array())
+    if ($_SESSION['need_update'] === false and $_SESSION['plugins_need_update'] === array())
     {
       return l10n('Gallery and plugins are up to date');
@@ -169 +154 @@
           if (!$plugins->plugin_version_compare($fs_plugin['version'], $plugin_info['revision_name']))
           {
-            // Plugin need upgrade
-            $_SESSION['plugins_need_update'][$plugin_id] = $plugin_info['revision_name'];
-
             if (in_array($fs_plugin['name'], $ignore_list))
             {
               array_push($new_ignore_list, $fs_plugin['name']);
+            }
+            else
+            {
+              $_SESSION['plugins_need_update'][$plugin_id] = $plugin_info['revision_name'];
             }
           }

extensions/autoupdate/remote.php

@@ -38 +38 @@
   pwg_query($query);
 
+  unset($_SESSION['plugins_need_update']);
   echo 'ok';
 }