diff --git a/setup/admin_account.php b/setup/admin_account.php index 280ca525b2..50dc1f5abd 100644 --- a/setup/admin_account.php +++ b/setup/admin_account.php @@ -147,7 +147,7 @@ else 'template_set' => 'idots', 'theme' => 'idots', 'navbar_format' => 'icons', - 'tz_offset' => 0, + 'tz' => date_default_timezone_get(), 'dateformat' => $lang == 'en' ? 'Y/m/d' : 'd.m.Y', 'timeformat' => '24', 'lang' => $lang, diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php index 5094afcadc..efd561fc41 100644 --- a/setup/inc/class.setup.inc.php +++ b/setup/inc/class.setup.inc.php @@ -67,7 +67,7 @@ class setup * * @var float */ - var $required_php_version = 5.1; + var $required_php_version = 5.2; /** * PHP Version recommended for eGroupware * diff --git a/setup/inc/class.setup_process.inc.php b/setup/inc/class.setup_process.inc.php index def3150ff8..19f0ada5b1 100755 --- a/setup/inc/class.setup_process.inc.php +++ b/setup/inc/class.setup_process.inc.php @@ -223,7 +223,7 @@ class setup_process $current_config['webserver_url'] = '/egroupware'; $egroupwareDirName = 'egroupware'; } - if(!$is_windows) + if(!$is_windows) { if(@is_dir('/tmp')) { @@ -249,10 +249,6 @@ class setup_process $current_config['files_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\files'; $current_config['backup_dir'] = 'c:\\Program files\\'.$egroupwareDirName.'\\'.$GLOBALS['egw_setup']->ConfigDomain.'\\backup'; } - $datetime =& CreateObject('phpgwapi.egw_datetime'); - $current_config['tz_offset'] = $datetime->getbestguess(); - unset($datetime); - // RalfBecker: php.net recommend this for security reasons, it should be our default too $current_config['usecookies'] = 'True';