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

"- error_reporting E_ALL

Browse Source 
- fixed handling of session_save_path() returning nothing (was stalling the PEAR check AND failing)
- removed not longer necessary constants (defined now in common_functions.inc.php)"
This commit is contained in:
Ralf Becker 2009-04-28 19:25:35 +00:00
parent eec6596e94
commit e50f35cbad
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
setup/check_install.php
View File

@ -201,9 +201,9 @@ $checks = array(
'only_if_exists' => @$GLOBALS['egw_info']['setup']['stage']['header'] != 10 'only_if_exists' => @$GLOBALS['egw_info']['setup']['stage']['header'] != 10
), ),
); );
if (extension_loaded('session') && ini_get('session.save_handler') == 'files') if (extension_loaded('session') && ini_get('session.save_handler') == 'files' && ($session_path = session_save_path()))
{ {
$checks[session_save_path()] = array( $checks[$session_path] = array(
'func' => 'permission_check', 'func' => 'permission_check',
'is_writable' => true, 'is_writable' => true,
'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver",session_save_path()), 'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver",session_save_path()),
@ -259,16 +259,6 @@ foreach(array('php_version','php_ini_check','extension_check','pear_check','gd_c
if ($checks) $sorted_checks += $checks; if ($checks) $sorted_checks += $checks;
$checks =& $sorted_checks; $checks =& $sorted_checks;
// some constants for pre php4.3
if (!defined('PHP_SHLIB_SUFFIX'))
{
define('PHP_SHLIB_SUFFIX',$is_windows ? 'dll' : 'so');
}
if (!defined('PHP_SHLIB_PREFIX'))
{
define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
}
function php_version($name,$args) function php_version($name,$args)
{ {
global $passed_icon, $error_icon; global $passed_icon, $error_icon;
@ -524,7 +514,7 @@ function permission_check($name,$args,$verbose=True)
// add a ../ for non-absolute pathes // add a ../ for non-absolute pathes
$rel_name = $name; $rel_name = $name;
if (substr($name,0,3) != '../' && $name{0} != '/' && $name{0} != '\\' && strpos($name,':') === false) if ($name && substr($name,0,3) != '../' && $name[0] != '/' && $name[0] != '\\' && strpos($name,':') === false)
{ {
$name = '../'.$name; $name = '../'.$name;
} }