From c0cf0788e288fdf8451d08577dbae9db74b47a06 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 7 Jun 2011 08:02:06 +0000 Subject: [PATCH] fixed not working new trunk installs --- setup/inc/class.setup_process.inc.php | 2 +- setup/inc/functions.inc.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php index e5ae6cfc36..8f944537b9 100755 --- a/setup/inc/class.setup_process.inc.php +++ b/setup/inc/class.setup_process.inc.php @@ -296,7 +296,7 @@ class setup_process $current_config['postpone_statistics_submit'] = time() + 2 * 30 * 3600; // ask user in 2 month from now, when he has something to report // use securest password hash by default - require_once './hook_config.inc.php'; // for sql_passwdhashes, to get securest available password hash + require_once EGW_SERVER_ROOT.'/setup/inc/hook_config.inc.php'; // for sql_passwdhashes, to get securest available password hash sql_passwdhashes(array(), true, $securest); $current_config['sql_encryption_type'] = $current_config['ldap_encryption_type'] = $securest; diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php index 91f06e3040..4a4b7bde00 100644 --- a/setup/inc/functions.inc.php +++ b/setup/inc/functions.inc.php @@ -49,10 +49,10 @@ if(!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT')) } else // no install { - define('EGW_SERVER_ROOT','..'); - define('EGW_INCLUDE_ROOT','..'); - define('PHPGW_SERVER_ROOT','..'); - define('PHPGW_INCLUDE_ROOT','..'); + define('EGW_SERVER_ROOT',realpath('..')); + define('EGW_INCLUDE_ROOT',realpath('..')); + define('PHPGW_SERVER_ROOT',realpath('..')); + define('PHPGW_INCLUDE_ROOT',realpath('..')); } define('EGW_API_INC',EGW_SERVER_ROOT.'/phpgwapi/inc'); }