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

Calendar: Make sure videoconference & notify_externals attributes have X-EGROUPWARE to avoid errors from clients

Browse Source
This commit is contained in:
nathangray 2021-04-20 11:44:44 -06:00
parent 669e8d8c95
commit 80f797567d
1 changed files with 15 additions and 2 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

@ -865,6 +865,12 @@ class calendar_ical extends calendar_boupdate
{ {
if (substr($name, 0, 2) == '##') if (substr($name, 0, 2) == '##')
{ {
$attr_name = substr($name, 2);
// Apply prefix to our stuff
if(in_array($attr_name,['videoconference','notify_externals']))
{
$attr_name = 'X-EGROUPWARE-'.$attr_name;
}
if ($value[0] === '{' && ($attr = json_decode($value, true)) && is_array($attr)) if ($value[0] === '{' && ($attr = json_decode($value, true)) && is_array($attr))
{ {
// check if attribute was stored compressed --> uncompress it // check if attribute was stored compressed --> uncompress it
@ -873,11 +879,11 @@ class calendar_ical extends calendar_boupdate
$attr = json_decode(gzuncompress(base64_decode($attr['gzcompress'])), true); $attr = json_decode(gzuncompress(base64_decode($attr['gzcompress'])), true);
if (!is_array($attr)) continue; if (!is_array($attr)) continue;
} }
$vevent->setAttribute(substr($name, 2), $attr['value'], $attr['params'], true, $attr['values']); $vevent->setAttribute($attr_name, $attr['value'], $attr['params'], true, $attr['values']);
} }
else else
{ {
$vevent->setAttribute(substr($name, 2), $value); $vevent->setAttribute($attr_name, $value);
} }
} }
} }
@ -3039,6 +3045,13 @@ class calendar_ical extends calendar_boupdate
$event['status'] = $attributes['value']; $event['status'] = $attributes['value'];
break; break;
case 'X-EGROUPWARE-NOTIFY_EXTERNALS':
$event['##notify_externals'] = $attributes['value'];
break;
case 'X-EGROUPWARE-VIDEOCONFERENCE':
$event['##videoconference'] = $attributes['value'];
break;
// ignore all PROPS, we dont want to store like X-properties or unsupported props // ignore all PROPS, we dont want to store like X-properties or unsupported props
case 'DTSTAMP': case 'DTSTAMP':
case 'SEQUENCE': case 'SEQUENCE':