extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: Fix alarm for all users had wrong timezone when user timezone was not server timezone

Browse Source
This commit is contained in:
nathangray 2021-01-27 11:04:08 -07:00
parent b247554141
commit d0d7031417
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1475,6 +1475,8 @@ class calendar_boupdate extends calendar_bo
$this->enum_groups($expanded); $this->enum_groups($expanded);
foreach($event['alarm'] as $id => &$alarm) foreach($event['alarm'] as $id => &$alarm)
{ {
$alarm['time'] = $this->date2ts($alarm['time'],true); // user to server-time
// remove alarms belonging to not longer existing or rejected participants // remove alarms belonging to not longer existing or rejected participants
if ($alarm['owner'] && isset($expanded['participants'])) if ($alarm['owner'] && isset($expanded['participants']))
{ {
@ -1489,7 +1491,6 @@ class calendar_boupdate extends calendar_bo
//error_log(__LINE__.': '.__METHOD__."(".array2string($event).") deleting alarm=".array2string($alarm).", $status=".array2string($alarm)); //error_log(__LINE__.': '.__METHOD__."(".array2string($event).") deleting alarm=".array2string($alarm).", $status=".array2string($alarm));
} }
} }
$alarm['time'] = $this->date2ts($alarm['time'],true); // user to server-time
} }
} }
// update all existing alarm times, in case alarm got moved and alarms are not include in $event // update all existing alarm times, in case alarm got moved and alarms are not include in $event