extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed not working new trunk installs

Browse Source
This commit is contained in:
Ralf Becker 2011-06-07 08:02:06 +00:00
parent 2add4fe910
commit c0cf0788e2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/inc/class.setup_process.inc.php
View File

@ -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 $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 // 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); sql_passwdhashes(array(), true, $securest);
$current_config['sql_encryption_type'] = $current_config['ldap_encryption_type'] = $securest; $current_config['sql_encryption_type'] = $current_config['ldap_encryption_type'] = $securest;

8
setup/inc/functions.inc.php
View File

@ -49,10 +49,10 @@ if(!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT'))
} }
else // no install else // no install
{ {
define('EGW_SERVER_ROOT','..'); define('EGW_SERVER_ROOT',realpath('..'));
define('EGW_INCLUDE_ROOT','..'); define('EGW_INCLUDE_ROOT',realpath('..'));
define('PHPGW_SERVER_ROOT','..'); define('PHPGW_SERVER_ROOT',realpath('..'));
define('PHPGW_INCLUDE_ROOT','..'); define('PHPGW_INCLUDE_ROOT',realpath('..'));
} }
define('EGW_API_INC',EGW_SERVER_ROOT.'/phpgwapi/inc'); define('EGW_API_INC',EGW_SERVER_ROOT.'/phpgwapi/inc');
} }