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

if iCal file contains no participant information, always add current user as participant

Browse Source 
fixes importing events w/o participants won't add current user to existing event, imported for another user before
This commit is contained in:
ralf 2024-06-06 14:13:12 +02:00
parent 5a48b4ac57
commit 02d0f8327b
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1303,40 +1303,42 @@ class calendar_ical extends calendar_boupdate
{ {
$event['id'] = $event_info['stored_event']['id']; // CalDAV does only provide UIDs $event['id'] = $event_info['stored_event']['id']; // CalDAV does only provide UIDs
} }
if (is_array($event['participants'])) // if file contains no participants add current user
if (empty($event['participants']))
{ {
// if the client does not return a status, we restore the original one $event['participants'] = [$user => calendar_so::combine_status('A'));
foreach ($event['participants'] as $uid => $status) }
// if the client does not return a status, we restore the original one
foreach ($event['participants'] as $uid => $status)
{
// Work around problems with Outlook CalDAV Synchronizer (https://caldavsynchronizer.org/)
// - always sends all participants back with status NEEDS-ACTION --> resets status of all participant, if user has edit rights
// --> allow only updates with other status then NEEDS-ACTION and therefore allow accepting or denying meeting requests for the user himself
if ($status[0] === 'X' || calendar_groupdav::get_agent() === 'caldavsynchronizer' && $status[0] === 'U')
{ {
// Work around problems with Outlook CalDAV Synchronizer (https://caldavsynchronizer.org/) if (isset($event_info['stored_event']['participants'][$uid]))
// - always sends all participants back with status NEEDS-ACTION --> resets status of all participant, if user has edit rights
// --> allow only updates with other status then NEEDS-ACTION and therefore allow accepting or denying meeting requests for the user himself
if ($status[0] === 'X' || calendar_groupdav::get_agent() === 'caldavsynchronizer' && $status[0] === 'U')
{ {
if (isset($event_info['stored_event']['participants'][$uid])) if ($this->log)
{ {
if ($this->log) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
{ "() Restore status for $uid\n",3,$this->logfile);
error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
"() Restore status for $uid\n",3,$this->logfile);
}
$event['participants'][$uid] = $event_info['stored_event']['participants'][$uid];
}
else
{
$event['participants'][$uid] = calendar_so::combine_status('U');
} }
$event['participants'][$uid] = $event_info['stored_event']['participants'][$uid];
} }
// restore resource-quantity from existing event as neither iOS nor Thunderbird returns our X-EGROUPWARE-QUANTITY else
elseif ($uid[0] === 'r' && isset($event_info['stored_event']['participants'][$uid]))
{ {
$quantity = $role = $old_quantity = null; $event['participants'][$uid] = calendar_so::combine_status('U');
calendar_so::split_status($status, $quantity, $role); }
calendar_so::split_status($event_info['stored_event']['participants'][$uid], $old_quantity); }
if ($old_quantity > 1) // 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]))
$event['participants'][$uid] = calendar_so::combine_status('U', $old_quantity, $role); {
} $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);
} }
} }
} }