holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not track participants, if none set

Browse Source
This commit is contained in:
Ralf Becker 2015-06-25 20:32:03 +00:00
parent 1bd48f294a
commit 9c73eeca62
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/inc/class.calendar_tracking.inc.php
View File

@ -132,13 +132,13 @@ class calendar_tracking extends bo_tracking
* If this is one of a recurring event, append the recur_date to the participant field so we can * If this is one of a recurring event, append the recur_date to the participant field so we can
* filter by it later. * filter by it later.
*/ */
$recur_prefix = $data['recur_date'] ? $data['recur_date'] : '';
if(is_array($data['participants'])) if(is_array($data['participants']))
{ {
$participants = $data['participants']; $participants = $data['participants'];
$data['participants'] = array(); $data['participants'] = array();
foreach($participants as $uid => $status) foreach($participants as $uid => $status)
{ {
$quantity = $role = $user_type = $user_id = null;
calendar_so::split_status($status, $quantity, $role); calendar_so::split_status($status, $quantity, $role);
calendar_so::split_user($uid, $user_type, $user_id); calendar_so::split_user($uid, $user_type, $user_id);
$field = is_numeric($uid) ? 'participants' : 'participants-'.$user_type; $field = is_numeric($uid) ? 'participants' : 'participants-'.$user_type;
@ -151,6 +151,12 @@ class calendar_tracking extends bo_tracking
); );
} }
} }
// if clients eg. CalDAV do NOT set participants, they are left untouched
// therefore we should not track them, as all updates then show up as all participants removed
elseif(!isset($data['participants']))
{
unset($old['participants']);
}
if(is_array($old['participants'])) if(is_array($old['participants']))
{ {
$participants = $old['participants']; $participants = $old['participants'];
@ -177,6 +183,7 @@ class calendar_tracking extends bo_tracking
*/ */
public function do_notifications($data,$old,$deleted=null) public function do_notifications($data,$old,$deleted=null)
{ {
unset($data, $old, $deleted); // unused, but required by function signature
return true; return true;
} }
} }