From db3b46293b27d0ebeb9c68039e49245d6830bead Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 1 Oct 2009 09:51:28 +0000 Subject: [PATCH] "- using realpath('..') to give user pathes in filesystem (in errors) - using 'only_if_exists' for 'is_world_writable'=>false check, to cope with doc symlinks under Debian, which are not included in open_basedir (gave file does not exists error and stoped check)" --- setup/check_install.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/setup/check_install.php b/setup/check_install.php index e86f79f274..49cc1bbdbd 100644 --- a/setup/check_install.php +++ b/setup/check_install.php @@ -190,12 +190,13 @@ $checks = array( 'func' => 'pear_check', 'from' => 'WebDAV', ), - '.' => array( + realpath('..') => array( 'func' => 'permission_check', 'is_world_writable' => False, + 'only_if_exists' => true, // quitens "file does not exist" for doc symlinks in Debian to files outside open_basedir 'recursiv' => True ), - 'header.inc.php' => array( + realpath('../header.inc.php') => array( 'func' => 'permission_check', 'is_world_readable' => False, 'only_if_exists' => @$GLOBALS['egw_info']['setup']['stage']['header'] != 10 @@ -211,7 +212,7 @@ $checks = array( ); if (extension_loaded('session') && ini_get('session.save_handler') == 'files' && ($session_path = session_save_path())) { - $checks[$session_path] = array( + $checks[realpath($session_path)] = array( 'func' => 'permission_check', 'is_writable' => true, 'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver",session_save_path()), @@ -526,6 +527,7 @@ function permission_check($name,$args,$verbose=True) { $name = '../'.$name; } + if (!file_exists($name) && isset($args['only_if_exists']) && $args['only_if_exists']) { return True;