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

fix wrongly displayed time in alarms

Browse Source
This commit is contained in:
Ralf Becker 2018-08-13 15:22:09 +02:00
parent ffca2aa4ea
commit d2b2924638
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1777,6 +1777,8 @@ class calendar_uiforms extends calendar_ui
continue; // no read rights to the calendar of the alarm-owner, dont show the alarm continue; // no read rights to the calendar of the alarm-owner, dont show the alarm
} }
$alarm['all'] = (int) $alarm['all']; $alarm['all'] = (int) $alarm['all'];
// fix alarm time in case of alread run alarms, where the time will be their keep_time / when they will be cleaned up otherwise
$alarm['time'] = $event['start'] - $alarm['offset'];
$after = false; $after = false;
if($alarm['offset'] < 0) if($alarm['offset'] < 0)
{ {
@ -1798,8 +1800,6 @@ class calendar_uiforms extends calendar_ui
{ {
$alarm['offset'] = implode(', ',$label) . ' ' . ($after ? lang('after') : lang('before')); $alarm['offset'] = implode(', ',$label) . ' ' . ($after ? lang('after') : lang('before'));
} }
// fix alarm time in case of alread run alarms, where the time will be their keep_time / when they will be cleaned up otherwise
$alarm['time'] = $event['start'] - $alarm['offset'];
$content['alarm'][] = $alarm; $content['alarm'][] = $alarm;
$readonlys['alarm[delete_alarm]['.$alarm['id'].']'] = !$this->bo->check_perms(Acl::EDIT,$alarm['all'] ? $event : 0,$alarm['owner']); $readonlys['alarm[delete_alarm]['.$alarm['id'].']'] = !$this->bo->check_perms(Acl::EDIT,$alarm['all'] ? $event : 0,$alarm['owner']);