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

"allow apps to specify there own php.ini checks, which get comulated by check_install, eg. to check for magic_quotes_gpc Off for fmail"

Browse Source
This commit is contained in:
Ralf Becker 2007-07-12 05:47:21 +00:00
parent bf639103fc
commit a7cecfe600
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
setup/check_install.php
View File

@ -174,13 +174,14 @@
{ {
if ($checks[$name] == $data) continue; // identical check --> ignore it if ($checks[$name] == $data) continue; // identical check --> ignore it
if ($data['func'] == 'pear_check' || $data['func'] == 'extension_check' && !isset($args['warning'])) if ($data['func'] == 'pear_check' || in_array($data['func'],array('extension_check','php_ini_check')) && !isset($data['warning']))
{ {
if ($checks[$name]['from'] && !is_array($checks[$name]['from'])) if ($checks[$name]['from'] && !is_array($checks[$name]['from']))
{ {
$checks[$name]['from'] = array($checks[$name]['from']); $checks[$name]['from'] = array($checks[$name]['from']);
} }
$checks[$name]['from'][] = $data['from'] ? $data['from'] : $app; if (!isset($data['from'])) $data['from'] = $app;
if (!in_array($data['from'],$checks[$name]['from'])) $checks[$name]['from'][] = $data['from'];
} }
else else
{ {
@ -189,6 +190,7 @@
} }
else else
{ {
if (!isset($data['from'])) $data['from'] = $app;
$checks[$name] = $data; $checks[$name] = $data;
} }
//echo "added check $data[func]($name) for $app"; _debug_array($data); //echo "added check $data[func]($name) for $app"; _debug_array($data);
@ -326,7 +328,7 @@
if (!class_exists($package)) $available = false; if (!class_exists($package)) $available = false;
} }
} }
// is the right version availible // is the right version availible
$available = (@$available || $pear_available && !$package) && (!$min_version || version_compare($min_version,$version_available) <= 0); $available = (@$available || $pear_available && !$package) && (!$min_version || version_compare($min_version,$version_available) <= 0);
echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'. echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.
lang('Checking PEAR%1 is installed',($package?'::'.$package:'').($min_version?" ($min_version)":'')).': '. lang('Checking PEAR%1 is installed',($package?'::'.$package:'').($min_version?" ($min_version)":'')).': '.
@ -364,6 +366,7 @@
function extension_check($name,$args) function extension_check($name,$args)
{ {
//echo "<p>extension_check($name,".print_r($args,true).")</p>\n";
global $passed_icon, $error_icon, $warning_icon, $is_windows; global $passed_icon, $error_icon, $warning_icon, $is_windows;
if (isset($args['win_only']) && $args['win_only'] && !$is_windows) if (isset($args['win_only']) && $args['win_only'] && !$is_windows)
@ -641,14 +644,20 @@
} }
if (!$result) if (!$result)
{ {
if (isset($args['warning']))
{
echo "<div>".$warning_icon.' <span class="setup_warning">'.$msg.'</span><div class="setup_info">'.$args['warning']."</div></div>\n";
}
if (isset($args['error'])) if (isset($args['error']))
{ {
echo "<div>".$error_icon.' <span class="setup_error">'.$msg.'</span><div class="setup_info">'.$args['error']."</div></div>\n"; echo "<div>".$error_icon.' <span class="setup_error">'.$msg.'</span><div class="setup_info">'.$args['error']."</div></div>\n";
} }
elseif (isset($args['warning']))
{
echo "<div>".$warning_icon.' <span class="setup_warning">'.$msg.'</span><div class="setup_info">'.$args['warning']."</div></div>\n";
}
elseif (!isset($args['safe_mode']))
{
echo "<div>".$warning_icon.' <span class="setup_warning">'.$msg.'</span><div class="setup_info">'.
lang('%1 is needed by: %2.',$name,is_array($args['from']) ? implode(', ',$args['from']) : $args['from'])
."</div></div>\n";
}
if (isset($args['safe_mode']) && $safe_mode || @$args['change']) if (isset($args['safe_mode']) && $safe_mode || @$args['change'])
{ {
if (!isset($args['warning']) && !isset($args['error'])) if (!isset($args['warning']) && !isset($args['error']))