holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for pear.horde.org/Horde_Imap_Client

Browse Source
This commit is contained in:
Ralf Becker 2013-10-29 09:05:16 +00:00
parent 4d29125c41
commit a4d8c8dac1
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
setup/check_install.php
View File

@ -314,9 +314,10 @@ function php_version($name,$args)
/** /**
* quering the pear registry to find out which pear packages and versions are installed * quering the pear registry to find out which pear packages and versions are installed
* *
* @param $channel=null use default or given channel
* @return array with package-name => version pairs, eg. array('Log' => '1.9.8','PEAR' => '1.4.11') * @return array with package-name => version pairs, eg. array('Log' => '1.9.8','PEAR' => '1.4.11')
*/ */
function get_installed_pear_packages() function get_installed_pear_packages($channel=null)
{ {
$pear_config = ''; // use the system default $pear_config = ''; // use the system default
// fix for SuSE having the pear.conf only for cli, will fail with open_basedir - no idea what to do then // fix for SuSE having the pear.conf only for cli, will fail with open_basedir - no idea what to do then
@ -331,7 +332,7 @@ function get_installed_pear_packages()
$config = new PEAR_Config('',$pear_config); $config = new PEAR_Config('',$pear_config);
//echo "<pre>config = ".print_r($config,true)."</pre>\n"; //echo "<pre>config = ".print_r($config,true)."</pre>\n";
$channel = $config->get('default_channel'); if (empty($channel)) $channel = $config->get('default_channel');
//echo "<pre>channel = ".print_r($channel,true)."</pre>\n"; //echo "<pre>channel = ".print_r($channel,true)."</pre>\n";
if (!method_exists($config,'getRegistry')) return false; // PEAR version to old if (!method_exists($config,'getRegistry')) return false; // PEAR version to old
@ -354,7 +355,7 @@ function get_installed_pear_packages()
if (is_array($version)) $version = $version['release']; if (is_array($version)) $version = $version['release'];
$packages[$name] = $version; $packages[$name] = $version;
// echo "<p>$name: ".print_r($package['version'],true)."</p>\n"; //echo "<p>$name: ".print_r($package['version'],true)."</p>\n";
} }
ksort($packages); ksort($packages);
@ -365,14 +366,19 @@ function pear_check($package,$args)
{ {
global $passed_icon, $warning_icon; global $passed_icon, $warning_icon;
static $pear_available = null; static $pear_available = null;
static $pear_packages = null; static $channel_packages = array();
if (strpos($package, '/') !== false)
{
list($channel, $package) = explode('/', $package);
}
$min_version = isset($args['version']) ? $args['version'] : null; $min_version = isset($args['version']) ? $args['version'] : null;
if (is_null($pear_packages)) if (!isset($channel_packages[(string)$channel]))
{ {
$pear_packages = get_installed_pear_packages(); $channel_packages[(string)$channel] = get_installed_pear_packages($channel);
} }
$pear_packages = $channel_packages[(string)$channel];
$version_available = false; $version_available = false;
// check if egw-pear is availible and packages is included // check if egw-pear is availible and packages is included