Changeset 10038

Timestamp:

Apr 4, 2011, 4:14:15 PM (14 years ago)

Author:

patdenice

Message:

Check merged extensions.

Location:

extensions/autoupdate/branches/2.0

Files:

• . (modified) (1 prop)
• autoupdate.php (modified) (1 diff)
• include/autoupdate.class.php (modified) (3 diffs)

extensions/autoupdate/branches/2.0/autoupdate.php

@@ -123 +123 @@
   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/branches/2.0/include/autoupdate.class.php

@@ -8 +8 @@
   var $plugins;
   var $themes;
-  var $languages;
   var $missing = array();
   var $default_plugins = array();
   var $default_themes = array();
+  var $merged_extensions = array();
+  var $merged_extension_url = 'http://piwigo.org/download/merged_extensions.txt';
 
   function autoupdate()
@@ -199 +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;
@@ -208 +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)
   {