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

- silently use server_timezone if wrong user timezone preference is set, as we can not (easily) report it to the user at the stage of initialising EGroupware

Browse Source 
- if server_timezone is NOT valid, try (and permanently store!) date_default_timezone_get() frist and then "Europe/Berlin"
This commit is contained in:
Ralf Becker 2011-08-01 13:04:40 +00:00
parent 09963248f1
commit 6d8c35496a
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpgwapi/inc/class.egw_time.inc.php
View File

@ -374,9 +374,8 @@ class egw_time extends DateTime
} }
catch(Exception $e) catch(Exception $e)
{ {
throw new egw_exception_wrong_userinput(lang('You need to %1set your timezone preference%2.','<a href="'.egw::link('/index.php',array( // silently use server timezone, as we have no means to report the wrong timezone to the user from this class
'menuaction' => 'preferences.uisettings.index', self::$user_timezone = clone(self::$server_timezone);
'appname' => 'preferences')).'">','</a>'));
} }
return self::$user_timezone; return self::$user_timezone;
} }
@ -406,7 +405,22 @@ class egw_time extends DateTime
{ {
$GLOBALS['egw_info']['server']['server_timezone'] = date_default_timezone_get(); $GLOBALS['egw_info']['server']['server_timezone'] = date_default_timezone_get();
} }
// make sure we have a valid server timezone set
try {
self::$server_timezone = new DateTimeZone($GLOBALS['egw_info']['server']['server_timezone']); self::$server_timezone = new DateTimeZone($GLOBALS['egw_info']['server']['server_timezone']);
}
catch(Exception $e)
{
try {
self::$server_timezone = new DateTimeZone(date_default_timezone_get());
}
catch(Exception $e)
{
self::$server_timezone = new DateTimeZone('Europe/Berlin');
}
error_log(__METHOD__."() invalid server_timezone='{$GLOBALS['egw_info']['server']['server_timezone']}' setting now '".self::$server_timezone->getName()."'!");
config::save_value('server_timezone',$GLOBALS['egw_info']['server']['server_timezone'] = self::$server_timezone->getName(),'phpgwapi');
}
if (!isset($GLOBALS['egw_info']['user']['preferences']['common']['tz'])) if (!isset($GLOBALS['egw_info']['user']['preferences']['common']['tz']))
{ {
$GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone']; $GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];