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

use X-CALENDARSERVER-ACCESS attribute on vCalendar only for CalDAV, not eg. for file export and import

Browse Source
This commit is contained in:
Ralf Becker 2015-06-22 14:12:56 +00:00
parent 6cc8826732
commit e3748b2e95
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -529,7 +529,10 @@ class calendar_ical extends calendar_boupdate
case 'CLASS':
$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
// Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!)
if (!$event['public']) $vcal->setAttribute('X-CALENDARSERVER-ACCESS', 'CONFIDENTIAL');
if (!$event['public'] && $this->productManufacturer == 'GroupDAV')
{
$vcal->setAttribute('X-CALENDARSERVER-ACCESS', 'CONFIDENTIAL');
}
break;
case 'ORGANIZER':
@ -2998,7 +3001,8 @@ class calendar_ical extends calendar_boupdate
}
// Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!)
if (($x_calendarserver_access = $component->_container->getAttribute('X-CALENDARSERVER-ACCESS')) &&
if ($this->productManufacturer == 'GroupDAV' &&
($x_calendarserver_access = $component->_container->getAttribute('X-CALENDARSERVER-ACCESS')) &&
!is_a($x_calendarserver_access, 'PEAR_Error'))
{
$event['public'] = (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');