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

* CalDAV/Calendar/Resources: do not allow to change resource quantity via CalDAV

Browse Source 
Resource quantity is restored from existing event, as neither iOS nor Thunderbird returns our X-EGROUPWARE-QUANTITY attribute on the attendee. Also display quantity > 1 in brackets after resource name.
This commit is contained in:
Ralf Becker 2018-08-06 19:04:41 +02:00
parent 17f8e3016b
commit a2758c4319
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
calendar/inc/class.calendar_ical.inc.php
View File

@ -541,7 +541,11 @@ class calendar_ical extends calendar_boupdate
$options['EMAIL'] = $info['email']; // only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
}
if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
if ($quantity > 1)
{
$options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
$options['CN'] .= ' ('.$quantity.')';
}
$attributes['ATTENDEE'][] = $participantURL;
$parameters['ATTENDEE'][] = $options;
}
@ -1267,6 +1271,17 @@ class calendar_ical extends calendar_boupdate
$event['participants'][$uid] = calendar_so::combine_status('U');
}
}
// restore resource-quantity from existing event as neither iOS nor Thunderbird returns our X-EGROUPWARE-QUANTITY
elseif ($uid[0] === 'r' && isset($event_info['stored_event']['participants'][$uid]))
{
$quantity = $role = $old_quantity = null;
calendar_so::split_status($status, $quantity, $role);
calendar_so::split_status($event_info['stored_event']['participants'][$uid], $old_quantity);
if ($old_quantity > 1)
{
$event['participants'][$uid] = calendar_so::combine_status('U', $old_quantity, $role);
}
}
}
}
// unset old X-* attributes stored in custom-fields