Dolibarr / dolibarr

htdocs/includes/sabre/psr/log/Psr/Log/LoggerAwareInterface.php

Indentation +8 added lines, -8 removed lines

@@ -7,12 +7,12 @@
  */
 interface LoggerAwareInterface
 {
-    /**
-     * Sets a logger instance on the object.
-     *
-     * @param LoggerInterface $logger
-     *
-     * @return void
-     */
-    public function setLogger(LoggerInterface $logger);
+	/**
+	 * Sets a logger instance on the object.
+	 *
+	 * @param LoggerInterface $logger
+	 *
+	 * @return void
+	 */
+	public function setLogger(LoggerInterface $logger);
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Plugin.php

Indentation +969 added lines, -969 removed lines

@@ -30,918 +30,918 @@ 
  */
 class Plugin extends DAV\ServerPlugin
 {
-    /**
-     * This is the official CalDAV namespace.
-     */
-    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
-
-    /**
-     * This is the namespace for the proprietary calendarserver extensions.
-     */
-    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-    /**
-     * The hardcoded root for calendar objects. It is unfortunate
-     * that we're stuck with it, but it will have to do for now.
-     */
-    const CALENDAR_ROOT = 'calendars';
-
-    /**
-     * Reference to server object.
-     *
-     * @var DAV\Server
-     */
-    protected $server;
-
-    /**
-     * The default PDO storage uses a MySQL MEDIUMBLOB for iCalendar data,
-     * which can hold up to 2^24 = 16777216 bytes. This is plenty. We're
-     * capping it to 10M here.
-     */
-    protected $maxResourceSize = 10000000;
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     *
-     * @return array
-     */
-    public function getHTTPMethods($uri)
-    {
-        // The MKCALENDAR is only available on unmapped uri's, whose
-        // parents extend IExtendedCollection
-        list($parent, $name) = Uri\split($uri);
-
-        if ('' === $uri) {
-            $parent = '';
-        }
-
-        $node = $this->server->tree->getNodeForPath($parent);
-
-        if ($node instanceof DAV\IExtendedCollection) {
-            try {
-                $node->getChild($name);
-            } catch (DAV\Exception\NotFound $e) {
-                return ['MKCALENDAR'];
-            }
-        }
-
-        return [];
-    }
-
-    /**
-     * Returns the path to a principal's calendar home.
-     *
-     * The return url must not end with a slash.
-     * This function should return null in case a principal did not have
-     * a calendar home.
-     *
-     * @param string $principalUrl
-     *
-     * @return string
-     */
-    public function getCalendarHomeForPrincipal($principalUrl)
-    {
-        // The default behavior for most sabre/dav servers is that there is a
-        // principals root node, which contains users directly under it.
-        //
-        // This function assumes that there are two components in a principal
-        // path. If there's more, we don't return a calendar home. This
-        // excludes things like the calendar-proxy-read principal (which it
-        // should).
-        $parts = explode('/', trim($principalUrl, '/'));
-        if (2 !== count($parts)) {
-            return;
-        }
-        if ('principals' !== $parts[0]) {
-            return;
-        }
-
-        return self::CALENDAR_ROOT.'/'.$parts[1];
-    }
-
-    /**
-     * Returns a list of features for the DAV: HTTP header.
-     *
-     * @return array
-     */
-    public function getFeatures()
-    {
-        return ['calendar-access', 'calendar-proxy'];
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName()
-    {
-        return 'caldav';
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     *
-     * @return array
-     */
-    public function getSupportedReportSet($uri)
-    {
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        $reports = [];
-        if ($node instanceof ICalendarObjectContainer || $node instanceof ICalendarObject) {
-            $reports[] = '{'.self::NS_CALDAV.'}calendar-multiget';
-            $reports[] = '{'.self::NS_CALDAV.'}calendar-query';
-        }
-        if ($node instanceof ICalendar) {
-            $reports[] = '{'.self::NS_CALDAV.'}free-busy-query';
-        }
-        // iCal has a bug where it assumes that sync support is enabled, only
-        // if we say we support it on the calendar-home, even though this is
-        // not actually the case.
-        if ($node instanceof CalendarHome && $this->server->getPlugin('sync')) {
-            $reports[] = '{DAV:}sync-collection';
-        }
-
-        return $reports;
-    }
-
-    /**
-     * Initializes the plugin.
-     */
-    public function initialize(DAV\Server $server)
-    {
-        $this->server = $server;
-
-        $server->on('method:MKCALENDAR', [$this, 'httpMkCalendar']);
-        $server->on('report', [$this, 'report']);
-        $server->on('propFind', [$this, 'propFind']);
-        $server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel']);
-        $server->on('beforeCreateFile', [$this, 'beforeCreateFile']);
-        $server->on('beforeWriteContent', [$this, 'beforeWriteContent']);
-        $server->on('afterMethod:GET', [$this, 'httpAfterGET']);
-        $server->on('getSupportedPrivilegeSet', [$this, 'getSupportedPrivilegeSet']);
-
-        $server->xml->namespaceMap[self::NS_CALDAV] = 'cal';
-        $server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
-
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-query'] = 'Sabre\\CalDAV\\Xml\\Request\\CalendarQueryReport';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-multiget'] = 'Sabre\\CalDAV\\Xml\\Request\\CalendarMultiGetReport';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}free-busy-query'] = 'Sabre\\CalDAV\\Xml\\Request\\FreeBusyQueryReport';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}mkcalendar'] = 'Sabre\\CalDAV\\Xml\\Request\\MkCalendar';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}schedule-calendar-transp'] = 'Sabre\\CalDAV\\Xml\\Property\\ScheduleCalendarTransp';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet';
-
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
-
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
-
-        array_push($server->protectedProperties,
-            '{'.self::NS_CALDAV.'}supported-calendar-component-set',
-            '{'.self::NS_CALDAV.'}supported-calendar-data',
-            '{'.self::NS_CALDAV.'}max-resource-size',
-            '{'.self::NS_CALDAV.'}min-date-time',
-            '{'.self::NS_CALDAV.'}max-date-time',
-            '{'.self::NS_CALDAV.'}max-instances',
-            '{'.self::NS_CALDAV.'}max-attendees-per-instance',
-            '{'.self::NS_CALDAV.'}calendar-home-set',
-            '{'.self::NS_CALDAV.'}supported-collation-set',
-            '{'.self::NS_CALDAV.'}calendar-data',
-
-            // CalendarServer extensions
-            '{'.self::NS_CALENDARSERVER.'}getctag',
-            '{'.self::NS_CALENDARSERVER.'}calendar-proxy-read-for',
-            '{'.self::NS_CALENDARSERVER.'}calendar-proxy-write-for'
-        );
-
-        if ($aclPlugin = $server->getPlugin('acl')) {
-            $aclPlugin->principalSearchPropertySet['{'.self::NS_CALDAV.'}calendar-user-address-set'] = 'Calendar address';
-        }
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CalDAV.
-     *
-     * @param string $reportName
-     * @param mixed  $report
-     * @param mixed  $path
-     *
-     * @return bool|null
-     */
-    public function report($reportName, $report, $path)
-    {
-        switch ($reportName) {
-            case '{'.self::NS_CALDAV.'}calendar-multiget':
-                $this->server->transactionType = 'report-calendar-multiget';
-                $this->calendarMultiGetReport($report);
-
-                return false;
-            case '{'.self::NS_CALDAV.'}calendar-query':
-                $this->server->transactionType = 'report-calendar-query';
-                $this->calendarQueryReport($report);
-
-                return false;
-            case '{'.self::NS_CALDAV.'}free-busy-query':
-                $this->server->transactionType = 'report-free-busy-query';
-                $this->freeBusyQueryReport($report);
-
-                return false;
-        }
-    }
-
-    /**
-     * This function handles the MKCALENDAR HTTP method, which creates
-     * a new calendar.
-     *
-     * @return bool
-     */
-    public function httpMkCalendar(RequestInterface $request, ResponseInterface $response)
-    {
-        $body = $request->getBodyAsString();
-        $path = $request->getPath();
-
-        $properties = [];
-
-        if ($body) {
-            try {
-                $mkcalendar = $this->server->xml->expect(
-                    '{urn:ietf:params:xml:ns:caldav}mkcalendar',
-                    $body
-                );
-            } catch (\Sabre\Xml\ParseException $e) {
-                throw new BadRequest($e->getMessage(), 0, $e);
-            }
-            $properties = $mkcalendar->getProperties();
-        }
-
-        // iCal abuses MKCALENDAR since iCal 10.9.2 to create server-stored
-        // subscriptions. Before that it used MKCOL which was the correct way
-        // to do this.
-        //
-        // If the body had a {DAV:}resourcetype, it means we stumbled upon this
-        // request, and we simply use it instead of the pre-defined list.
-        if (isset($properties['{DAV:}resourcetype'])) {
-            $resourceType = $properties['{DAV:}resourcetype']->getValue();
-        } else {
-            $resourceType = ['{DAV:}collection', '{urn:ietf:params:xml:ns:caldav}calendar'];
-        }
-
-        $this->server->createCollection($path, new MkCol($resourceType, $properties));
-
-        $response->setStatus(201);
-        $response->setHeader('Content-Length', 0);
-
-        // This breaks the method chain.
-        return false;
-    }
-
-    /**
-     * PropFind.
-     *
-     * This method handler is invoked before any after properties for a
-     * resource are fetched. This allows us to add in any CalDAV specific
-     * properties.
-     */
-    public function propFind(DAV\PropFind $propFind, DAV\INode $node)
-    {
-        $ns = '{'.self::NS_CALDAV.'}';
-
-        if ($node instanceof ICalendarObjectContainer) {
-            $propFind->handle($ns.'max-resource-size', $this->maxResourceSize);
-            $propFind->handle($ns.'supported-calendar-data', function () {
-                return new Xml\Property\SupportedCalendarData();
-            });
-            $propFind->handle($ns.'supported-collation-set', function () {
-                return new Xml\Property\SupportedCollationSet();
-            });
-        }
-
-        if ($node instanceof DAVACL\IPrincipal) {
-            $principalUrl = $node->getPrincipalUrl();
-
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-home-set', function () use ($principalUrl) {
-                $calendarHomePath = $this->getCalendarHomeForPrincipal($principalUrl);
-                if (is_null($calendarHomePath)) {
-                    return null;
-                }
-
-                return new LocalHref($calendarHomePath.'/');
-            });
-            // The calendar-user-address-set property is basically mapped to
-            // the {DAV:}alternate-URI-set property.
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-user-address-set', function () use ($node) {
-                $addresses = $node->getAlternateUriSet();
-                $addresses[] = $this->server->getBaseUri().$node->getPrincipalUrl().'/';
-
-                return new LocalHref($addresses);
-            });
-            // For some reason somebody thought it was a good idea to add
-            // another one of these properties. We're supporting it too.
-            $propFind->handle('{'.self::NS_CALENDARSERVER.'}email-address-set', function () use ($node) {
-                $addresses = $node->getAlternateUriSet();
-                $emails = [];
-                foreach ($addresses as $address) {
-                    if ('mailto:' === substr($address, 0, 7)) {
-                        $emails[] = substr($address, 7);
-                    }
-                }
-
-                return new Xml\Property\EmailAddressSet($emails);
-            });
-
-            // These two properties are shortcuts for ical to easily find
-            // other principals this principal has access to.
-            $propRead = '{'.self::NS_CALENDARSERVER.'}calendar-proxy-read-for';
-            $propWrite = '{'.self::NS_CALENDARSERVER.'}calendar-proxy-write-for';
-
-            if (404 === $propFind->getStatus($propRead) || 404 === $propFind->getStatus($propWrite)) {
-                $aclPlugin = $this->server->getPlugin('acl');
-                $membership = $aclPlugin->getPrincipalMembership($propFind->getPath());
-                $readList = [];
-                $writeList = [];
-
-                foreach ($membership as $group) {
-                    $groupNode = $this->server->tree->getNodeForPath($group);
-
-                    $listItem = Uri\split($group)[0].'/';
-
-                    // If the node is either ap proxy-read or proxy-write
-                    // group, we grab the parent principal and add it to the
-                    // list.
-                    if ($groupNode instanceof Principal\IProxyRead) {
-                        $readList[] = $listItem;
-                    }
-                    if ($groupNode instanceof Principal\IProxyWrite) {
-                        $writeList[] = $listItem;
-                    }
-                }
-
-                $propFind->set($propRead, new LocalHref($readList));
-                $propFind->set($propWrite, new LocalHref($writeList));
-            }
-        } // instanceof IPrincipal
-
-        if ($node instanceof ICalendarObject) {
-            // The calendar-data property is not supposed to be a 'real'
-            // property, but in large chunks of the spec it does act as such.
-            // Therefore we simply expose it as a property.
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-data', function () use ($node) {
-                $val = $node->get();
-                if (is_resource($val)) {
-                    $val = stream_get_contents($val);
-                }
-
-                // Taking out \r to not screw up the xml output
-                return str_replace("\r", '', $val);
-            });
-        }
-    }
-
-    /**
-     * This function handles the calendar-multiget REPORT.
-     *
-     * This report is used by the client to fetch the content of a series
-     * of urls. Effectively avoiding a lot of redundant requests.
-     *
-     * @param CalendarMultiGetReport $report
-     */
-    public function calendarMultiGetReport($report)
-    {
-        $needsJson = 'application/calendar+json' === $report->contentType;
-
-        $timeZones = [];
-        $propertyList = [];
-
-        $paths = array_map(
-            [$this->server, 'calculateUri'],
-            $report->hrefs
-        );
-
-        foreach ($this->server->getPropertiesForMultiplePaths($paths, $report->properties) as $uri => $objProps) {
-            if (($needsJson || $report->expand) && isset($objProps[200]['{'.self::NS_CALDAV.'}calendar-data'])) {
-                $vObject = VObject\Reader::read($objProps[200]['{'.self::NS_CALDAV.'}calendar-data']);
-
-                if ($report->expand) {
-                    // We're expanding, and for that we need to figure out the
-                    // calendar's timezone.
-                    list($calendarPath) = Uri\split($uri);
-                    if (!isset($timeZones[$calendarPath])) {
-                        // Checking the calendar-timezone property.
-                        $tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
-                        $tzResult = $this->server->getProperties($calendarPath, [$tzProp]);
-                        if (isset($tzResult[$tzProp])) {
-                            // This property contains a VCALENDAR with a single
-                            // VTIMEZONE.
-                            $vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
-                            $timeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
-                        } else {
-                            // Defaulting to UTC.
-                            $timeZone = new DateTimeZone('UTC');
-                        }
-                        $timeZones[$calendarPath] = $timeZone;
-                    }
-
-                    $vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $timeZones[$calendarPath]);
-                }
-                if ($needsJson) {
-                    $objProps[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
-                } else {
-                    $objProps[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
-                }
-                // Destroy circular references so PHP will garbage collect the
-                // object.
-                $vObject->destroy();
-            }
-
-            $propertyList[] = $objProps;
-        }
-
-        $prefer = $this->server->getHTTPPrefer();
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($propertyList, 'minimal' === $prefer['return']));
-    }
-
-    /**
-     * This function handles the calendar-query REPORT.
-     *
-     * This report is used by clients to request calendar objects based on
-     * complex conditions.
-     *
-     * @param Xml\Request\CalendarQueryReport $report
-     */
-    public function calendarQueryReport($report)
-    {
-        $path = $this->server->getRequestUri();
-
-        $needsJson = 'application/calendar+json' === $report->contentType;
-
-        $node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
-        $depth = $this->server->getHTTPDepth(0);
-
-        // The default result is an empty array
-        $result = [];
-
-        $calendarTimeZone = null;
-        if ($report->expand) {
-            // We're expanding, and for that we need to figure out the
-            // calendar's timezone.
-            $tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
-            $tzResult = $this->server->getProperties($path, [$tzProp]);
-            if (isset($tzResult[$tzProp])) {
-                // This property contains a VCALENDAR with a single
-                // VTIMEZONE.
-                $vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
-                $calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
-
-                // Destroy circular references so PHP will garbage collect the
-                // object.
-                $vtimezoneObj->destroy();
-            } else {
-                // Defaulting to UTC.
-                $calendarTimeZone = new DateTimeZone('UTC');
-            }
-        }
-
-        // The calendarobject was requested directly. In this case we handle
-        // this locally.
-        if (0 == $depth && $node instanceof ICalendarObject) {
-            $requestedCalendarData = true;
-            $requestedProperties = $report->properties;
-
-            if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
-                // We always retrieve calendar-data, as we need it for filtering.
-                $requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
-
-                // If calendar-data wasn't explicitly requested, we need to remove
-                // it after processing.
-                $requestedCalendarData = false;
-            }
-
-            $properties = $this->server->getPropertiesForPath(
-                $path,
-                $requestedProperties,
-                0
-            );
-
-            // This array should have only 1 element, the first calendar
-            // object.
-            $properties = current($properties);
-
-            // If there wasn't any calendar-data returned somehow, we ignore
-            // this.
-            if (isset($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'])) {
-                $validator = new CalendarQueryValidator();
-
-                $vObject = VObject\Reader::read($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-                if ($validator->validate($vObject, $report->filters)) {
-                    // If the client didn't require the calendar-data property,
-                    // we won't give it back.
-                    if (!$requestedCalendarData) {
-                        unset($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-                    } else {
-                        if ($report->expand) {
-                            $vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
-                        }
-                        if ($needsJson) {
-                            $properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
-                        } elseif ($report->expand) {
-                            $properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
-                        }
-                    }
-
-                    $result = [$properties];
-                }
-                // Destroy circular references so PHP will garbage collect the
-                // object.
-                $vObject->destroy();
-            }
-        }
-
-        if ($node instanceof ICalendarObjectContainer && 0 === $depth) {
-            if (0 === strpos((string) $this->server->httpRequest->getHeader('User-Agent'), 'MSFT-')) {
-                // Microsoft clients incorrectly supplied depth as 0, when it actually
-                // should have set depth to 1. We're implementing a workaround here
-                // to deal with this.
-                //
-                // This targets at least the following clients:
-                //   Windows 10
-                //   Windows Phone 8, 10
-                $depth = 1;
-            } else {
-                throw new BadRequest('A calendar-query REPORT on a calendar with a Depth: 0 is undefined. Set Depth to 1');
-            }
-        }
-
-        // If we're dealing with a calendar, the calendar itself is responsible
-        // for the calendar-query.
-        if ($node instanceof ICalendarObjectContainer && 1 == $depth) {
-            $nodePaths = $node->calendarQuery($report->filters);
-
-            foreach ($nodePaths as $path) {
-                list($properties) =
-                    $this->server->getPropertiesForPath($this->server->getRequestUri().'/'.$path, $report->properties);
-
-                if (($needsJson || $report->expand)) {
-                    $vObject = VObject\Reader::read($properties[200]['{'.self::NS_CALDAV.'}calendar-data']);
-
-                    if ($report->expand) {
-                        $vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
-                    }
-
-                    if ($needsJson) {
-                        $properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
-                    } else {
-                        $properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
-                    }
-
-                    // Destroy circular references so PHP will garbage collect the
-                    // object.
-                    $vObject->destroy();
-                }
-                $result[] = $properties;
-            }
-        }
-
-        $prefer = $this->server->getHTTPPrefer();
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, 'minimal' === $prefer['return']));
-    }
-
-    /**
-     * This method is responsible for parsing the request and generating the
-     * response for the CALDAV:free-busy-query REPORT.
-     */
-    protected function freeBusyQueryReport(Xml\Request\FreeBusyQueryReport $report)
-    {
-        $uri = $this->server->getRequestUri();
-
-        $acl = $this->server->getPlugin('acl');
-        if ($acl) {
-            $acl->checkPrivileges($uri, '{'.self::NS_CALDAV.'}read-free-busy');
-        }
-
-        $calendar = $this->server->tree->getNodeForPath($uri);
-        if (!$calendar instanceof ICalendar) {
-            throw new DAV\Exception\NotImplemented('The free-busy-query REPORT is only implemented on calendars');
-        }
-
-        $tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
-
-        // Figuring out the default timezone for the calendar, for floating
-        // times.
-        $calendarProps = $this->server->getProperties($uri, [$tzProp]);
-
-        if (isset($calendarProps[$tzProp])) {
-            $vtimezoneObj = VObject\Reader::read($calendarProps[$tzProp]);
-            $calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
-            // Destroy circular references so PHP will garbage collect the object.
-            $vtimezoneObj->destroy();
-        } else {
-            $calendarTimeZone = new DateTimeZone('UTC');
-        }
-
-        // Doing a calendar-query first, to make sure we get the most
-        // performance.
-        $urls = $calendar->calendarQuery([
-            'name' => 'VCALENDAR',
-            'comp-filters' => [
-                [
-                    'name' => 'VEVENT',
-                    'comp-filters' => [],
-                    'prop-filters' => [],
-                    'is-not-defined' => false,
-                    'time-range' => [
-                        'start' => $report->start,
-                        'end' => $report->end,
-                    ],
-                ],
-            ],
-            'prop-filters' => [],
-            'is-not-defined' => false,
-            'time-range' => null,
-        ]);
-
-        $objects = array_map(function ($url) use ($calendar) {
-            $obj = $calendar->getChild($url)->get();
-
-            return $obj;
-        }, $urls);
-
-        $generator = new VObject\FreeBusyGenerator();
-        $generator->setObjects($objects);
-        $generator->setTimeRange($report->start, $report->end);
-        $generator->setTimeZone($calendarTimeZone);
-        $result = $generator->getResult();
-        $result = $result->serialize();
-
-        $this->server->httpResponse->setStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type', 'text/calendar');
-        $this->server->httpResponse->setHeader('Content-Length', strlen($result));
-        $this->server->httpResponse->setBody($result);
-    }
-
-    /**
-     * This method is triggered before a file gets updated with new content.
-     *
-     * This plugin uses this method to ensure that CalDAV objects receive
-     * valid calendar data.
-     *
-     * @param string   $path
-     * @param resource $data
-     * @param bool     $modified should be set to true, if this event handler
-     *                           changed &$data
-     */
-    public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified)
-    {
-        if (!$node instanceof ICalendarObject) {
-            return;
-        }
-
-        // We're onyl interested in ICalendarObject nodes that are inside of a
-        // real calendar. This is to avoid triggering validation and scheduling
-        // for non-calendars (such as an inbox).
-        list($parent) = Uri\split($path);
-        $parentNode = $this->server->tree->getNodeForPath($parent);
-
-        if (!$parentNode instanceof ICalendar) {
-            return;
-        }
-
-        $this->validateICalendar(
-            $data,
-            $path,
-            $modified,
-            $this->server->httpRequest,
-            $this->server->httpResponse,
-            false
-        );
-    }
-
-    /**
-     * This method is triggered before a new file is created.
-     *
-     * This plugin uses this method to ensure that newly created calendar
-     * objects contain valid calendar data.
-     *
-     * @param string   $path
-     * @param resource $data
-     * @param bool     $modified should be set to true, if this event handler
-     *                           changed &$data
-     */
-    public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified)
-    {
-        if (!$parentNode instanceof ICalendar) {
-            return;
-        }
-
-        $this->validateICalendar(
-            $data,
-            $path,
-            $modified,
-            $this->server->httpRequest,
-            $this->server->httpResponse,
-            true
-        );
-    }
-
-    /**
-     * Checks if the submitted iCalendar data is in fact, valid.
-     *
-     * An exception is thrown if it's not.
-     *
-     * @param resource|string   $data
-     * @param string            $path
-     * @param bool              $modified should be set to true, if this event handler
-     *                                    changed &$data
-     * @param RequestInterface  $request  the http request
-     * @param ResponseInterface $response the http response
-     * @param bool              $isNew    is the item a new one, or an update
-     */
-    protected function validateICalendar(&$data, $path, &$modified, RequestInterface $request, ResponseInterface $response, $isNew)
-    {
-        // If it's a stream, we convert it to a string first.
-        if (is_resource($data)) {
-            $data = stream_get_contents($data);
-        }
-
-        $before = $data;
-
-        try {
-            // If the data starts with a [, we can reasonably assume we're dealing
-            // with a jCal object.
-            if ('[' === substr($data, 0, 1)) {
-                $vobj = VObject\Reader::readJson($data);
-
-                // Converting $data back to iCalendar, as that's what we
-                // technically support everywhere.
-                $data = $vobj->serialize();
-                $modified = true;
-            } else {
-                $vobj = VObject\Reader::read($data);
-            }
-        } catch (VObject\ParseException $e) {
-            throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid iCalendar 2.0 data. Parse error: '.$e->getMessage());
-        }
-
-        if ('VCALENDAR' !== $vobj->name) {
-            throw new DAV\Exception\UnsupportedMediaType('This collection can only support iCalendar objects.');
-        }
-
-        $sCCS = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-
-        // Get the Supported Components for the target calendar
-        list($parentPath) = Uri\split($path);
-        $calendarProperties = $this->server->getProperties($parentPath, [$sCCS]);
-
-        if (isset($calendarProperties[$sCCS])) {
-            $supportedComponents = $calendarProperties[$sCCS]->getValue();
-        } else {
-            $supportedComponents = ['VJOURNAL', 'VTODO', 'VEVENT'];
-        }
-
-        $foundType = null;
-
-        foreach ($vobj->getComponents() as $component) {
-            switch ($component->name) {
-                case 'VTIMEZONE':
-                    continue 2;
-                case 'VEVENT':
-                case 'VTODO':
-                case 'VJOURNAL':
-                    $foundType = $component->name;
-                    break;
-            }
-        }
-
-        if (!$foundType || !in_array($foundType, $supportedComponents)) {
-            throw new Exception\InvalidComponentType('iCalendar objects must at least have a component of type '.implode(', ', $supportedComponents));
-        }
-
-        $options = VObject\Node::PROFILE_CALDAV;
-        $prefer = $this->server->getHTTPPrefer();
-
-        if ('strict' !== $prefer['handling']) {
-            $options |= VObject\Node::REPAIR;
-        }
-
-        $messages = $vobj->validate($options);
-
-        $highestLevel = 0;
-        $warningMessage = null;
-
-        // $messages contains a list of problems with the vcard, along with
-        // their severity.
-        foreach ($messages as $message) {
-            if ($message['level'] > $highestLevel) {
-                // Recording the highest reported error level.
-                $highestLevel = $message['level'];
-                $warningMessage = $message['message'];
-            }
-            switch ($message['level']) {
-                case 1:
-                    // Level 1 means that there was a problem, but it was repaired.
-                    $modified = true;
-                    break;
-                case 2:
-                    // Level 2 means a warning, but not critical
-                    break;
-                case 3:
-                    // Level 3 means a critical error
-                    throw new DAV\Exception\UnsupportedMediaType('Validation error in iCalendar: '.$message['message']);
-            }
-        }
-        if ($warningMessage) {
-            $response->setHeader(
-                'X-Sabre-Ew-Gross',
-                'iCalendar validation warning: '.$warningMessage
-            );
-        }
-
-        // We use an extra variable to allow event handles to tell us whether
-        // the object was modified or not.
-        //
-        // This helps us determine if we need to re-serialize the object.
-        $subModified = false;
-
-        $this->server->emit(
-            'calendarObjectChange',
-            [
-                $request,
-                $response,
-                $vobj,
-                $parentPath,
-                &$subModified,
-                $isNew,
-            ]
-        );
-
-        if ($modified || $subModified) {
-            // An event handler told us that it modified the object.
-            $data = $vobj->serialize();
-
-            // Using md5 to figure out if there was an *actual* change.
-            if (!$modified && 0 !== strcmp($data, $before)) {
-                $modified = true;
-            }
-        }
-
-        // Destroy circular references so PHP will garbage collect the object.
-        $vobj->destroy();
-    }
-
-    /**
-     * This method is triggered whenever a subsystem reqeuests the privileges
-     * that are supported on a particular node.
-     */
-    public function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilegeSet)
-    {
-        if ($node instanceof ICalendar) {
-            $supportedPrivilegeSet['{DAV:}read']['aggregates']['{'.self::NS_CALDAV.'}read-free-busy'] = [
-                'abstract' => false,
-                'aggregates' => [],
-            ];
-        }
-    }
-
-    /**
-     * This method is used to generate HTML output for the
-     * DAV\Browser\Plugin. This allows us to generate an interface users
-     * can use to create new calendars.
-     *
-     * @param string $output
-     *
-     * @return bool
-     */
-    public function htmlActionsPanel(DAV\INode $node, &$output)
-    {
-        if (!$node instanceof CalendarHome) {
-            return;
-        }
-
-        $output .= '<tr><td colspan="2"><form method="post" action="">
+	/**
+	 * This is the official CalDAV namespace.
+	 */
+	const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
+
+	/**
+	 * This is the namespace for the proprietary calendarserver extensions.
+	 */
+	const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+	/**
+	 * The hardcoded root for calendar objects. It is unfortunate
+	 * that we're stuck with it, but it will have to do for now.
+	 */
+	const CALENDAR_ROOT = 'calendars';
+
+	/**
+	 * Reference to server object.
+	 *
+	 * @var DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * The default PDO storage uses a MySQL MEDIUMBLOB for iCalendar data,
+	 * which can hold up to 2^24 = 16777216 bytes. This is plenty. We're
+	 * capping it to 10M here.
+	 */
+	protected $maxResourceSize = 10000000;
+
+	/**
+	 * Use this method to tell the server this plugin defines additional
+	 * HTTP methods.
+	 *
+	 * This method is passed a uri. It should only return HTTP methods that are
+	 * available for the specified uri.
+	 *
+	 * @param string $uri
+	 *
+	 * @return array
+	 */
+	public function getHTTPMethods($uri)
+	{
+		// The MKCALENDAR is only available on unmapped uri's, whose
+		// parents extend IExtendedCollection
+		list($parent, $name) = Uri\split($uri);
+
+		if ('' === $uri) {
+			$parent = '';
+		}
+
+		$node = $this->server->tree->getNodeForPath($parent);
+
+		if ($node instanceof DAV\IExtendedCollection) {
+			try {
+				$node->getChild($name);
+			} catch (DAV\Exception\NotFound $e) {
+				return ['MKCALENDAR'];
+			}
+		}
+
+		return [];
+	}
+
+	/**
+	 * Returns the path to a principal's calendar home.
+	 *
+	 * The return url must not end with a slash.
+	 * This function should return null in case a principal did not have
+	 * a calendar home.
+	 *
+	 * @param string $principalUrl
+	 *
+	 * @return string
+	 */
+	public function getCalendarHomeForPrincipal($principalUrl)
+	{
+		// The default behavior for most sabre/dav servers is that there is a
+		// principals root node, which contains users directly under it.
+		//
+		// This function assumes that there are two components in a principal
+		// path. If there's more, we don't return a calendar home. This
+		// excludes things like the calendar-proxy-read principal (which it
+		// should).
+		$parts = explode('/', trim($principalUrl, '/'));
+		if (2 !== count($parts)) {
+			return;
+		}
+		if ('principals' !== $parts[0]) {
+			return;
+		}
+
+		return self::CALENDAR_ROOT.'/'.$parts[1];
+	}
+
+	/**
+	 * Returns a list of features for the DAV: HTTP header.
+	 *
+	 * @return array
+	 */
+	public function getFeatures()
+	{
+		return ['calendar-access', 'calendar-proxy'];
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName()
+	{
+		return 'caldav';
+	}
+
+	/**
+	 * Returns a list of reports this plugin supports.
+	 *
+	 * This will be used in the {DAV:}supported-report-set property.
+	 * Note that you still need to subscribe to the 'report' event to actually
+	 * implement them
+	 *
+	 * @param string $uri
+	 *
+	 * @return array
+	 */
+	public function getSupportedReportSet($uri)
+	{
+		$node = $this->server->tree->getNodeForPath($uri);
+
+		$reports = [];
+		if ($node instanceof ICalendarObjectContainer || $node instanceof ICalendarObject) {
+			$reports[] = '{'.self::NS_CALDAV.'}calendar-multiget';
+			$reports[] = '{'.self::NS_CALDAV.'}calendar-query';
+		}
+		if ($node instanceof ICalendar) {
+			$reports[] = '{'.self::NS_CALDAV.'}free-busy-query';
+		}
+		// iCal has a bug where it assumes that sync support is enabled, only
+		// if we say we support it on the calendar-home, even though this is
+		// not actually the case.
+		if ($node instanceof CalendarHome && $this->server->getPlugin('sync')) {
+			$reports[] = '{DAV:}sync-collection';
+		}
+
+		return $reports;
+	}
+
+	/**
+	 * Initializes the plugin.
+	 */
+	public function initialize(DAV\Server $server)
+	{
+		$this->server = $server;
+
+		$server->on('method:MKCALENDAR', [$this, 'httpMkCalendar']);
+		$server->on('report', [$this, 'report']);
+		$server->on('propFind', [$this, 'propFind']);
+		$server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel']);
+		$server->on('beforeCreateFile', [$this, 'beforeCreateFile']);
+		$server->on('beforeWriteContent', [$this, 'beforeWriteContent']);
+		$server->on('afterMethod:GET', [$this, 'httpAfterGET']);
+		$server->on('getSupportedPrivilegeSet', [$this, 'getSupportedPrivilegeSet']);
+
+		$server->xml->namespaceMap[self::NS_CALDAV] = 'cal';
+		$server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
+
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-query'] = 'Sabre\\CalDAV\\Xml\\Request\\CalendarQueryReport';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-multiget'] = 'Sabre\\CalDAV\\Xml\\Request\\CalendarMultiGetReport';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}free-busy-query'] = 'Sabre\\CalDAV\\Xml\\Request\\FreeBusyQueryReport';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}mkcalendar'] = 'Sabre\\CalDAV\\Xml\\Request\\MkCalendar';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}schedule-calendar-transp'] = 'Sabre\\CalDAV\\Xml\\Property\\ScheduleCalendarTransp';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet';
+
+		$server->resourceTypeMapping['\\Sabre\\CalDAV\\ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
+
+		$server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
+		$server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
+
+		array_push($server->protectedProperties,
+			'{'.self::NS_CALDAV.'}supported-calendar-component-set',
+			'{'.self::NS_CALDAV.'}supported-calendar-data',
+			'{'.self::NS_CALDAV.'}max-resource-size',
+			'{'.self::NS_CALDAV.'}min-date-time',
+			'{'.self::NS_CALDAV.'}max-date-time',
+			'{'.self::NS_CALDAV.'}max-instances',
+			'{'.self::NS_CALDAV.'}max-attendees-per-instance',
+			'{'.self::NS_CALDAV.'}calendar-home-set',
+			'{'.self::NS_CALDAV.'}supported-collation-set',
+			'{'.self::NS_CALDAV.'}calendar-data',
+
+			// CalendarServer extensions
+			'{'.self::NS_CALENDARSERVER.'}getctag',
+			'{'.self::NS_CALENDARSERVER.'}calendar-proxy-read-for',
+			'{'.self::NS_CALENDARSERVER.'}calendar-proxy-write-for'
+		);
+
+		if ($aclPlugin = $server->getPlugin('acl')) {
+			$aclPlugin->principalSearchPropertySet['{'.self::NS_CALDAV.'}calendar-user-address-set'] = 'Calendar address';
+		}
+	}
+
+	/**
+	 * This functions handles REPORT requests specific to CalDAV.
+	 *
+	 * @param string $reportName
+	 * @param mixed  $report
+	 * @param mixed  $path
+	 *
+	 * @return bool|null
+	 */
+	public function report($reportName, $report, $path)
+	{
+		switch ($reportName) {
+			case '{'.self::NS_CALDAV.'}calendar-multiget':
+				$this->server->transactionType = 'report-calendar-multiget';
+				$this->calendarMultiGetReport($report);
+
+				return false;
+			case '{'.self::NS_CALDAV.'}calendar-query':
+				$this->server->transactionType = 'report-calendar-query';
+				$this->calendarQueryReport($report);
+
+				return false;
+			case '{'.self::NS_CALDAV.'}free-busy-query':
+				$this->server->transactionType = 'report-free-busy-query';
+				$this->freeBusyQueryReport($report);
+
+				return false;
+		}
+	}
+
+	/**
+	 * This function handles the MKCALENDAR HTTP method, which creates
+	 * a new calendar.
+	 *
+	 * @return bool
+	 */
+	public function httpMkCalendar(RequestInterface $request, ResponseInterface $response)
+	{
+		$body = $request->getBodyAsString();
+		$path = $request->getPath();
+
+		$properties = [];
+
+		if ($body) {
+			try {
+				$mkcalendar = $this->server->xml->expect(
+					'{urn:ietf:params:xml:ns:caldav}mkcalendar',
+					$body
+				);
+			} catch (\Sabre\Xml\ParseException $e) {
+				throw new BadRequest($e->getMessage(), 0, $e);
+			}
+			$properties = $mkcalendar->getProperties();
+		}
+
+		// iCal abuses MKCALENDAR since iCal 10.9.2 to create server-stored
+		// subscriptions. Before that it used MKCOL which was the correct way
+		// to do this.
+		//
+		// If the body had a {DAV:}resourcetype, it means we stumbled upon this
+		// request, and we simply use it instead of the pre-defined list.
+		if (isset($properties['{DAV:}resourcetype'])) {
+			$resourceType = $properties['{DAV:}resourcetype']->getValue();
+		} else {
+			$resourceType = ['{DAV:}collection', '{urn:ietf:params:xml:ns:caldav}calendar'];
+		}
+
+		$this->server->createCollection($path, new MkCol($resourceType, $properties));
+
+		$response->setStatus(201);
+		$response->setHeader('Content-Length', 0);
+
+		// This breaks the method chain.
+		return false;
+	}
+
+	/**
+	 * PropFind.
+	 *
+	 * This method handler is invoked before any after properties for a
+	 * resource are fetched. This allows us to add in any CalDAV specific
+	 * properties.
+	 */
+	public function propFind(DAV\PropFind $propFind, DAV\INode $node)
+	{
+		$ns = '{'.self::NS_CALDAV.'}';
+
+		if ($node instanceof ICalendarObjectContainer) {
+			$propFind->handle($ns.'max-resource-size', $this->maxResourceSize);
+			$propFind->handle($ns.'supported-calendar-data', function () {
+				return new Xml\Property\SupportedCalendarData();
+			});
+			$propFind->handle($ns.'supported-collation-set', function () {
+				return new Xml\Property\SupportedCollationSet();
+			});
+		}
+
+		if ($node instanceof DAVACL\IPrincipal) {
+			$principalUrl = $node->getPrincipalUrl();
+
+			$propFind->handle('{'.self::NS_CALDAV.'}calendar-home-set', function () use ($principalUrl) {
+				$calendarHomePath = $this->getCalendarHomeForPrincipal($principalUrl);
+				if (is_null($calendarHomePath)) {
+					return null;
+				}
+
+				return new LocalHref($calendarHomePath.'/');
+			});
+			// The calendar-user-address-set property is basically mapped to
+			// the {DAV:}alternate-URI-set property.
+			$propFind->handle('{'.self::NS_CALDAV.'}calendar-user-address-set', function () use ($node) {
+				$addresses = $node->getAlternateUriSet();
+				$addresses[] = $this->server->getBaseUri().$node->getPrincipalUrl().'/';
+
+				return new LocalHref($addresses);
+			});
+			// For some reason somebody thought it was a good idea to add
+			// another one of these properties. We're supporting it too.
+			$propFind->handle('{'.self::NS_CALENDARSERVER.'}email-address-set', function () use ($node) {
+				$addresses = $node->getAlternateUriSet();
+				$emails = [];
+				foreach ($addresses as $address) {
+					if ('mailto:' === substr($address, 0, 7)) {
+						$emails[] = substr($address, 7);
+					}
+				}
+
+				return new Xml\Property\EmailAddressSet($emails);
+			});
+
+			// These two properties are shortcuts for ical to easily find
+			// other principals this principal has access to.
+			$propRead = '{'.self::NS_CALENDARSERVER.'}calendar-proxy-read-for';
+			$propWrite = '{'.self::NS_CALENDARSERVER.'}calendar-proxy-write-for';
+
+			if (404 === $propFind->getStatus($propRead) || 404 === $propFind->getStatus($propWrite)) {
+				$aclPlugin = $this->server->getPlugin('acl');
+				$membership = $aclPlugin->getPrincipalMembership($propFind->getPath());
+				$readList = [];
+				$writeList = [];
+
+				foreach ($membership as $group) {
+					$groupNode = $this->server->tree->getNodeForPath($group);
+
+					$listItem = Uri\split($group)[0].'/';
+
+					// If the node is either ap proxy-read or proxy-write
+					// group, we grab the parent principal and add it to the
+					// list.
+					if ($groupNode instanceof Principal\IProxyRead) {
+						$readList[] = $listItem;
+					}
+					if ($groupNode instanceof Principal\IProxyWrite) {
+						$writeList[] = $listItem;
+					}
+				}
+
+				$propFind->set($propRead, new LocalHref($readList));
+				$propFind->set($propWrite, new LocalHref($writeList));
+			}
+		} // instanceof IPrincipal
+
+		if ($node instanceof ICalendarObject) {
+			// The calendar-data property is not supposed to be a 'real'
+			// property, but in large chunks of the spec it does act as such.
+			// Therefore we simply expose it as a property.
+			$propFind->handle('{'.self::NS_CALDAV.'}calendar-data', function () use ($node) {
+				$val = $node->get();
+				if (is_resource($val)) {
+					$val = stream_get_contents($val);
+				}
+
+				// Taking out \r to not screw up the xml output
+				return str_replace("\r", '', $val);
+			});
+		}
+	}
+
+	/**
+	 * This function handles the calendar-multiget REPORT.
+	 *
+	 * This report is used by the client to fetch the content of a series
+	 * of urls. Effectively avoiding a lot of redundant requests.
+	 *
+	 * @param CalendarMultiGetReport $report
+	 */
+	public function calendarMultiGetReport($report)
+	{
+		$needsJson = 'application/calendar+json' === $report->contentType;
+
+		$timeZones = [];
+		$propertyList = [];
+
+		$paths = array_map(
+			[$this->server, 'calculateUri'],
+			$report->hrefs
+		);
+
+		foreach ($this->server->getPropertiesForMultiplePaths($paths, $report->properties) as $uri => $objProps) {
+			if (($needsJson || $report->expand) && isset($objProps[200]['{'.self::NS_CALDAV.'}calendar-data'])) {
+				$vObject = VObject\Reader::read($objProps[200]['{'.self::NS_CALDAV.'}calendar-data']);
+
+				if ($report->expand) {
+					// We're expanding, and for that we need to figure out the
+					// calendar's timezone.
+					list($calendarPath) = Uri\split($uri);
+					if (!isset($timeZones[$calendarPath])) {
+						// Checking the calendar-timezone property.
+						$tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
+						$tzResult = $this->server->getProperties($calendarPath, [$tzProp]);
+						if (isset($tzResult[$tzProp])) {
+							// This property contains a VCALENDAR with a single
+							// VTIMEZONE.
+							$vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
+							$timeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
+						} else {
+							// Defaulting to UTC.
+							$timeZone = new DateTimeZone('UTC');
+						}
+						$timeZones[$calendarPath] = $timeZone;
+					}
+
+					$vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $timeZones[$calendarPath]);
+				}
+				if ($needsJson) {
+					$objProps[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
+				} else {
+					$objProps[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
+				}
+				// Destroy circular references so PHP will garbage collect the
+				// object.
+				$vObject->destroy();
+			}
+
+			$propertyList[] = $objProps;
+		}
+
+		$prefer = $this->server->getHTTPPrefer();
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+		$this->server->httpResponse->setBody($this->server->generateMultiStatus($propertyList, 'minimal' === $prefer['return']));
+	}
+
+	/**
+	 * This function handles the calendar-query REPORT.
+	 *
+	 * This report is used by clients to request calendar objects based on
+	 * complex conditions.
+	 *
+	 * @param Xml\Request\CalendarQueryReport $report
+	 */
+	public function calendarQueryReport($report)
+	{
+		$path = $this->server->getRequestUri();
+
+		$needsJson = 'application/calendar+json' === $report->contentType;
+
+		$node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
+		$depth = $this->server->getHTTPDepth(0);
+
+		// The default result is an empty array
+		$result = [];
+
+		$calendarTimeZone = null;
+		if ($report->expand) {
+			// We're expanding, and for that we need to figure out the
+			// calendar's timezone.
+			$tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
+			$tzResult = $this->server->getProperties($path, [$tzProp]);
+			if (isset($tzResult[$tzProp])) {
+				// This property contains a VCALENDAR with a single
+				// VTIMEZONE.
+				$vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
+				$calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
+
+				// Destroy circular references so PHP will garbage collect the
+				// object.
+				$vtimezoneObj->destroy();
+			} else {
+				// Defaulting to UTC.
+				$calendarTimeZone = new DateTimeZone('UTC');
+			}
+		}
+
+		// The calendarobject was requested directly. In this case we handle
+		// this locally.
+		if (0 == $depth && $node instanceof ICalendarObject) {
+			$requestedCalendarData = true;
+			$requestedProperties = $report->properties;
+
+			if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
+				// We always retrieve calendar-data, as we need it for filtering.
+				$requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
+
+				// If calendar-data wasn't explicitly requested, we need to remove
+				// it after processing.
+				$requestedCalendarData = false;
+			}
+
+			$properties = $this->server->getPropertiesForPath(
+				$path,
+				$requestedProperties,
+				0
+			);
+
+			// This array should have only 1 element, the first calendar
+			// object.
+			$properties = current($properties);
+
+			// If there wasn't any calendar-data returned somehow, we ignore
+			// this.
+			if (isset($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'])) {
+				$validator = new CalendarQueryValidator();
+
+				$vObject = VObject\Reader::read($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+				if ($validator->validate($vObject, $report->filters)) {
+					// If the client didn't require the calendar-data property,
+					// we won't give it back.
+					if (!$requestedCalendarData) {
+						unset($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+					} else {
+						if ($report->expand) {
+							$vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
+						}
+						if ($needsJson) {
+							$properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
+						} elseif ($report->expand) {
+							$properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
+						}
+					}
+
+					$result = [$properties];
+				}
+				// Destroy circular references so PHP will garbage collect the
+				// object.
+				$vObject->destroy();
+			}
+		}
+
+		if ($node instanceof ICalendarObjectContainer && 0 === $depth) {
+			if (0 === strpos((string) $this->server->httpRequest->getHeader('User-Agent'), 'MSFT-')) {
+				// Microsoft clients incorrectly supplied depth as 0, when it actually
+				// should have set depth to 1. We're implementing a workaround here
+				// to deal with this.
+				//
+				// This targets at least the following clients:
+				//   Windows 10
+				//   Windows Phone 8, 10
+				$depth = 1;
+			} else {
+				throw new BadRequest('A calendar-query REPORT on a calendar with a Depth: 0 is undefined. Set Depth to 1');
+			}
+		}
+
+		// If we're dealing with a calendar, the calendar itself is responsible
+		// for the calendar-query.
+		if ($node instanceof ICalendarObjectContainer && 1 == $depth) {
+			$nodePaths = $node->calendarQuery($report->filters);
+
+			foreach ($nodePaths as $path) {
+				list($properties) =
+					$this->server->getPropertiesForPath($this->server->getRequestUri().'/'.$path, $report->properties);
+
+				if (($needsJson || $report->expand)) {
+					$vObject = VObject\Reader::read($properties[200]['{'.self::NS_CALDAV.'}calendar-data']);
+
+					if ($report->expand) {
+						$vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
+					}
+
+					if ($needsJson) {
+						$properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
+					} else {
+						$properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
+					}
+
+					// Destroy circular references so PHP will garbage collect the
+					// object.
+					$vObject->destroy();
+				}
+				$result[] = $properties;
+			}
+		}
+
+		$prefer = $this->server->getHTTPPrefer();
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+		$this->server->httpResponse->setBody($this->server->generateMultiStatus($result, 'minimal' === $prefer['return']));
+	}
+
+	/**
+	 * This method is responsible for parsing the request and generating the
+	 * response for the CALDAV:free-busy-query REPORT.
+	 */
+	protected function freeBusyQueryReport(Xml\Request\FreeBusyQueryReport $report)
+	{
+		$uri = $this->server->getRequestUri();
+
+		$acl = $this->server->getPlugin('acl');
+		if ($acl) {
+			$acl->checkPrivileges($uri, '{'.self::NS_CALDAV.'}read-free-busy');
+		}
+
+		$calendar = $this->server->tree->getNodeForPath($uri);
+		if (!$calendar instanceof ICalendar) {
+			throw new DAV\Exception\NotImplemented('The free-busy-query REPORT is only implemented on calendars');
+		}
+
+		$tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
+
+		// Figuring out the default timezone for the calendar, for floating
+		// times.
+		$calendarProps = $this->server->getProperties($uri, [$tzProp]);
+
+		if (isset($calendarProps[$tzProp])) {
+			$vtimezoneObj = VObject\Reader::read($calendarProps[$tzProp]);
+			$calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
+			// Destroy circular references so PHP will garbage collect the object.
+			$vtimezoneObj->destroy();
+		} else {
+			$calendarTimeZone = new DateTimeZone('UTC');
+		}
+
+		// Doing a calendar-query first, to make sure we get the most
+		// performance.
+		$urls = $calendar->calendarQuery([
+			'name' => 'VCALENDAR',
+			'comp-filters' => [
+				[
+					'name' => 'VEVENT',
+					'comp-filters' => [],
+					'prop-filters' => [],
+					'is-not-defined' => false,
+					'time-range' => [
+						'start' => $report->start,
+						'end' => $report->end,
+					],
+				],
+			],
+			'prop-filters' => [],
+			'is-not-defined' => false,
+			'time-range' => null,
+		]);
+
+		$objects = array_map(function ($url) use ($calendar) {
+			$obj = $calendar->getChild($url)->get();
+
+			return $obj;
+		}, $urls);
+
+		$generator = new VObject\FreeBusyGenerator();
+		$generator->setObjects($objects);
+		$generator->setTimeRange($report->start, $report->end);
+		$generator->setTimeZone($calendarTimeZone);
+		$result = $generator->getResult();
+		$result = $result->serialize();
+
+		$this->server->httpResponse->setStatus(200);
+		$this->server->httpResponse->setHeader('Content-Type', 'text/calendar');
+		$this->server->httpResponse->setHeader('Content-Length', strlen($result));
+		$this->server->httpResponse->setBody($result);
+	}
+
+	/**
+	 * This method is triggered before a file gets updated with new content.
+	 *
+	 * This plugin uses this method to ensure that CalDAV objects receive
+	 * valid calendar data.
+	 *
+	 * @param string   $path
+	 * @param resource $data
+	 * @param bool     $modified should be set to true, if this event handler
+	 *                           changed &$data
+	 */
+	public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified)
+	{
+		if (!$node instanceof ICalendarObject) {
+			return;
+		}
+
+		// We're onyl interested in ICalendarObject nodes that are inside of a
+		// real calendar. This is to avoid triggering validation and scheduling
+		// for non-calendars (such as an inbox).
+		list($parent) = Uri\split($path);
+		$parentNode = $this->server->tree->getNodeForPath($parent);
+
+		if (!$parentNode instanceof ICalendar) {
+			return;
+		}
+
+		$this->validateICalendar(
+			$data,
+			$path,
+			$modified,
+			$this->server->httpRequest,
+			$this->server->httpResponse,
+			false
+		);
+	}
+
+	/**
+	 * This method is triggered before a new file is created.
+	 *
+	 * This plugin uses this method to ensure that newly created calendar
+	 * objects contain valid calendar data.
+	 *
+	 * @param string   $path
+	 * @param resource $data
+	 * @param bool     $modified should be set to true, if this event handler
+	 *                           changed &$data
+	 */
+	public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified)
+	{
+		if (!$parentNode instanceof ICalendar) {
+			return;
+		}
+
+		$this->validateICalendar(
+			$data,
+			$path,
+			$modified,
+			$this->server->httpRequest,
+			$this->server->httpResponse,
+			true
+		);
+	}
+
+	/**
+	 * Checks if the submitted iCalendar data is in fact, valid.
+	 *
+	 * An exception is thrown if it's not.
+	 *
+	 * @param resource|string   $data
+	 * @param string            $path
+	 * @param bool              $modified should be set to true, if this event handler
+	 *                                    changed &$data
+	 * @param RequestInterface  $request  the http request
+	 * @param ResponseInterface $response the http response
+	 * @param bool              $isNew    is the item a new one, or an update
+	 */
+	protected function validateICalendar(&$data, $path, &$modified, RequestInterface $request, ResponseInterface $response, $isNew)
+	{
+		// If it's a stream, we convert it to a string first.
+		if (is_resource($data)) {
+			$data = stream_get_contents($data);
+		}
+
+		$before = $data;
+
+		try {
+			// If the data starts with a [, we can reasonably assume we're dealing
+			// with a jCal object.
+			if ('[' === substr($data, 0, 1)) {
+				$vobj = VObject\Reader::readJson($data);
+
+				// Converting $data back to iCalendar, as that's what we
+				// technically support everywhere.
+				$data = $vobj->serialize();
+				$modified = true;
+			} else {
+				$vobj = VObject\Reader::read($data);
+			}
+		} catch (VObject\ParseException $e) {
+			throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid iCalendar 2.0 data. Parse error: '.$e->getMessage());
+		}
+
+		if ('VCALENDAR' !== $vobj->name) {
+			throw new DAV\Exception\UnsupportedMediaType('This collection can only support iCalendar objects.');
+		}
+
+		$sCCS = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+
+		// Get the Supported Components for the target calendar
+		list($parentPath) = Uri\split($path);
+		$calendarProperties = $this->server->getProperties($parentPath, [$sCCS]);
+
+		if (isset($calendarProperties[$sCCS])) {
+			$supportedComponents = $calendarProperties[$sCCS]->getValue();
+		} else {
+			$supportedComponents = ['VJOURNAL', 'VTODO', 'VEVENT'];
+		}
+
+		$foundType = null;
+
+		foreach ($vobj->getComponents() as $component) {
+			switch ($component->name) {
+				case 'VTIMEZONE':
+					continue 2;
+				case 'VEVENT':
+				case 'VTODO':
+				case 'VJOURNAL':
+					$foundType = $component->name;
+					break;
+			}
+		}
+
+		if (!$foundType || !in_array($foundType, $supportedComponents)) {
+			throw new Exception\InvalidComponentType('iCalendar objects must at least have a component of type '.implode(', ', $supportedComponents));
+		}
+
+		$options = VObject\Node::PROFILE_CALDAV;
+		$prefer = $this->server->getHTTPPrefer();
+
+		if ('strict' !== $prefer['handling']) {
+			$options |= VObject\Node::REPAIR;
+		}
+
+		$messages = $vobj->validate($options);
+
+		$highestLevel = 0;
+		$warningMessage = null;
+
+		// $messages contains a list of problems with the vcard, along with
+		// their severity.
+		foreach ($messages as $message) {
+			if ($message['level'] > $highestLevel) {
+				// Recording the highest reported error level.
+				$highestLevel = $message['level'];
+				$warningMessage = $message['message'];
+			}
+			switch ($message['level']) {
+				case 1:
+					// Level 1 means that there was a problem, but it was repaired.
+					$modified = true;
+					break;
+				case 2:
+					// Level 2 means a warning, but not critical
+					break;
+				case 3:
+					// Level 3 means a critical error
+					throw new DAV\Exception\UnsupportedMediaType('Validation error in iCalendar: '.$message['message']);
+			}
+		}
+		if ($warningMessage) {
+			$response->setHeader(
+				'X-Sabre-Ew-Gross',
+				'iCalendar validation warning: '.$warningMessage
+			);
+		}
+
+		// We use an extra variable to allow event handles to tell us whether
+		// the object was modified or not.
+		//
+		// This helps us determine if we need to re-serialize the object.
+		$subModified = false;
+
+		$this->server->emit(
+			'calendarObjectChange',
+			[
+				$request,
+				$response,
+				$vobj,
+				$parentPath,
+				&$subModified,
+				$isNew,
+			]
+		);
+
+		if ($modified || $subModified) {
+			// An event handler told us that it modified the object.
+			$data = $vobj->serialize();
+
+			// Using md5 to figure out if there was an *actual* change.
+			if (!$modified && 0 !== strcmp($data, $before)) {
+				$modified = true;
+			}
+		}
+
+		// Destroy circular references so PHP will garbage collect the object.
+		$vobj->destroy();
+	}
+
+	/**
+	 * This method is triggered whenever a subsystem reqeuests the privileges
+	 * that are supported on a particular node.
+	 */
+	public function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilegeSet)
+	{
+		if ($node instanceof ICalendar) {
+			$supportedPrivilegeSet['{DAV:}read']['aggregates']['{'.self::NS_CALDAV.'}read-free-busy'] = [
+				'abstract' => false,
+				'aggregates' => [],
+			];
+		}
+	}
+
+	/**
+	 * This method is used to generate HTML output for the
+	 * DAV\Browser\Plugin. This allows us to generate an interface users
+	 * can use to create new calendars.
+	 *
+	 * @param string $output
+	 *
+	 * @return bool
+	 */
+	public function htmlActionsPanel(DAV\INode $node, &$output)
+	{
+		if (!$node instanceof CalendarHome) {
+			return;
+		}
+
+		$output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Create new calendar</h3>
             <input type="hidden" name="sabreAction" value="mkcol" />
             <input type="hidden" name="resourceType" value="{DAV:}collection,{'.self::NS_CALDAV.'}calendar" />
@@ -951,61 +951,61 @@ 
             </form>
             </td></tr>';
 
-        return false;
-    }
-
-    /**
-     * This event is triggered after GET requests.
-     *
-     * This is used to transform data into jCal, if this was requested.
-     */
-    public function httpAfterGet(RequestInterface $request, ResponseInterface $response)
-    {
-        $contentType = $response->getHeader('Content-Type');
-        if (null === $contentType || false === strpos($contentType, 'text/calendar')) {
-            return;
-        }
-
-        $result = HTTP\negotiateContentType(
-            $request->getHeader('Accept'),
-            ['text/calendar', 'application/calendar+json']
-        );
-
-        if ('application/calendar+json' !== $result) {
-            // Do nothing
-            return;
-        }
-
-        // Transforming.
-        $vobj = VObject\Reader::read($response->getBody());
-
-        $jsonBody = json_encode($vobj->jsonSerialize());
-        $response->setBody($jsonBody);
-
-        // Destroy circular references so PHP will garbage collect the object.
-        $vobj->destroy();
-
-        $response->setHeader('Content-Type', 'application/calendar+json');
-        $response->setHeader('Content-Length', strlen($jsonBody));
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo()
-    {
-        return [
-            'name' => $this->getPluginName(),
-            'description' => 'Adds support for CalDAV (rfc4791)',
-            'link' => 'http://sabre.io/dav/caldav/',
-        ];
-    }
+		return false;
+	}
+
+	/**
+	 * This event is triggered after GET requests.
+	 *
+	 * This is used to transform data into jCal, if this was requested.
+	 */
+	public function httpAfterGet(RequestInterface $request, ResponseInterface $response)
+	{
+		$contentType = $response->getHeader('Content-Type');
+		if (null === $contentType || false === strpos($contentType, 'text/calendar')) {
+			return;
+		}
+
+		$result = HTTP\negotiateContentType(
+			$request->getHeader('Accept'),
+			['text/calendar', 'application/calendar+json']
+		);
+
+		if ('application/calendar+json' !== $result) {
+			// Do nothing
+			return;
+		}
+
+		// Transforming.
+		$vobj = VObject\Reader::read($response->getBody());
+
+		$jsonBody = json_encode($vobj->jsonSerialize());
+		$response->setBody($jsonBody);
+
+		// Destroy circular references so PHP will garbage collect the object.
+		$vobj->destroy();
+
+		$response->setHeader('Content-Type', 'application/calendar+json');
+		$response->setHeader('Content-Length', strlen($jsonBody));
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo()
+	{
+		return [
+			'name' => $this->getPluginName(),
+			'description' => 'Adds support for CalDAV (rfc4791)',
+			'link' => 'http://sabre.io/dav/caldav/',
+		];
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -325,10 +325,10 @@ 
 
         if ($node instanceof ICalendarObjectContainer) {
             $propFind->handle($ns.'max-resource-size', $this->maxResourceSize);
-            $propFind->handle($ns.'supported-calendar-data', function () {
+            $propFind->handle($ns.'supported-calendar-data', function() {
                 return new Xml\Property\SupportedCalendarData();
             });
-            $propFind->handle($ns.'supported-collation-set', function () {
+            $propFind->handle($ns.'supported-collation-set', function() {
                 return new Xml\Property\SupportedCollationSet();
             });
         }
@@ -336,7 +336,7 @@ 
         if ($node instanceof DAVACL\IPrincipal) {
             $principalUrl = $node->getPrincipalUrl();
 
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-home-set', function () use ($principalUrl) {
+            $propFind->handle('{'.self::NS_CALDAV.'}calendar-home-set', function() use ($principalUrl) {
                 $calendarHomePath = $this->getCalendarHomeForPrincipal($principalUrl);
                 if (is_null($calendarHomePath)) {
                     return null;
@@ -346,7 +346,7 @@ 
             });
             // The calendar-user-address-set property is basically mapped to
             // the {DAV:}alternate-URI-set property.
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-user-address-set', function () use ($node) {
+            $propFind->handle('{'.self::NS_CALDAV.'}calendar-user-address-set', function() use ($node) {
                 $addresses = $node->getAlternateUriSet();
                 $addresses[] = $this->server->getBaseUri().$node->getPrincipalUrl().'/';
 
@@ -354,7 +354,7 @@ 
             });
             // For some reason somebody thought it was a good idea to add
             // another one of these properties. We're supporting it too.
-            $propFind->handle('{'.self::NS_CALENDARSERVER.'}email-address-set', function () use ($node) {
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}email-address-set', function() use ($node) {
                 $addresses = $node->getAlternateUriSet();
                 $emails = [];
                 foreach ($addresses as $address) {
@@ -402,7 +402,7 @@ 
             // The calendar-data property is not supposed to be a 'real'
             // property, but in large chunks of the spec it does act as such.
             // Therefore we simply expose it as a property.
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-data', function () use ($node) {
+            $propFind->handle('{'.self::NS_CALDAV.'}calendar-data', function() use ($node) {
                 $val = $node->get();
                 if (is_resource($val)) {
                     $val = stream_get_contents($val);
@@ -684,7 +684,7 @@ 
             'time-range' => null,
         ]);
 
-        $objects = array_map(function ($url) use ($calendar) {
+        $objects = array_map(function($url) use ($calendar) {
             $obj = $calendar->getChild($url)->get();
 
             return $obj;

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Principal/ProxyRead.php

Indentation +138 added lines, -138 removed lines

@@ -20,142 +20,142 @@
  */
 class ProxyRead implements IProxyRead
 {
-    /**
-     * Principal information from the parent principal.
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal backend.
-     *
-     * @var DAVACL\PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object.
-     *
-     * Note that you MUST supply the parent principal information.
-     */
-    public function __construct(DAVACL\PrincipalBackend\BackendInterface $principalBackend, array $principalInfo)
-    {
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'calendar-proxy-read';
-    }
-
-    /**
-     * Returns the last modification time.
-     */
-    public function getLastModified()
-    {
-        return null;
-    }
-
-    /**
-     * Deletes the current node.
-     *
-     * @throws DAV\Exception\Forbidden
-     */
-    public function delete()
-    {
-        throw new DAV\Exception\Forbidden('Permission denied to delete node');
-    }
-
-    /**
-     * Renames the node.
-     *
-     * @param string $name The new name
-     *
-     * @throws DAV\Exception\Forbidden
-     */
-    public function setName($name)
-    {
-        throw new DAV\Exception\Forbidden('Permission denied to rename file');
-    }
-
-    /**
-     * Returns a list of alternative urls for a principal.
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet()
-    {
-        return [];
-    }
-
-    /**
-     * Returns the full principal url.
-     *
-     * @return string
-     */
-    public function getPrincipalUrl()
-    {
-        return $this->principalInfo['uri'].'/'.$this->getName();
-    }
-
-    /**
-     * Returns the list of group members.
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet()
-    {
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
-    }
-
-    /**
-     * Returns the list of groups this principal is member of.
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership()
-    {
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
-    }
-
-    /**
-     * Sets a list of group members.
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     */
-    public function setGroupMemberSet(array $principals)
-    {
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-    }
-
-    /**
-     * Returns the displayname.
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    public function getDisplayName()
-    {
-        return $this->getName();
-    }
+	/**
+	 * Principal information from the parent principal.
+	 *
+	 * @var array
+	 */
+	protected $principalInfo;
+
+	/**
+	 * Principal backend.
+	 *
+	 * @var DAVACL\PrincipalBackend\BackendInterface
+	 */
+	protected $principalBackend;
+
+	/**
+	 * Creates the object.
+	 *
+	 * Note that you MUST supply the parent principal information.
+	 */
+	public function __construct(DAVACL\PrincipalBackend\BackendInterface $principalBackend, array $principalInfo)
+	{
+		$this->principalInfo = $principalInfo;
+		$this->principalBackend = $principalBackend;
+	}
+
+	/**
+	 * Returns this principals name.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return 'calendar-proxy-read';
+	}
+
+	/**
+	 * Returns the last modification time.
+	 */
+	public function getLastModified()
+	{
+		return null;
+	}
+
+	/**
+	 * Deletes the current node.
+	 *
+	 * @throws DAV\Exception\Forbidden
+	 */
+	public function delete()
+	{
+		throw new DAV\Exception\Forbidden('Permission denied to delete node');
+	}
+
+	/**
+	 * Renames the node.
+	 *
+	 * @param string $name The new name
+	 *
+	 * @throws DAV\Exception\Forbidden
+	 */
+	public function setName($name)
+	{
+		throw new DAV\Exception\Forbidden('Permission denied to rename file');
+	}
+
+	/**
+	 * Returns a list of alternative urls for a principal.
+	 *
+	 * This can for example be an email address, or ldap url.
+	 *
+	 * @return array
+	 */
+	public function getAlternateUriSet()
+	{
+		return [];
+	}
+
+	/**
+	 * Returns the full principal url.
+	 *
+	 * @return string
+	 */
+	public function getPrincipalUrl()
+	{
+		return $this->principalInfo['uri'].'/'.$this->getName();
+	}
+
+	/**
+	 * Returns the list of group members.
+	 *
+	 * If this principal is a group, this function should return
+	 * all member principal uri's for the group.
+	 *
+	 * @return array
+	 */
+	public function getGroupMemberSet()
+	{
+		return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
+	}
+
+	/**
+	 * Returns the list of groups this principal is member of.
+	 *
+	 * If this principal is a member of a (list of) groups, this function
+	 * should return a list of principal uri's for it's members.
+	 *
+	 * @return array
+	 */
+	public function getGroupMembership()
+	{
+		return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
+	}
+
+	/**
+	 * Sets a list of group members.
+	 *
+	 * If this principal is a group, this method sets all the group members.
+	 * The list of members is always overwritten, never appended to.
+	 *
+	 * This method should throw an exception if the members could not be set.
+	 */
+	public function setGroupMemberSet(array $principals)
+	{
+		$this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
+	}
+
+	/**
+	 * Returns the displayname.
+	 *
+	 * This should be a human readable name for the principal.
+	 * If none is available, return the nodename.
+	 *
+	 * @return string
+	 */
+	public function getDisplayName()
+	{
+		return $this->getName();
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Principal/Collection.php

Indentation +9 added lines, -9 removed lines

@@ -20,13 +20,13 @@
  */
 class Collection extends DAVACL\PrincipalCollection
 {
-    /**
-     * Returns a child object based on principal information.
-     *
-     * @return User
-     */
-    public function getChildForPrincipal(array $principalInfo)
-    {
-        return new User($this->principalBackend, $principalInfo);
-    }
+	/**
+	 * Returns a child object based on principal information.
+	 *
+	 * @return User
+	 */
+	public function getChildForPrincipal(array $principalInfo)
+	{
+		return new User($this->principalBackend, $principalInfo);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Principal/User.php

Indentation +103 added lines, -103 removed lines

@@ -20,117 +20,117 @@
  */
 class User extends DAVACL\Principal implements DAV\ICollection
 {
-    /**
-     * Creates a new file in the directory.
-     *
-     * @param string   $name Name of the file
-     * @param resource $data initial payload, passed as a readable stream resource
-     *
-     * @throws DAV\Exception\Forbidden
-     */
-    public function createFile($name, $data = null)
-    {
-        throw new DAV\Exception\Forbidden('Permission denied to create file (filename '.$name.')');
-    }
+	/**
+	 * Creates a new file in the directory.
+	 *
+	 * @param string   $name Name of the file
+	 * @param resource $data initial payload, passed as a readable stream resource
+	 *
+	 * @throws DAV\Exception\Forbidden
+	 */
+	public function createFile($name, $data = null)
+	{
+		throw new DAV\Exception\Forbidden('Permission denied to create file (filename '.$name.')');
+	}
 
-    /**
-     * Creates a new subdirectory.
-     *
-     * @param string $name
-     *
-     * @throws DAV\Exception\Forbidden
-     */
-    public function createDirectory($name)
-    {
-        throw new DAV\Exception\Forbidden('Permission denied to create directory');
-    }
+	/**
+	 * Creates a new subdirectory.
+	 *
+	 * @param string $name
+	 *
+	 * @throws DAV\Exception\Forbidden
+	 */
+	public function createDirectory($name)
+	{
+		throw new DAV\Exception\Forbidden('Permission denied to create directory');
+	}
 
-    /**
-     * Returns a specific child node, referenced by its name.
-     *
-     * @param string $name
-     *
-     * @return DAV\INode
-     */
-    public function getChild($name)
-    {
-        $principal = $this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/'.$name);
-        if (!$principal) {
-            throw new DAV\Exception\NotFound('Node with name '.$name.' was not found');
-        }
-        if ('calendar-proxy-read' === $name) {
-            return new ProxyRead($this->principalBackend, $this->principalProperties);
-        }
+	/**
+	 * Returns a specific child node, referenced by its name.
+	 *
+	 * @param string $name
+	 *
+	 * @return DAV\INode
+	 */
+	public function getChild($name)
+	{
+		$principal = $this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/'.$name);
+		if (!$principal) {
+			throw new DAV\Exception\NotFound('Node with name '.$name.' was not found');
+		}
+		if ('calendar-proxy-read' === $name) {
+			return new ProxyRead($this->principalBackend, $this->principalProperties);
+		}
 
-        if ('calendar-proxy-write' === $name) {
-            return new ProxyWrite($this->principalBackend, $this->principalProperties);
-        }
+		if ('calendar-proxy-write' === $name) {
+			return new ProxyWrite($this->principalBackend, $this->principalProperties);
+		}
 
-        throw new DAV\Exception\NotFound('Node with name '.$name.' was not found');
-    }
+		throw new DAV\Exception\NotFound('Node with name '.$name.' was not found');
+	}
 
-    /**
-     * Returns an array with all the child nodes.
-     *
-     * @return DAV\INode[]
-     */
-    public function getChildren()
-    {
-        $r = [];
-        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/calendar-proxy-read')) {
-            $r[] = new ProxyRead($this->principalBackend, $this->principalProperties);
-        }
-        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/calendar-proxy-write')) {
-            $r[] = new ProxyWrite($this->principalBackend, $this->principalProperties);
-        }
+	/**
+	 * Returns an array with all the child nodes.
+	 *
+	 * @return DAV\INode[]
+	 */
+	public function getChildren()
+	{
+		$r = [];
+		if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/calendar-proxy-read')) {
+			$r[] = new ProxyRead($this->principalBackend, $this->principalProperties);
+		}
+		if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/calendar-proxy-write')) {
+			$r[] = new ProxyWrite($this->principalBackend, $this->principalProperties);
+		}
 
-        return $r;
-    }
+		return $r;
+	}
 
-    /**
-     * Returns whether or not the child node exists.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function childExists($name)
-    {
-        try {
-            $this->getChild($name);
+	/**
+	 * Returns whether or not the child node exists.
+	 *
+	 * @param string $name
+	 *
+	 * @return bool
+	 */
+	public function childExists($name)
+	{
+		try {
+			$this->getChild($name);
 
-            return true;
-        } catch (DAV\Exception\NotFound $e) {
-            return false;
-        }
-    }
+			return true;
+		} catch (DAV\Exception\NotFound $e) {
+			return false;
+		}
+	}
 
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL()
-    {
-        $acl = parent::getACL();
-        $acl[] = [
-            'privilege' => '{DAV:}read',
-            'principal' => $this->principalProperties['uri'].'/calendar-proxy-read',
-            'protected' => true,
-        ];
-        $acl[] = [
-            'privilege' => '{DAV:}read',
-            'principal' => $this->principalProperties['uri'].'/calendar-proxy-write',
-            'protected' => true,
-        ];
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL()
+	{
+		$acl = parent::getACL();
+		$acl[] = [
+			'privilege' => '{DAV:}read',
+			'principal' => $this->principalProperties['uri'].'/calendar-proxy-read',
+			'protected' => true,
+		];
+		$acl[] = [
+			'privilege' => '{DAV:}read',
+			'principal' => $this->principalProperties['uri'].'/calendar-proxy-write',
+			'protected' => true,
+		];
 
-        return $acl;
-    }
+		return $acl;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Principal/ProxyWrite.php

Indentation +138 added lines, -138 removed lines

@@ -20,142 +20,142 @@
  */
 class ProxyWrite implements IProxyWrite
 {
-    /**
-     * Parent principal information.
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal Backend.
-     *
-     * @var DAVACL\PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object.
-     *
-     * Note that you MUST supply the parent principal information.
-     */
-    public function __construct(DAVACL\PrincipalBackend\BackendInterface $principalBackend, array $principalInfo)
-    {
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'calendar-proxy-write';
-    }
-
-    /**
-     * Returns the last modification time.
-     */
-    public function getLastModified()
-    {
-        return null;
-    }
-
-    /**
-     * Deletes the current node.
-     *
-     * @throws DAV\Exception\Forbidden
-     */
-    public function delete()
-    {
-        throw new DAV\Exception\Forbidden('Permission denied to delete node');
-    }
-
-    /**
-     * Renames the node.
-     *
-     * @param string $name The new name
-     *
-     * @throws DAV\Exception\Forbidden
-     */
-    public function setName($name)
-    {
-        throw new DAV\Exception\Forbidden('Permission denied to rename file');
-    }
-
-    /**
-     * Returns a list of alternative urls for a principal.
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet()
-    {
-        return [];
-    }
-
-    /**
-     * Returns the full principal url.
-     *
-     * @return string
-     */
-    public function getPrincipalUrl()
-    {
-        return $this->principalInfo['uri'].'/'.$this->getName();
-    }
-
-    /**
-     * Returns the list of group members.
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet()
-    {
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
-    }
-
-    /**
-     * Returns the list of groups this principal is member of.
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership()
-    {
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
-    }
-
-    /**
-     * Sets a list of group members.
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     */
-    public function setGroupMemberSet(array $principals)
-    {
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-    }
-
-    /**
-     * Returns the displayname.
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    public function getDisplayName()
-    {
-        return $this->getName();
-    }
+	/**
+	 * Parent principal information.
+	 *
+	 * @var array
+	 */
+	protected $principalInfo;
+
+	/**
+	 * Principal Backend.
+	 *
+	 * @var DAVACL\PrincipalBackend\BackendInterface
+	 */
+	protected $principalBackend;
+
+	/**
+	 * Creates the object.
+	 *
+	 * Note that you MUST supply the parent principal information.
+	 */
+	public function __construct(DAVACL\PrincipalBackend\BackendInterface $principalBackend, array $principalInfo)
+	{
+		$this->principalInfo = $principalInfo;
+		$this->principalBackend = $principalBackend;
+	}
+
+	/**
+	 * Returns this principals name.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return 'calendar-proxy-write';
+	}
+
+	/**
+	 * Returns the last modification time.
+	 */
+	public function getLastModified()
+	{
+		return null;
+	}
+
+	/**
+	 * Deletes the current node.
+	 *
+	 * @throws DAV\Exception\Forbidden
+	 */
+	public function delete()
+	{
+		throw new DAV\Exception\Forbidden('Permission denied to delete node');
+	}
+
+	/**
+	 * Renames the node.
+	 *
+	 * @param string $name The new name
+	 *
+	 * @throws DAV\Exception\Forbidden
+	 */
+	public function setName($name)
+	{
+		throw new DAV\Exception\Forbidden('Permission denied to rename file');
+	}
+
+	/**
+	 * Returns a list of alternative urls for a principal.
+	 *
+	 * This can for example be an email address, or ldap url.
+	 *
+	 * @return array
+	 */
+	public function getAlternateUriSet()
+	{
+		return [];
+	}
+
+	/**
+	 * Returns the full principal url.
+	 *
+	 * @return string
+	 */
+	public function getPrincipalUrl()
+	{
+		return $this->principalInfo['uri'].'/'.$this->getName();
+	}
+
+	/**
+	 * Returns the list of group members.
+	 *
+	 * If this principal is a group, this function should return
+	 * all member principal uri's for the group.
+	 *
+	 * @return array
+	 */
+	public function getGroupMemberSet()
+	{
+		return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
+	}
+
+	/**
+	 * Returns the list of groups this principal is member of.
+	 *
+	 * If this principal is a member of a (list of) groups, this function
+	 * should return a list of principal uri's for it's members.
+	 *
+	 * @return array
+	 */
+	public function getGroupMembership()
+	{
+		return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
+	}
+
+	/**
+	 * Sets a list of group members.
+	 *
+	 * If this principal is a group, this method sets all the group members.
+	 * The list of members is always overwritten, never appended to.
+	 *
+	 * This method should throw an exception if the members could not be set.
+	 */
+	public function setGroupMemberSet(array $principals)
+	{
+		$this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
+	}
+
+	/**
+	 * Returns the displayname.
+	 *
+	 * This should be a human readable name for the principal.
+	 * If none is available, return the nodename.
+	 *
+	 * @return string
+	 */
+	public function getDisplayName()
+	{
+		return $this->getName();
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/ICSExportPlugin.php

Indentation +326 added lines, -326 removed lines

@@ -48,330 +48,330 @@
  */
 class ICSExportPlugin extends DAV\ServerPlugin
 {
-    /**
-     * Reference to Server class.
-     *
-     * @var \Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin and registers event handlers.
-     *
-     * @param \Sabre\DAV\Server $server
-     */
-    public function initialize(DAV\Server $server)
-    {
-        $this->server = $server;
-        $server->on('method:GET', [$this, 'httpGet'], 90);
-        $server->on('browserButtonActions', function ($path, $node, &$actions) {
-            if ($node instanceof ICalendar) {
-                $actions .= '<a href="'.htmlspecialchars($path, ENT_QUOTES, 'UTF-8').'?export"><span class="oi" data-glyph="calendar"></span></a>';
-            }
-        });
-    }
-
-    /**
-     * Intercepts GET requests on calendar urls ending with ?export.
-     *
-     * @throws BadRequest
-     * @throws DAV\Exception\NotFound
-     * @throws VObject\InvalidDataException
-     *
-     * @return bool
-     */
-    public function httpGet(RequestInterface $request, ResponseInterface $response)
-    {
-        $queryParams = $request->getQueryParameters();
-        if (!array_key_exists('export', $queryParams)) {
-            return;
-        }
-
-        $path = $request->getPath();
-
-        $node = $this->server->getProperties($path, [
-            '{DAV:}resourcetype',
-            '{DAV:}displayname',
-            '{http://sabredav.org/ns}sync-token',
-            '{DAV:}sync-token',
-            '{http://apple.com/ns/ical/}calendar-color',
-        ]);
-
-        if (!isset($node['{DAV:}resourcetype']) || !$node['{DAV:}resourcetype']->is('{'.Plugin::NS_CALDAV.'}calendar')) {
-            return;
-        }
-        // Marking the transactionType, for logging purposes.
-        $this->server->transactionType = 'get-calendar-export';
-
-        $properties = $node;
-
-        $start = null;
-        $end = null;
-        $expand = false;
-        $componentType = false;
-        if (isset($queryParams['start'])) {
-            if (!ctype_digit($queryParams['start'])) {
-                throw new BadRequest('The start= parameter must contain a unix timestamp');
-            }
-            $start = DateTime::createFromFormat('U', $queryParams['start']);
-        }
-        if (isset($queryParams['end'])) {
-            if (!ctype_digit($queryParams['end'])) {
-                throw new BadRequest('The end= parameter must contain a unix timestamp');
-            }
-            $end = DateTime::createFromFormat('U', $queryParams['end']);
-        }
-        if (isset($queryParams['expand']) && (bool) $queryParams['expand']) {
-            if (!$start || !$end) {
-                throw new BadRequest('If you\'d like to expand recurrences, you must specify both a start= and end= parameter.');
-            }
-            $expand = true;
-            $componentType = 'VEVENT';
-        }
-        if (isset($queryParams['componentType'])) {
-            if (!in_array($queryParams['componentType'], ['VEVENT', 'VTODO', 'VJOURNAL'])) {
-                throw new BadRequest('You are not allowed to search for components of type: '.$queryParams['componentType'].' here');
-            }
-            $componentType = $queryParams['componentType'];
-        }
-
-        $format = \Sabre\HTTP\negotiateContentType(
-            $request->getHeader('Accept'),
-            [
-                'text/calendar',
-                'application/calendar+json',
-            ]
-        );
-
-        if (isset($queryParams['accept'])) {
-            if ('application/calendar+json' === $queryParams['accept'] || 'jcal' === $queryParams['accept']) {
-                $format = 'application/calendar+json';
-            }
-        }
-        if (!$format) {
-            $format = 'text/calendar';
-        }
-
-        $this->generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, $response);
-
-        // Returning false to break the event chain
-        return false;
-    }
-
-    /**
-     * This method is responsible for generating the actual, full response.
-     *
-     * @param string        $path
-     * @param DateTime|null $start
-     * @param DateTime|null $end
-     * @param bool          $expand
-     * @param string        $componentType
-     * @param string        $format
-     * @param array         $properties
-     *
-     * @throws DAV\Exception\NotFound
-     * @throws VObject\InvalidDataException
-     */
-    protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response)
-    {
-        $calDataProp = '{'.Plugin::NS_CALDAV.'}calendar-data';
-        $calendarNode = $this->server->tree->getNodeForPath($path);
-
-        $blobs = [];
-        if ($start || $end || $componentType) {
-            // If there was a start or end filter, we need to enlist
-            // calendarQuery for speed.
-            $queryResult = $calendarNode->calendarQuery([
-                'name' => 'VCALENDAR',
-                'comp-filters' => [
-                    [
-                        'name' => $componentType,
-                        'comp-filters' => [],
-                        'prop-filters' => [],
-                        'is-not-defined' => false,
-                        'time-range' => [
-                            'start' => $start,
-                            'end' => $end,
-                        ],
-                    ],
-                ],
-                'prop-filters' => [],
-                'is-not-defined' => false,
-                'time-range' => null,
-            ]);
-
-            // queryResult is just a list of base urls. We need to prefix the
-            // calendar path.
-            $queryResult = array_map(
-                function ($item) use ($path) {
-                    return $path.'/'.$item;
-                },
-                $queryResult
-            );
-            $nodes = $this->server->getPropertiesForMultiplePaths($queryResult, [$calDataProp]);
-            unset($queryResult);
-        } else {
-            $nodes = $this->server->getPropertiesForPath($path, [$calDataProp], 1);
-        }
-
-        // Flattening the arrays
-        foreach ($nodes as $node) {
-            if (isset($node[200][$calDataProp])) {
-                $blobs[$node['href']] = $node[200][$calDataProp];
-            }
-        }
-        unset($nodes);
-
-        $mergedCalendar = $this->mergeObjects(
-            $properties,
-            $blobs
-        );
-
-        if ($expand) {
-            $calendarTimeZone = null;
-            // We're expanding, and for that we need to figure out the
-            // calendar's timezone.
-            $tzProp = '{'.Plugin::NS_CALDAV.'}calendar-timezone';
-            $tzResult = $this->server->getProperties($path, [$tzProp]);
-            if (isset($tzResult[$tzProp])) {
-                // This property contains a VCALENDAR with a single
-                // VTIMEZONE.
-                $vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
-                $calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
-                // Destroy circular references to PHP will GC the object.
-                $vtimezoneObj->destroy();
-                unset($vtimezoneObj);
-            } else {
-                // Defaulting to UTC.
-                $calendarTimeZone = new DateTimeZone('UTC');
-            }
-
-            $mergedCalendar = $mergedCalendar->expand($start, $end, $calendarTimeZone);
-        }
-
-        $filenameExtension = '.ics';
-
-        switch ($format) {
-            case 'text/calendar':
-                $mergedCalendar = $mergedCalendar->serialize();
-                $filenameExtension = '.ics';
-                break;
-            case 'application/calendar+json':
-                $mergedCalendar = json_encode($mergedCalendar->jsonSerialize());
-                $filenameExtension = '.json';
-                break;
-        }
-
-        $filename = preg_replace(
-            '/[^a-zA-Z0-9-_ ]/um',
-            '',
-            $calendarNode->getName()
-        );
-        $filename .= '-'.date('Y-m-d').$filenameExtension;
-
-        $response->setHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
-        $response->setHeader('Content-Type', $format);
-
-        $response->setStatus(200);
-        $response->setBody($mergedCalendar);
-    }
-
-    /**
-     * Merges all calendar objects, and builds one big iCalendar blob.
-     *
-     * @param array $properties Some CalDAV properties
-     *
-     * @return VObject\Component\VCalendar
-     */
-    public function mergeObjects(array $properties, array $inputObjects)
-    {
-        $calendar = new VObject\Component\VCalendar();
-        $calendar->VERSION = '2.0';
-        if (DAV\Server::$exposeVersion) {
-            $calendar->PRODID = '-//SabreDAV//SabreDAV '.DAV\Version::VERSION.'//EN';
-        } else {
-            $calendar->PRODID = '-//SabreDAV//SabreDAV//EN';
-        }
-        if (isset($properties['{DAV:}displayname'])) {
-            $calendar->{'X-WR-CALNAME'} = $properties['{DAV:}displayname'];
-        }
-        if (isset($properties['{http://apple.com/ns/ical/}calendar-color'])) {
-            $calendar->{'X-APPLE-CALENDAR-COLOR'} = $properties['{http://apple.com/ns/ical/}calendar-color'];
-        }
-
-        $collectedTimezones = [];
-
-        $timezones = [];
-        $objects = [];
-
-        foreach ($inputObjects as $href => $inputObject) {
-            $nodeComp = VObject\Reader::read($inputObject);
-
-            foreach ($nodeComp->children() as $child) {
-                switch ($child->name) {
-                    case 'VEVENT':
-                    case 'VTODO':
-                    case 'VJOURNAL':
-                        $objects[] = clone $child;
-                        break;
-
-                    // VTIMEZONE is special, because we need to filter out the duplicates
-                    case 'VTIMEZONE':
-                        // Naively just checking tzid.
-                        if (in_array((string) $child->TZID, $collectedTimezones)) {
-                            break;
-                        }
-
-                        $timezones[] = clone $child;
-                        $collectedTimezones[] = $child->TZID;
-                        break;
-                }
-            }
-            // Destroy circular references to PHP will GC the object.
-            $nodeComp->destroy();
-            unset($nodeComp);
-        }
-
-        foreach ($timezones as $tz) {
-            $calendar->add($tz);
-        }
-        foreach ($objects as $obj) {
-            $calendar->add($obj);
-        }
-
-        return $calendar;
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using \Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName()
-    {
-        return 'ics-export';
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo()
-    {
-        return [
-            'name' => $this->getPluginName(),
-            'description' => 'Adds the ability to export CalDAV calendars as a single iCalendar file.',
-            'link' => 'http://sabre.io/dav/ics-export-plugin/',
-        ];
-    }
+	/**
+	 * Reference to Server class.
+	 *
+	 * @var \Sabre\DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * Initializes the plugin and registers event handlers.
+	 *
+	 * @param \Sabre\DAV\Server $server
+	 */
+	public function initialize(DAV\Server $server)
+	{
+		$this->server = $server;
+		$server->on('method:GET', [$this, 'httpGet'], 90);
+		$server->on('browserButtonActions', function ($path, $node, &$actions) {
+			if ($node instanceof ICalendar) {
+				$actions .= '<a href="'.htmlspecialchars($path, ENT_QUOTES, 'UTF-8').'?export"><span class="oi" data-glyph="calendar"></span></a>';
+			}
+		});
+	}
+
+	/**
+	 * Intercepts GET requests on calendar urls ending with ?export.
+	 *
+	 * @throws BadRequest
+	 * @throws DAV\Exception\NotFound
+	 * @throws VObject\InvalidDataException
+	 *
+	 * @return bool
+	 */
+	public function httpGet(RequestInterface $request, ResponseInterface $response)
+	{
+		$queryParams = $request->getQueryParameters();
+		if (!array_key_exists('export', $queryParams)) {
+			return;
+		}
+
+		$path = $request->getPath();
+
+		$node = $this->server->getProperties($path, [
+			'{DAV:}resourcetype',
+			'{DAV:}displayname',
+			'{http://sabredav.org/ns}sync-token',
+			'{DAV:}sync-token',
+			'{http://apple.com/ns/ical/}calendar-color',
+		]);
+
+		if (!isset($node['{DAV:}resourcetype']) || !$node['{DAV:}resourcetype']->is('{'.Plugin::NS_CALDAV.'}calendar')) {
+			return;
+		}
+		// Marking the transactionType, for logging purposes.
+		$this->server->transactionType = 'get-calendar-export';
+
+		$properties = $node;
+
+		$start = null;
+		$end = null;
+		$expand = false;
+		$componentType = false;
+		if (isset($queryParams['start'])) {
+			if (!ctype_digit($queryParams['start'])) {
+				throw new BadRequest('The start= parameter must contain a unix timestamp');
+			}
+			$start = DateTime::createFromFormat('U', $queryParams['start']);
+		}
+		if (isset($queryParams['end'])) {
+			if (!ctype_digit($queryParams['end'])) {
+				throw new BadRequest('The end= parameter must contain a unix timestamp');
+			}
+			$end = DateTime::createFromFormat('U', $queryParams['end']);
+		}
+		if (isset($queryParams['expand']) && (bool) $queryParams['expand']) {
+			if (!$start || !$end) {
+				throw new BadRequest('If you\'d like to expand recurrences, you must specify both a start= and end= parameter.');
+			}
+			$expand = true;
+			$componentType = 'VEVENT';
+		}
+		if (isset($queryParams['componentType'])) {
+			if (!in_array($queryParams['componentType'], ['VEVENT', 'VTODO', 'VJOURNAL'])) {
+				throw new BadRequest('You are not allowed to search for components of type: '.$queryParams['componentType'].' here');
+			}
+			$componentType = $queryParams['componentType'];
+		}
+
+		$format = \Sabre\HTTP\negotiateContentType(
+			$request->getHeader('Accept'),
+			[
+				'text/calendar',
+				'application/calendar+json',
+			]
+		);
+
+		if (isset($queryParams['accept'])) {
+			if ('application/calendar+json' === $queryParams['accept'] || 'jcal' === $queryParams['accept']) {
+				$format = 'application/calendar+json';
+			}
+		}
+		if (!$format) {
+			$format = 'text/calendar';
+		}
+
+		$this->generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, $response);
+
+		// Returning false to break the event chain
+		return false;
+	}
+
+	/**
+	 * This method is responsible for generating the actual, full response.
+	 *
+	 * @param string        $path
+	 * @param DateTime|null $start
+	 * @param DateTime|null $end
+	 * @param bool          $expand
+	 * @param string        $componentType
+	 * @param string        $format
+	 * @param array         $properties
+	 *
+	 * @throws DAV\Exception\NotFound
+	 * @throws VObject\InvalidDataException
+	 */
+	protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response)
+	{
+		$calDataProp = '{'.Plugin::NS_CALDAV.'}calendar-data';
+		$calendarNode = $this->server->tree->getNodeForPath($path);
+
+		$blobs = [];
+		if ($start || $end || $componentType) {
+			// If there was a start or end filter, we need to enlist
+			// calendarQuery for speed.
+			$queryResult = $calendarNode->calendarQuery([
+				'name' => 'VCALENDAR',
+				'comp-filters' => [
+					[
+						'name' => $componentType,
+						'comp-filters' => [],
+						'prop-filters' => [],
+						'is-not-defined' => false,
+						'time-range' => [
+							'start' => $start,
+							'end' => $end,
+						],
+					],
+				],
+				'prop-filters' => [],
+				'is-not-defined' => false,
+				'time-range' => null,
+			]);
+
+			// queryResult is just a list of base urls. We need to prefix the
+			// calendar path.
+			$queryResult = array_map(
+				function ($item) use ($path) {
+					return $path.'/'.$item;
+				},
+				$queryResult
+			);
+			$nodes = $this->server->getPropertiesForMultiplePaths($queryResult, [$calDataProp]);
+			unset($queryResult);
+		} else {
+			$nodes = $this->server->getPropertiesForPath($path, [$calDataProp], 1);
+		}
+
+		// Flattening the arrays
+		foreach ($nodes as $node) {
+			if (isset($node[200][$calDataProp])) {
+				$blobs[$node['href']] = $node[200][$calDataProp];
+			}
+		}
+		unset($nodes);
+
+		$mergedCalendar = $this->mergeObjects(
+			$properties,
+			$blobs
+		);
+
+		if ($expand) {
+			$calendarTimeZone = null;
+			// We're expanding, and for that we need to figure out the
+			// calendar's timezone.
+			$tzProp = '{'.Plugin::NS_CALDAV.'}calendar-timezone';
+			$tzResult = $this->server->getProperties($path, [$tzProp]);
+			if (isset($tzResult[$tzProp])) {
+				// This property contains a VCALENDAR with a single
+				// VTIMEZONE.
+				$vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
+				$calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
+				// Destroy circular references to PHP will GC the object.
+				$vtimezoneObj->destroy();
+				unset($vtimezoneObj);
+			} else {
+				// Defaulting to UTC.
+				$calendarTimeZone = new DateTimeZone('UTC');
+			}
+
+			$mergedCalendar = $mergedCalendar->expand($start, $end, $calendarTimeZone);
+		}
+
+		$filenameExtension = '.ics';
+
+		switch ($format) {
+			case 'text/calendar':
+				$mergedCalendar = $mergedCalendar->serialize();
+				$filenameExtension = '.ics';
+				break;
+			case 'application/calendar+json':
+				$mergedCalendar = json_encode($mergedCalendar->jsonSerialize());
+				$filenameExtension = '.json';
+				break;
+		}
+
+		$filename = preg_replace(
+			'/[^a-zA-Z0-9-_ ]/um',
+			'',
+			$calendarNode->getName()
+		);
+		$filename .= '-'.date('Y-m-d').$filenameExtension;
+
+		$response->setHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
+		$response->setHeader('Content-Type', $format);
+
+		$response->setStatus(200);
+		$response->setBody($mergedCalendar);
+	}
+
+	/**
+	 * Merges all calendar objects, and builds one big iCalendar blob.
+	 *
+	 * @param array $properties Some CalDAV properties
+	 *
+	 * @return VObject\Component\VCalendar
+	 */
+	public function mergeObjects(array $properties, array $inputObjects)
+	{
+		$calendar = new VObject\Component\VCalendar();
+		$calendar->VERSION = '2.0';
+		if (DAV\Server::$exposeVersion) {
+			$calendar->PRODID = '-//SabreDAV//SabreDAV '.DAV\Version::VERSION.'//EN';
+		} else {
+			$calendar->PRODID = '-//SabreDAV//SabreDAV//EN';
+		}
+		if (isset($properties['{DAV:}displayname'])) {
+			$calendar->{'X-WR-CALNAME'} = $properties['{DAV:}displayname'];
+		}
+		if (isset($properties['{http://apple.com/ns/ical/}calendar-color'])) {
+			$calendar->{'X-APPLE-CALENDAR-COLOR'} = $properties['{http://apple.com/ns/ical/}calendar-color'];
+		}
+
+		$collectedTimezones = [];
+
+		$timezones = [];
+		$objects = [];
+
+		foreach ($inputObjects as $href => $inputObject) {
+			$nodeComp = VObject\Reader::read($inputObject);
+
+			foreach ($nodeComp->children() as $child) {
+				switch ($child->name) {
+					case 'VEVENT':
+					case 'VTODO':
+					case 'VJOURNAL':
+						$objects[] = clone $child;
+						break;
+
+					// VTIMEZONE is special, because we need to filter out the duplicates
+					case 'VTIMEZONE':
+						// Naively just checking tzid.
+						if (in_array((string) $child->TZID, $collectedTimezones)) {
+							break;
+						}
+
+						$timezones[] = clone $child;
+						$collectedTimezones[] = $child->TZID;
+						break;
+				}
+			}
+			// Destroy circular references to PHP will GC the object.
+			$nodeComp->destroy();
+			unset($nodeComp);
+		}
+
+		foreach ($timezones as $tz) {
+			$calendar->add($tz);
+		}
+		foreach ($objects as $obj) {
+			$calendar->add($obj);
+		}
+
+		return $calendar;
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using \Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName()
+	{
+		return 'ics-export';
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo()
+	{
+		return [
+			'name' => $this->getPluginName(),
+			'description' => 'Adds the ability to export CalDAV calendars as a single iCalendar file.',
+			'link' => 'http://sabre.io/dav/ics-export-plugin/',
+		];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
     {
         $this->server = $server;
         $server->on('method:GET', [$this, 'httpGet'], 90);
-        $server->on('browserButtonActions', function ($path, $node, &$actions) {
+        $server->on('browserButtonActions', function($path, $node, &$actions) {
             if ($node instanceof ICalendar) {
                 $actions .= '<a href="'.htmlspecialchars($path, ENT_QUOTES, 'UTF-8').'?export"><span class="oi" data-glyph="calendar"></span></a>';
             }
@@ -203,7 +203,7 @@ 
             // queryResult is just a list of base urls. We need to prefix the
             // calendar path.
             $queryResult = array_map(
-                function ($item) use ($path) {
+                function($item) use ($path) {
                     return $path.'/'.$item;
                 },
                 $queryResult

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Backend/BackendInterface.php

Indentation +246 added lines, -246 removed lines

@@ -13,261 +13,261 @@
  */
 interface BackendInterface
 {
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which is the basename of the uri with which the calendar is
-     *    accessed.
-     *  * principaluri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * Many clients also require:
-     * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-     * For this property, you can just return an instance of
-     * Sabre\CalDAV\Property\SupportedCalendarComponentSet.
-     *
-     * If you return {http://sabredav.org/ns}read-only and set the value to 1,
-     * ACL will automatically be put in read-only mode.
-     *
-     * @param string $principalUri
-     *
-     * @return array
-     */
-    public function getCalendarsForUser($principalUri);
+	/**
+	 * Returns a list of calendars for a principal.
+	 *
+	 * Every project is an array with the following keys:
+	 *  * id, a unique id that will be used by other functions to modify the
+	 *    calendar. This can be the same as the uri or a database key.
+	 *  * uri, which is the basename of the uri with which the calendar is
+	 *    accessed.
+	 *  * principaluri. The owner of the calendar. Almost always the same as
+	 *    principalUri passed to this method.
+	 *
+	 * Furthermore it can contain webdav properties in clark notation. A very
+	 * common one is '{DAV:}displayname'.
+	 *
+	 * Many clients also require:
+	 * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+	 * For this property, you can just return an instance of
+	 * Sabre\CalDAV\Property\SupportedCalendarComponentSet.
+	 *
+	 * If you return {http://sabredav.org/ns}read-only and set the value to 1,
+	 * ACL will automatically be put in read-only mode.
+	 *
+	 * @param string $principalUri
+	 *
+	 * @return array
+	 */
+	public function getCalendarsForUser($principalUri);
 
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to
-     * reference this calendar in other methods, such as updateCalendar.
-     *
-     * The id can be any type, including ints, strings, objects or array.
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     *
-     * @return mixed
-     */
-    public function createCalendar($principalUri, $calendarUri, array $properties);
+	/**
+	 * Creates a new calendar for a principal.
+	 *
+	 * If the creation was a success, an id must be returned that can be used to
+	 * reference this calendar in other methods, such as updateCalendar.
+	 *
+	 * The id can be any type, including ints, strings, objects or array.
+	 *
+	 * @param string $principalUri
+	 * @param string $calendarUri
+	 *
+	 * @return mixed
+	 */
+	public function createCalendar($principalUri, $calendarUri, array $properties);
 
-    /**
-     * Updates properties for a calendar.
-     *
-     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-     * To do the actual updates, you must tell this object which properties
-     * you're going to process with the handle() method.
-     *
-     * Calling the handle method is like telling the PropPatch object "I
-     * promise I can handle updating this property".
-     *
-     * Read the PropPatch documentation for more info and examples.
-     *
-     * @param mixed $calendarId
-     */
-    public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch);
+	/**
+	 * Updates properties for a calendar.
+	 *
+	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+	 * To do the actual updates, you must tell this object which properties
+	 * you're going to process with the handle() method.
+	 *
+	 * Calling the handle method is like telling the PropPatch object "I
+	 * promise I can handle updating this property".
+	 *
+	 * Read the PropPatch documentation for more info and examples.
+	 *
+	 * @param mixed $calendarId
+	 */
+	public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch);
 
-    /**
-     * Delete a calendar and all its objects.
-     *
-     * @param mixed $calendarId
-     */
-    public function deleteCalendar($calendarId);
+	/**
+	 * Delete a calendar and all its objects.
+	 *
+	 * @param mixed $calendarId
+	 */
+	public function deleteCalendar($calendarId);
 
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * calendardata - The iCalendar-compatible calendar data
-     *   * uri - a unique key which will be used to construct the uri. This can
-     *     be any arbitrary string, but making sure it ends with '.ics' is a
-     *     good idea. This is only the basename, or filename, not the full
-     *     path.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '"abcdef"')
-     *   * size - The size of the calendar objects, in bytes.
-     *   * component - optional, a string containing the type of object, such
-     *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
-     *     the Content-Type header.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * If neither etag or size are specified, the calendardata will be
-     * used/fetched to determine these numbers. If both are specified the
-     * amount of times this is needed is reduced by a great degree.
-     *
-     * @param mixed $calendarId
-     *
-     * @return array
-     */
-    public function getCalendarObjects($calendarId);
+	/**
+	 * Returns all calendar objects within a calendar.
+	 *
+	 * Every item contains an array with the following keys:
+	 *   * calendardata - The iCalendar-compatible calendar data
+	 *   * uri - a unique key which will be used to construct the uri. This can
+	 *     be any arbitrary string, but making sure it ends with '.ics' is a
+	 *     good idea. This is only the basename, or filename, not the full
+	 *     path.
+	 *   * lastmodified - a timestamp of the last modification time
+	 *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+	 *   '"abcdef"')
+	 *   * size - The size of the calendar objects, in bytes.
+	 *   * component - optional, a string containing the type of object, such
+	 *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
+	 *     the Content-Type header.
+	 *
+	 * Note that the etag is optional, but it's highly encouraged to return for
+	 * speed reasons.
+	 *
+	 * The calendardata is also optional. If it's not returned
+	 * 'getCalendarObject' will be called later, which *is* expected to return
+	 * calendardata.
+	 *
+	 * If neither etag or size are specified, the calendardata will be
+	 * used/fetched to determine these numbers. If both are specified the
+	 * amount of times this is needed is reduced by a great degree.
+	 *
+	 * @param mixed $calendarId
+	 *
+	 * @return array
+	 */
+	public function getCalendarObjects($calendarId);
 
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * This method must return null if the object did not exist.
-     *
-     * @param mixed  $calendarId
-     * @param string $objectUri
-     *
-     * @return array|null
-     */
-    public function getCalendarObject($calendarId, $objectUri);
+	/**
+	 * Returns information from a single calendar object, based on it's object
+	 * uri.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * The returned array must have the same keys as getCalendarObjects. The
+	 * 'calendardata' object is required here though, while it's not required
+	 * for getCalendarObjects.
+	 *
+	 * This method must return null if the object did not exist.
+	 *
+	 * @param mixed  $calendarId
+	 * @param string $objectUri
+	 *
+	 * @return array|null
+	 */
+	public function getCalendarObject($calendarId, $objectUri);
 
-    /**
-     * Returns a list of calendar objects.
-     *
-     * This method should work identical to getCalendarObject, but instead
-     * return all the calendar objects in the list as an array.
-     *
-     * If the backend supports this, it may allow for some speed-ups.
-     *
-     * @param mixed $calendarId
-     *
-     * @return array
-     */
-    public function getMultipleCalendarObjects($calendarId, array $uris);
+	/**
+	 * Returns a list of calendar objects.
+	 *
+	 * This method should work identical to getCalendarObject, but instead
+	 * return all the calendar objects in the list as an array.
+	 *
+	 * If the backend supports this, it may allow for some speed-ups.
+	 *
+	 * @param mixed $calendarId
+	 *
+	 * @return array
+	 */
+	public function getMultipleCalendarObjects($calendarId, array $uris);
 
-    /**
-     * Creates a new calendar object.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * It is possible to return an etag from this function, which will be used
-     * in the response to this PUT request. Note that the ETag must be
-     * surrounded by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed  $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     *
-     * @return string|null
-     */
-    public function createCalendarObject($calendarId, $objectUri, $calendarData);
+	/**
+	 * Creates a new calendar object.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * It is possible to return an etag from this function, which will be used
+	 * in the response to this PUT request. Note that the ETag must be
+	 * surrounded by double-quotes.
+	 *
+	 * However, you should only really return this ETag if you don't mangle the
+	 * calendar-data. If the result of a subsequent GET to this object is not
+	 * the exact same as this request body, you should omit the ETag.
+	 *
+	 * @param mixed  $calendarId
+	 * @param string $objectUri
+	 * @param string $calendarData
+	 *
+	 * @return string|null
+	 */
+	public function createCalendarObject($calendarId, $objectUri, $calendarData);
 
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * It is possible return an etag from this function, which will be used in
-     * the response to this PUT request. Note that the ETag must be surrounded
-     * by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed  $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     *
-     * @return string|null
-     */
-    public function updateCalendarObject($calendarId, $objectUri, $calendarData);
+	/**
+	 * Updates an existing calendarobject, based on it's uri.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * It is possible return an etag from this function, which will be used in
+	 * the response to this PUT request. Note that the ETag must be surrounded
+	 * by double-quotes.
+	 *
+	 * However, you should only really return this ETag if you don't mangle the
+	 * calendar-data. If the result of a subsequent GET to this object is not
+	 * the exact same as this request body, you should omit the ETag.
+	 *
+	 * @param mixed  $calendarId
+	 * @param string $objectUri
+	 * @param string $calendarData
+	 *
+	 * @return string|null
+	 */
+	public function updateCalendarObject($calendarId, $objectUri, $calendarData);
 
-    /**
-     * Deletes an existing calendar object.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * @param mixed  $calendarId
-     * @param string $objectUri
-     */
-    public function deleteCalendarObject($calendarId, $objectUri);
+	/**
+	 * Deletes an existing calendar object.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * @param mixed  $calendarId
+	 * @param string $objectUri
+	 */
+	public function deleteCalendarObject($calendarId, $objectUri);
 
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by Sabre\CalDAV\CalendarQueryParser.
-     *
-     * Note that it is extremely likely that getCalendarObject for every path
-     * returned from this method will be called almost immediately after. You
-     * may want to anticipate this to speed up these requests.
-     *
-     * This method provides a default implementation, which parses *all* the
-     * iCalendar objects in the specified calendar.
-     *
-     * This default may well be good enough for personal use, and calendars
-     * that aren't very large. But if you anticipate high usage, big calendars
-     * or high loads, you are strongly adviced to optimize certain paths.
-     *
-     * The best way to do so is override this method and to optimize
-     * specifically for 'common filters'.
-     *
-     * Requests that are extremely common are:
-     *   * requests for just VEVENTS
-     *   * requests for just VTODO
-     *   * requests with a time-range-filter on either VEVENT or VTODO.
-     *
-     * ..and combinations of these requests. It may not be worth it to try to
-     * handle every possible situation and just rely on the (relatively
-     * easy to use) CalendarQueryValidator to handle the rest.
-     *
-     * Note that especially time-range-filters may be difficult to parse. A
-     * time-range filter specified on a VEVENT must for instance also handle
-     * recurrence rules correctly.
-     * A good example of how to interprete all these filters can also simply
-     * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-     * as possible, so it gives you a good idea on what type of stuff you need
-     * to think of.
-     *
-     * @param mixed $calendarId
-     *
-     * @return array
-     */
-    public function calendarQuery($calendarId, array $filters);
+	/**
+	 * Performs a calendar-query on the contents of this calendar.
+	 *
+	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
+	 * calendar-query it is possible for a client to request a specific set of
+	 * object, based on contents of iCalendar properties, date-ranges and
+	 * iCalendar component types (VTODO, VEVENT).
+	 *
+	 * This method should just return a list of (relative) urls that match this
+	 * query.
+	 *
+	 * The list of filters are specified as an array. The exact array is
+	 * documented by Sabre\CalDAV\CalendarQueryParser.
+	 *
+	 * Note that it is extremely likely that getCalendarObject for every path
+	 * returned from this method will be called almost immediately after. You
+	 * may want to anticipate this to speed up these requests.
+	 *
+	 * This method provides a default implementation, which parses *all* the
+	 * iCalendar objects in the specified calendar.
+	 *
+	 * This default may well be good enough for personal use, and calendars
+	 * that aren't very large. But if you anticipate high usage, big calendars
+	 * or high loads, you are strongly adviced to optimize certain paths.
+	 *
+	 * The best way to do so is override this method and to optimize
+	 * specifically for 'common filters'.
+	 *
+	 * Requests that are extremely common are:
+	 *   * requests for just VEVENTS
+	 *   * requests for just VTODO
+	 *   * requests with a time-range-filter on either VEVENT or VTODO.
+	 *
+	 * ..and combinations of these requests. It may not be worth it to try to
+	 * handle every possible situation and just rely on the (relatively
+	 * easy to use) CalendarQueryValidator to handle the rest.
+	 *
+	 * Note that especially time-range-filters may be difficult to parse. A
+	 * time-range filter specified on a VEVENT must for instance also handle
+	 * recurrence rules correctly.
+	 * A good example of how to interprete all these filters can also simply
+	 * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+	 * as possible, so it gives you a good idea on what type of stuff you need
+	 * to think of.
+	 *
+	 * @param mixed $calendarId
+	 *
+	 * @return array
+	 */
+	public function calendarQuery($calendarId, array $filters);
 
-    /**
-     * Searches through all of a users calendars and calendar objects to find
-     * an object with a specific UID.
-     *
-     * This method should return the path to this object, relative to the
-     * calendar home, so this path usually only contains two parts:
-     *
-     * calendarpath/objectpath.ics
-     *
-     * If the uid is not found, return null.
-     *
-     * This method should only consider * objects that the principal owns, so
-     * any calendars owned by other principals that also appear in this
-     * collection should be ignored.
-     *
-     * @param string $principalUri
-     * @param string $uid
-     *
-     * @return string|null
-     */
-    public function getCalendarObjectByUID($principalUri, $uid);
+	/**
+	 * Searches through all of a users calendars and calendar objects to find
+	 * an object with a specific UID.
+	 *
+	 * This method should return the path to this object, relative to the
+	 * calendar home, so this path usually only contains two parts:
+	 *
+	 * calendarpath/objectpath.ics
+	 *
+	 * If the uid is not found, return null.
+	 *
+	 * This method should only consider * objects that the principal owns, so
+	 * any calendars owned by other principals that also appear in this
+	 * collection should be ignored.
+	 *
+	 * @param string $principalUri
+	 * @param string $uid
+	 *
+	 * @return string|null
+	 */
+	public function getCalendarObjectByUID($principalUri, $uid);
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php

Indentation +31 added lines, -31 removed lines

@@ -26,37 +26,37 @@
  */
 interface NotificationSupport extends BackendInterface
 {
-    /**
-     * Returns a list of notifications for a given principal url.
-     *
-     * @param string $principalUri
-     *
-     * @return NotificationInterface[]
-     */
-    public function getNotificationsForPrincipal($principalUri);
+	/**
+	 * Returns a list of notifications for a given principal url.
+	 *
+	 * @param string $principalUri
+	 *
+	 * @return NotificationInterface[]
+	 */
+	public function getNotificationsForPrincipal($principalUri);
 
-    /**
-     * This deletes a specific notifcation.
-     *
-     * This may be called by a client once it deems a notification handled.
-     *
-     * @param string $principalUri
-     */
-    public function deleteNotification($principalUri, NotificationInterface $notification);
+	/**
+	 * This deletes a specific notifcation.
+	 *
+	 * This may be called by a client once it deems a notification handled.
+	 *
+	 * @param string $principalUri
+	 */
+	public function deleteNotification($principalUri, NotificationInterface $notification);
 
-    /**
-     * This method is called when a user replied to a request to share.
-     *
-     * If the user chose to accept the share, this method should return the
-     * newly created calendar url.
-     *
-     * @param string $href        The sharee who is replying (often a mailto: address)
-     * @param int    $status      One of the SharingPlugin::STATUS_* constants
-     * @param string $calendarUri The url to the calendar thats being shared
-     * @param string $inReplyTo   The unique id this message is a response to
-     * @param string $summary     A description of the reply
-     *
-     * @return string|null
-     */
-    public function shareReply($href, $status, $calendarUri, $inReplyTo, $summary = null);
+	/**
+	 * This method is called when a user replied to a request to share.
+	 *
+	 * If the user chose to accept the share, this method should return the
+	 * newly created calendar url.
+	 *
+	 * @param string $href        The sharee who is replying (often a mailto: address)
+	 * @param int    $status      One of the SharingPlugin::STATUS_* constants
+	 * @param string $calendarUri The url to the calendar thats being shared
+	 * @param string $inReplyTo   The unique id this message is a response to
+	 * @param string $summary     A description of the reply
+	 *
+	 * @return string|null
+	 */
+	public function shareReply($href, $status, $calendarUri, $inReplyTo, $summary = null);
 }