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

fixed wrong logic in alias update: windows timezone is added as alias for an existing tzid, value new tz_alias column is the id of the given tzid

Browse Source
This commit is contained in:
Ralf Becker 2011-10-11 11:43:18 +00:00
parent 873c737b8c
commit 84c4174a3a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_timezones.inc.php
View File

@ -287,15 +287,17 @@ class calendar_timezones
$updated = 0; $updated = 0;
foreach($tz_aliases as $alias => $tzid) foreach($tz_aliases as $alias => $tzid)
{ {
if (self::tz2id($tzid, 'alias') !== $alias) // not in DB or different if ((!($alias_id=self::tz2id($alias, 'alias')) || self::id2tz($alias_id, 'tzid') !== $tzid) && // not in DB or different
($tz_id = self::tz2id($tzid))) // given tzid for alias exists in DB
{ {
$GLOBALS['egw']->db->insert('egw_cal_timezones',array( $GLOBALS['egw']->db->insert('egw_cal_timezones',array(
'tz_alias' => $alias, 'tz_alias' => $tz_id,
),array( ),array(
'tz_tzid' => $tzid, 'tz_tzid' => $alias,
),__LINE__,__FILE__,'calendar'); ),__LINE__,__FILE__,'calendar');
++$updated; ++$updated;
} }
//error_log(__METHOD__."() alias=$alias, tzid=$tzid --> self::tz2id('$alias', 'alias') = ".array2string($alias_id).", self::tz2id('$tzid')=".array2string($tz_id));
} }
config::save_value('tz_aliases_mtime',$tz_aliases_mtime,$app='phpgwapi'); config::save_value('tz_aliases_mtime',$tz_aliases_mtime,$app='phpgwapi');