Changeset 4711

Timestamp:

Jan 20, 2010, 6:03:37 PM (14 years ago)

Author:

patdenice

Message:

[Plugin][Piwigo Auto Upgrade]
If gallery and plugins are up to date, display note on admin homepage only one time for each session.
Allow to disable notification for plugins you don't want to update.

Location:

extensions/autoupdate

Files:

• autoupdate.php (modified) (1 diff)
• class.inc.php (modified) (5 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/es_ES/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• language/hu_HU/plugin.lang.php (modified) (1 diff)
• language/it_IT/plugin.lang.php (modified) (1 diff)
• language/pl_PL/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (added)
• plugins_update.php (added)
• remote.php (modified) (1 diff)

extensions/autoupdate/autoupdate.php

@@ -102 +102 @@
 }
 
-$template->set_filename('autoupdate_head', realpath(dirname(__FILE__).'/head.tpl'));
-array_push($header_notes, $template->parse('autoupdate_head', true));
+if (!isset($_SESSION['need_update']) or !isset($_SESSION['plugins_need_update'])
+  or $_SESSION['need_update'] !== false or $_SESSION['plugins_need_update'] !== array())
+{
+  $template->set_filename('autoupdate_head', realpath(dirname(__FILE__).'/head.tpl'));
+  array_push($header_notes, $template->parse('autoupdate_head', true));
+}
 
 ?>

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']);
 
       if (!isset($_SESSION['plugins_need_update']))
       {
         $_SESSION['plugins_need_update'] = null;
-        $this->check_plugins_upgrade($plugins);
+        $this->check_plugins_upgrade($plugins, $ignore_list);
       }
       elseif (!empty($_SESSION['plugins_need_update']))
@@ -114 +116 @@
           {
             // Plugin have been updated
-            $this->check_plugins_upgrade($plugins);
+            $this->check_plugins_upgrade($plugins, $ignore_list);
           }
         }
@@ -121 +123 @@
       if (!empty($_SESSION['plugins_need_update']))
       {
-        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>';
+        $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>';
+        }
       }
     }
 
-    if ($_SESSION['need_update'] === false and $_SESSION['plugins_need_update'] === array())
+    if ($_SESSION['need_update'] === false and $plugin_list === array())
     {
       return l10n('Gallery and plugins are up to date');
@@ -138 +154 @@
   }
 
-  function check_plugins_upgrade($plugins)
+  function check_plugins_upgrade($plugins, $ignore_list)
   {
     if ($plugins->get_server_plugins())
     {
+      $new_ignore_list = array();
       $_SESSION['plugins_need_update'] = array();
 
@@ -154 +171 @@
             // 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']);
+            }
           }
         }
       }
+
+      // Update ignore list in database
+      $query = '
+UPDATE '.CONFIG_TABLE.'
+SET value = "'.addslashes(serialize($new_ignore_list)).'"
+WHERE param = "autoupdate_ignore_list"
+;';
+      pwg_query($query);
     }
   }

extensions/autoupdate/language/en_UK/plugin.lang.php

@@ -17 +17 @@
 $lang['Click here to check upgrades now'] = 'Click here to check upgrades now';
 
+$lang['Notify on admin homepage'] = 'Notify on admin homepage';
+$lang['Don\'t notify on admin homepage'] = 'Don\'t notify on admin homepage';
+
 ?>

extensions/autoupdate/language/es_ES/plugin.lang.php

@@ -17 +17 @@
 /*TODO*/$lang['Click here to check upgrades now'] = 'Click here to check upgrades now';
 
+/*TODO*/$lang['Notify on admin homepage'] = 'Notify on admin homepage';
+/*TODO*/$lang['Don\'t notify on admin homepage'] = 'Don\'t notify on admin homepage';
+
 ?>

extensions/autoupdate/language/fr_FR/plugin.lang.php

@@ -15 +15 @@
 $lang['Unable to check upgrades...'] = 'Impossible de vérifier les mises à jour...';
 $lang['Click here to check upgrades now'] = 'Cliquez ici pour vérifier les mises à jour maintenant';
+
+$lang['Notify on admin homepage'] = 'Notifier sur l\'accueil de l\'administration';
+$lang['Don\'t notify on admin homepage'] = 'Ne pas notifier sur l\'accueil de l\'administration';
+
 ?>

extensions/autoupdate/language/hu_HU/plugin.lang.php

@@ -17 +17 @@
 /*TODO*/$lang['Click here to check upgrades now'] = 'Click here to check upgrades now';
 
+/*TODO*/$lang['Notify on admin homepage'] = 'Notify on admin homepage';
+/*TODO*/$lang['Don\'t notify on admin homepage'] = 'Don\'t notify on admin homepage';
+
 ?>

extensions/autoupdate/language/it_IT/plugin.lang.php

@@ -16 +16 @@
 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo riproverà automaticamente più tardi.';
 $lang['Click here to check upgrades now'] = 'Cliccare qui per verificare gli aggiornameti ora';
+
+/*TODO*/$lang['Notify on admin homepage'] = 'Notify on admin homepage';
+/*TODO*/$lang['Don\'t notify on admin homepage'] = 'Don\'t notify on admin homepage';
+
 ?>

extensions/autoupdate/language/pl_PL/plugin.lang.php

@@ -17 +17 @@
 /*TODO*/$lang['Click here to check upgrades now'] = 'Click here to check upgrades now';
 
+/*TODO*/$lang['Notify on admin homepage'] = 'Notify on admin homepage';
+/*TODO*/$lang['Don\'t notify on admin homepage'] = 'Don\'t notify on admin homepage';
+
 ?>

extensions/autoupdate/main.inc.php

@@ -22 +22 @@
   }
 
+  if ($page['page'] == 'plugins_update')
+  {
+    include(dirname(__FILE__).'/plugins_update.php');
+  }
+
   return $plugin_menu_links;
 }

extensions/autoupdate/remote.php

@@ -8 +8 @@
 check_status(ACCESS_ADMINISTRATOR);
 
-load_language('plugin.lang', dirname(__FILE__).'/');
+if (isset($_POST['autoupdate_ignore'])
+  and is_array($_POST['autoupdate_ignore'])
+  and count($_POST['autoupdate_ignore']) == 2)
+{
+  $ignore = unserialize($conf['autoupdate_ignore_list']);
+  $ignore = array_flip($ignore);
 
-include(dirname(__FILE__).'/class.inc.php');
-$autoupdate = new autoupdate();
+  if ($_POST['autoupdate_ignore'][1] == "false" and isset($ignore[$_POST['autoupdate_ignore'][0]]))
+  {
+    unset($ignore[$_POST['autoupdate_ignore'][0]]);
+    $ignore = array_flip($ignore);
+  }
+  elseif ($_POST['autoupdate_ignore'][1] == "true" and !isset($ignore[$_POST['autoupdate_ignore'][0]]))
+  {
+    $ignore = array_flip($ignore);
+    array_push($ignore, $_POST['autoupdate_ignore'][0]);
+  }
+  else
+  {
+    die;
+  }
+  sort($ignore);  
 
-echo $autoupdate->check_version();
+  $query = '
+UPDATE '.CONFIG_TABLE.'
+SET value = "'.addslashes(serialize($ignore)).'"
+WHERE param = "autoupdate_ignore_list"
+;';
+  pwg_query($query);
+
+  echo 'ok';
+}
+else
+{
+  load_language('plugin.lang', dirname(__FILE__).'/');
+
+  include(dirname(__FILE__).'/class.inc.php');
+  $autoupdate = new autoupdate();
+
+  echo $autoupdate->check_version();
+}
 
 ?>