Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug where delegatee would be lost on task/event update (#5058)

Browse source 
Summary: Fixes #5058

Reviewers: #roundcube_kolab_plugins_developers, vanmeeuwen

Reviewed By: #roundcube_kolab_plugins_developers, vanmeeuwen

Differential Revision: https://git.kolab.org/D110
This commit is contained in:
Aleksander Machniak 2016-04-14 11:42:26 +02:00 • committed by Jeroen van Meeuwen (Kolab Systems)
parent faeeb8aafb
commit 55816351cb
3 changed files with 50 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/calendar/calendar.php
View file

@ -2988,17 +2988,7 @@ class calendar extends rcube_plugin
// preserve my participant status for regular updates // preserve my participant status for regular updates
if (empty($status)) { if (empty($status)) {
$emails = $this->get_user_emails(); $this->lib->merge_attendees($event, $existing);
foreach ($event['attendees'] as $i => $attendee) {
if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
foreach ($existing['attendees'] as $j => $_attendee) {
if ($attendee['email'] == $_attendee['email']) {
$event['attendees'][$i] = $existing['attendees'][$j];
break;
}
}
}
}
} }
// set status=CANCELLED on CANCEL messages // set status=CANCELLED on CANCEL messages

48
plugins/libcalendaring/libcalendaring.php
View file

@ -1537,6 +1537,54 @@ class libcalendaring extends rcube_plugin
$this->rc->output->command('plugin.expand_attendee_callback', $result); $this->rc->output->command('plugin.expand_attendee_callback', $result);
} }
/**
* Merge attendees of the old and new event version
* with keeping current user and his delegatees status
*
* @param array &$new New object data
* @param array $old Old object data
*/
public function merge_attendees(&$new, $old)
{
$emails = $this->get_user_emails();
$delegates = array();
$attendees = array();
// keep attendee status of the current user
foreach ((array) $new['attendees'] as $i => $attendee) {
if (empty($attendee['email'])) {
continue;
}
$attendees[] = $email = strtolower($attendee['email']);
if (in_array($email, $emails)) {
foreach ($old['attendees'] as $_attendee) {
if ($attendee['email'] == $_attendee['email']) {
$new['attendees'][$i] = $_attendee;
if ($_attendee['status'] == 'DELEGATED' && ($email = $_attendee['delegated-to'])) {
$delegates[] = strtolower($email);
}
break;
}
}
}
}
// make sure delegated attendee is not lost
foreach ($delegates as $delegatee) {
if (!in_array($delegatee, $attendees)) {
foreach ((array) $old['attendees'] as $attendee) {
if ($attendee['email'] && ($email = strtolower($attendee['email'])) && $email == $delegatee) {
$new['attendees'][] = $attendee;
break;
}
}
}
}
}
/********* Static utility functions *********/ /********* Static utility functions *********/

12
plugins/tasklist/tasklist.php
View file

@ -2066,17 +2066,7 @@ class tasklist extends rcube_plugin
// preserve my participant status for regular updates // preserve my participant status for regular updates
if (empty($status)) { if (empty($status)) {
$emails = $this->lib->get_user_emails(); $this->lib->merge_attendees($task, $existing);
foreach ($task['attendees'] as $i => $attendee) {
if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
foreach ($existing['attendees'] as $j => $_attendee) {
if ($attendee['email'] == $_attendee['email']) {
$task['attendees'][$i] = $existing['attendees'][$j];
break;
}
}
}
}
} }
// set status=CANCELLED on CANCEL messages // set status=CANCELLED on CANCEL messages