archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature:2250

Browse source 
Add expire parameter.
Clean code.

git-svn-id: http://piwigo.org/svn/trunk@10128 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2011-04-07 09:11:11 +00:00
parent ce1c5b862d
commit 49dd77f05b
3 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
admin/include/plugins.class.php
View file

@ -371,14 +371,15 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
return false;
}
function get_incompatible_plugins()
function get_incompatible_plugins($actualize=false)
{
if (isset($_SESSION['incompatible_plugins']))
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();
if (empty($versions_to_check))
@ -558,25 +559,29 @@ DELETE FROM ' . PLUGINS_TABLE . ' WHERE id=\'' . $plugin_id . '\'';
function get_merged_extensions($version=PHPWG_VERSION)
{
if (!isset($_SESSION['merged_extensions']))
if (isset($_SESSION['merged_extensions']) and $_SESSION['merged_extensions']['~~expire~~'] > time())
{
$_SESSION['merged_extensions'] = array();
if (fetchRemote(MERGED_EXTENSIONS_URL, $result))
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)
{
$rows = explode("\n", $result);
foreach ($rows as $row)
if (preg_match('/^(\d+\.\d+): *(.*)$/', $row, $match))
{
if (preg_match('/^(\d+\.\d+): *(.*)$/', $row, $match))
if (version_compare($version, $match[1], '>='))
{
if (version_compare($version, $match[1], '>='))
{
$extensions = explode(',', trim($match[2]));
$_SESSION['merged_extensions'] = array_merge($_SESSION['merged_extensions'], $extensions);
}
$extensions = explode(',', trim($match[2]));
$_SESSION['merged_extensions'] = array_merge($_SESSION['merged_extensions'], $extensions);
}
}
}
}
return $_SESSION['merged_extensions'];
}

3
admin/plugins_list.php
View file

@ -77,8 +77,7 @@ foreach($plugins->fs_plugins as $plugin_id => $fs_plugin)
and $fs_plugin['version'] != $_SESSION['incompatible_plugins'][$plugin_id])
{
// Incompatible plugins must be reinitilized
unset($_SESSION['incompatible_plugins']);
$plugins->get_incompatible_plugins();
$plugins->get_incompatible_plugins(true);
}
$tpl_plugin = array(

2
include/common.inc.php
View file

@ -156,8 +156,6 @@ else
{
define('PEM_URL', 'http://'.PHPWG_DOMAIN.'/ext');
}
define('MERGED_EXTENSIONS_URL', 'http://'.PHPWG_DOMAIN.'/download/merged_extensions.txt');
// language files
load_language('common.lang');