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

Calendar: Fix missing notification placeholders $$date$$ and $$fullname$$

Browse Source
This commit is contained in:
nathan 2021-12-08 10:59:18 -07:00
parent 8968ef9204
commit 4c3c28a05f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -577,7 +577,7 @@ class calendar_boupdate extends calendar_bo
{ {
if($new_event[$field] !== $old_event[$field]) if($new_event[$field] !== $old_event[$field])
{ {
$modified = array_keys($new_event['participants']); $modified = $new_event['participants'];
break; break;
} }
} }
@ -963,6 +963,7 @@ class calendar_boupdate extends calendar_bo
// Event is passed in user time, make sure that's taken into account for date calculations // Event is passed in user time, make sure that's taken into account for date calculations
$user_prefs = $GLOBALS['egw_info']['user']['preferences']; $user_prefs = $GLOBALS['egw_info']['user']['preferences'];
$date = new Api\DateTime('now',new DateTimeZone($user_prefs['common']['tz']));
$startdate = new Api\DateTime($event['start'], new DateTimeZone($user_prefs['common']['tz'])); $startdate = new Api\DateTime($event['start'], new DateTimeZone($user_prefs['common']['tz']));
$enddate = new Api\DateTime($event['end'], new DateTimeZone($user_prefs['common']['tz'])); $enddate = new Api\DateTime($event['end'], new DateTimeZone($user_prefs['common']['tz']));
$modified = new Api\DateTime($event['modified'], new DateTimeZone($user_prefs['common']['tz'])); $modified = new Api\DateTime($event['modified'], new DateTimeZone($user_prefs['common']['tz']));
@ -1068,6 +1069,7 @@ class calendar_boupdate extends calendar_bo
$event_arr = null; $event_arr = null;
$details = $this->_get_event_details(isset($cleared_event) ? $cleared_event : $event, $details = $this->_get_event_details(isset($cleared_event) ? $cleared_event : $event,
$action, $event_arr, $disinvited); $action, $event_arr, $disinvited);
$details['fullname'] = Api\Accounts::username($userid);
$details['to-fullname'] = $fullname; $details['to-fullname'] = $fullname;
$details['to-firstname'] = isset($tfn)? $tfn: ''; $details['to-firstname'] = isset($tfn)? $tfn: '';
$details['to-lastname'] = isset($tln)? $tln: ''; $details['to-lastname'] = isset($tln)? $tln: '';
@ -1109,6 +1111,10 @@ class calendar_boupdate extends calendar_bo
$details['updated'] = $modified->format($timeformat) . ', ' . Api\Accounts::username($event['modifier']); $details['updated'] = $modified->format($timeformat) . ', ' . Api\Accounts::username($event['modifier']);
$cleared_event['updated'] = $modified; $cleared_event['updated'] = $modified;
// Current date doesn't need to go into the cleared event, just for details
$date->setTimezone($timezone);
$details['date'] = $date->format($timeformat);
if ($old_event != False) if ($old_event != False)
{ {
$olddate->setTimezone($timezone); $olddate->setTimezone($timezone);