sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16560 from nextcloud/bugfix/noid/fix_cutype_reporting 

fix calendar-user-type reporting
pull/16581/head
Roeland Jago Douma 2019-07-27 12:23:25 +07:00 committed by GitHub
parent 9ef23e2362 6a2a5465cf
commit 1ec98af3e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/dav/lib/CalDAV/Schedule/Plugin.php
Unescape Escape View File

@ -27,6 +27,7 @@ namespace OCA\DAV\CalDAV\Schedule;
use OCA\DAV\CalDAV\CalDavBackend;
use OCA\DAV\CalDAV\CalendarHome;
use Sabre\DAV\INode;
use Sabre\DAV\IProperties;
use Sabre\DAV\PropFind;
use Sabre\DAV\Server;
use Sabre\DAV\Xml\Property\LocalHref;
@ -55,19 +56,23 @@ class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
* @return void
*/
function propFind(PropFind $propFind, INode $node) {
// overwrite Sabre/Dav's implementation
$propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function() use ($node) {
$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
$props = $node->getProperties([$calendarUserType]);
if (isset($props[$calendarUserType])) {
return $props[$calendarUserType];
}
parent::propFind($propFind, $node);
return 'INDIVIDUAL';
});
if ($node instanceof IPrincipal) {
// overwrite Sabre/Dav's implementation
$propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function () use ($node) {
if ($node instanceof IProperties) {
$calendarUserType = '{' . self::NS_CALDAV . '}calendar-user-type';
$props = $node->getProperties([$calendarUserType]);
if (isset($props[$calendarUserType])) {
return $props[$calendarUserType];
}
}
parent::propFind($propFind, $node);
return 'INDIVIDUAL';
});
}
}
/**