extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 10:53:39 +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 9439c2d799
commit 806ab83f3c
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,7 +566,6 @@ class calendar_boupdate extends calendar_bo
* *
* @param array $new_event the updated event * @param array $new_event the updated event
* @param array $old_event the event before the update * @param array $old_event the event before the update
* @todo check if there is a real change, not assume every save is a change
*/ */
function check4update($new_event,$old_event) function check4update($new_event,$old_event)
{ {
@ -574,15 +573,23 @@ class calendar_boupdate extends calendar_bo
$modified = $added = $deleted = array(); $modified = $added = $deleted = array();
//echo "<p>calendar_boupdate::check4update() new participants = ".print_r($new_event['participants'],true).", old participants =".print_r($old_event['participants'],true)."</p>\n"; //echo "<p>calendar_boupdate::check4update() new participants = ".print_r($new_event['participants'],true).", old participants =".print_r($old_event['participants'],true)."</p>\n";
foreach(['start','end','tz_id','owner','category','priority','public','title','description','location'] as $field)
{
if($new_event[$field] !== $old_event[$field])
{
$modified = $new_event['participants'];
break;
}
}
// Find modified and deleted participants ... // Find modified and deleted participants ...
foreach ((array)$old_event['participants'] as $old_userid => $old_status) foreach ((array)$old_event['participants'] as $old_userid => $old_status)
{ {
if (isset($new_event['participants'][$old_userid])) if (isset($new_event['participants'][$old_userid]) && $old_status !== $new_event['participants'][$old_userid])
{ {
$modified[$old_userid] = $new_event['participants'][$old_userid]; $modified[$old_userid] = $new_event['participants'][$old_userid];
} }
else else if (!isset($new_event['participants'][$old_userid]))
{ {
$deleted[$old_userid] = $old_status; $deleted[$old_userid] = $old_status;
} }
@ -956,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']));
@ -1061,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: '';
@ -1102,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);