Changeset 10128

Timestamp:

Apr 7, 2011, 11:11:11 AM (14 years ago)

Author:

patdenice

Message:

feature:2250
Add expire parameter.
Clean code.

Location:

trunk

Files:

• admin/include/plugins.class.php (modified) (2 diffs)
• admin/plugins_list.php (modified) (1 diff)
• include/common.inc.php (modified) (1 diff)

trunk/admin/include/plugins.class.php

@@ -372 +372 @@
   }
 
-  function get_incompatible_plugins()
-  {
-    if (isset($_SESSION['incompatible_plugins']))
+  function get_incompatible_plugins($actualize=false)
+  {
+    if (isset($_SESSION['incompatible_plugins']) and !$actualize
+      and $_SESSION['incompatible_plugins']['~~expire~~'] > time())
     {
       return $_SESSION['incompatible_plugins'];
     }
 
-    $_SESSION['incompatible_plugins'] = array();
+    $_SESSION['incompatible_plugins'] = array('~~expire~~' => time() + 300);
 
     $versions_to_check = $this->get_versions_to_check();
@@ -559 +560 @@
   function get_merged_extensions($version=PHPWG_VERSION)
   {
-    if (!isset($_SESSION['merged_extensions']))
-    {
-      $_SESSION['merged_extensions'] = array();
-      if (fetchRemote(MERGED_EXTENSIONS_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]));
-              $_SESSION['merged_extensions'] = array_merge($_SESSION['merged_extensions'], $extensions);
-            }
-          }
-        }
-      }
-    }
+    if (isset($_SESSION['merged_extensions']) and $_SESSION['merged_extensions']['~~expire~~'] > time())
+    {
+      return $_SESSION['merged_extensions'];
+    }
+
+    $_SESSION['merged_extensions'] = array('~~expire~~' => time() + 600);
+
+    if (fetchRemote(PHPWG_URL.'/download/merged_extensions.txt', $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]));
+            $_SESSION['merged_extensions'] = array_merge($_SESSION['merged_extensions'], $extensions);
+          }
+        }
+      }
+    }
+
     return $_SESSION['merged_extensions'];
   }

trunk/admin/plugins_list.php

@@ -78 +78 @@
   {
     // Incompatible plugins must be reinitilized
-    unset($_SESSION['incompatible_plugins']);
-    $plugins->get_incompatible_plugins();
+    $plugins->get_incompatible_plugins(true);
   }
 

trunk/include/common.inc.php

@@ -157 +157 @@
   define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
 }
-define('MERGED_EXTENSIONS_URL', 'http://'.PHPWG_DOMAIN.'/download/merged_extensions.txt');
-
 
 // language files