Changeset 10037

Timestamp:

Apr 4, 2011, 4:09:03 PM (13 years ago)

Author:

patdenice

Message:

Don't deactivate autoupdate when update itself.
Check merged extensions.

Location:

extensions/autoupdate/trunk

Files:

• include/autoupdate.class.php (modified) (3 diffs)
• update_pwg.inc.php (modified) (1 diff)
• ws_functions.inc.php (modified) (3 diffs)

extensions/autoupdate/trunk/include/autoupdate.class.php

@@ -13 +13 @@
   var $default_themes = array();
   var $default_languages = array();
+  var $merged_extensions = array();
+  var $merged_extension_url = 'http://piwigo.org/download/merged_extensions.txt';
 
   function autoupdate()
@@ -198 +200 @@
       foreach ($this->$type->$fs as $ext_id => $ext)
       {
-        if (isset($ext['extension']) and $id == $ext['extension'] and !in_array($ext_id, $this->$default))
+        if (isset($ext['extension']) and $id == $ext['extension']
+          and !in_array($ext_id, $this->$default)
+          and !in_array($ext['extension'], $this->merged_extensions))
         {
           $this->missing[$type][] = $ext;
@@ -207 +211 @@
   }
 
+  function get_merged_extensions($version)
+  {
+    if (fetchRemote($this->merged_extension_url, $result))
+    {
+      $rows = explode("\n", $result);
+      foreach ($rows as $row)
+      {
+        if (preg_match('/^(\d+\.\d+): *(.*)$/', $row, $match))
+        {
+          if (version_compare($version, $match[1], '>='))
+          {
+            $extensions = explode(',', trim($match[2]));
+            $this->merged_extensions = array_merge($this->merged_extensions, $extensions);
+          }
+        }
+      }
+    }
+  }
+
   function version_compare($a, $b, $type)
   {

extensions/autoupdate/trunk/update_pwg.inc.php

@@ -118 +118 @@
   include_once(AUTOUPDATE_PATH.'include/autoupdate.class.php');
   $autoupdate = new autoupdate();
+  $autoupdate->get_merged_extensions($upgrade_to);
   $autoupdate->get_server_extensions($upgrade_to);
   $template->assign('missing', $autoupdate->missing);

extensions/autoupdate/trunk/ws_functions.inc.php

@@ -73 +73 @@
   $plugins = new plugins();
 
-  if (isset($params['upgradestatus']) and isset($params['id']))
-  {
-    switch ($params['upgradestatus'])
-    {
-      case 'ok':
-        return sprintf(l10n('%s has been successfully upgraded.'), $plugins->fs_plugins[$params['id']]['name']);
-
-      case 'temp_path_error':
-        return new PwgError(null, l10n('Can\'t create temporary file.'));
-
-      case 'dl_archive_error':
-        return new PwgError(null, l10n('Can\'t download archive.'));
-
-      case 'archive_error':
-        return new PwgError(null, l10n('Can\'t read or extract archive.'));
-
-      default:
-        return new PwgError(null, sprintf(l10n('An error occured during extraction (%s).'), $params['upgradestatus']));
-    }
-  }
-
   if (empty($params['id']) or empty($params['revision']))
   {
@@ -103 +82 @@
 
   if (isset($plugins->db_plugins_by_id[$plugin_id])
-    and $plugins->db_plugins_by_id[$plugin_id]['state'] == 'active')
+    and $plugins->db_plugins_by_id[$plugin_id]['state'] == 'active'
+    and $plugin_id != 'autoupdate')
   {
     $plugins->perform_action('deactivate', $plugin_id);
@@ -128 +108 @@
   $template->delete_compiled_templates();
 
-  redirect(PHPWG_ROOT_PATH
-    . 'ws.php'
-    . '?method=pwg.plugins.update'
-    . '&revision=' . $revision
-    . '&id=' . $plugin_id
-    . '&upgradestatus='.$upgrade_status
-    . '&pwg_token=' . get_pwg_token()
-    . '&format=json'
-  );
+  switch ($upgrade_status)
+  {
+    case 'ok':
+      return sprintf(l10n('%s has been successfully upgraded.'), $plugins->fs_plugins[$plugin_id]['name']);
+
+    case 'temp_path_error':
+      return new PwgError(null, l10n('Can\'t create temporary file.'));
+
+    case 'dl_archive_error':
+      return new PwgError(null, l10n('Can\'t download archive.'));
+
+    case 'archive_error':
+      return new PwgError(null, l10n('Can\'t read or extract archive.'));
+
+    default:
+      return new PwgError(null, sprintf(l10n('An error occured during extraction (%s).'), $upgrade_status));
+  }
 }