YetiForceCompany / YetiForceCRM

libraries/SabreDAV/CalDAV/Backend/PDO.php

Braces +12 added lines, -4 removed lines

@@ -398,7 +398,9 @@ 
         $stmt->execute([$calendarId, $objectUri]);
         $row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-        if (!$row) return null;
+        if (!$row) {
+        	return null;
+        }
 
         return [
             'id'            => $row['id'],
@@ -862,7 +864,9 @@ 
         $stmt->execute([ $calendarId ]);
         $currentToken = $stmt->fetchColumn(0);
 
-        if (is_null($currentToken)) return null;
+        if (is_null($currentToken)) {
+        	return null;
+        }
 
         $result = [
             'syncToken' => $currentToken,
@@ -874,7 +878,9 @@ 
         if ($syncToken) {
 
             $query = sprintf('SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && calendarid = ? ORDER BY synctoken', $this->calendarChangesTableName);
-            if ($limit > 0) $query .= " LIMIT " . (int)$limit;
+            if ($limit > 0) {
+            	$query .= " LIMIT " . (int)$limit;
+            }
 
             // Fetching all changes
             $stmt = $this->pdo->prepare($query);
@@ -1150,7 +1156,9 @@ 
         $stmt->execute([$principalUri, $objectUri]);
         $row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-        if (!$row) return null;
+        if (!$row) {
+        	return null;
+        }
 
         return [
             'uri'          => $row['uri'],

Indentation +1147 added lines, -1147 removed lines

@@ -19,763 +19,763 @@ 
  */
 class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, SchedulingSupport {
 
-    /**
-     * We need to specify a max date, because we need to stop *somewhere*
-     *
-     * On 32 bit system the maximum for a signed integer is 2147483647, so
-     * MAX_DATE cannot be higher than date('Y-m-d', 2147483647) which results
-     * in 2038-01-19 to avoid problems when the date is converted
-     * to a unix timestamp.
-     */
-    const MAX_DATE = '2038-01-01';
-
-    /**
-     * pdo
-     *
-     * @var \PDO
-     */
-    protected $pdo;
-
-    /**
-     * The table name that will be used for calendars
-     *
-     * @var string
-     */
-    public $calendarTableName = 'calendars';
-
-    /**
-     * The table name that will be used for calendar objects
-     *
-     * @var string
-     */
-    public $calendarObjectTableName = 'calendarobjects';
-
-    /**
-     * The table name that will be used for tracking changes in calendars.
-     *
-     * @var string
-     */
-    public $calendarChangesTableName = 'calendarchanges';
-
-    /**
-     * The table name that will be used inbox items.
-     *
-     * @var string
-     */
-    public $schedulingObjectTableName = 'schedulingobjects';
-
-    /**
-     * The table name that will be used for calendar subscriptions.
-     *
-     * @var string
-     */
-    public $calendarSubscriptionsTableName = 'calendarsubscriptions';
-
-    /**
-     * List of CalDAV properties, and how they map to database fieldnames
-     * Add your own properties by simply adding on to this array.
-     *
-     * Note that only string-based properties are supported here.
-     *
-     * @var array
-     */
-    public $propertyMap = [
-        '{DAV:}displayname'                                   => 'displayname',
-        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
-        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
-        '{http://apple.com/ns/ical/}calendar-order'           => 'calendarorder',
-        '{http://apple.com/ns/ical/}calendar-color'           => 'calendarcolor',
-    ];
-
-    /**
-     * List of subscription properties, and how they map to database fieldnames.
-     *
-     * @var array
-     */
-    public $subscriptionPropertyMap = [
-        '{DAV:}displayname'                                           => 'displayname',
-        '{http://apple.com/ns/ical/}refreshrate'                      => 'refreshrate',
-        '{http://apple.com/ns/ical/}calendar-order'                   => 'calendarorder',
-        '{http://apple.com/ns/ical/}calendar-color'                   => 'calendarcolor',
-        '{http://calendarserver.org/ns/}subscribed-strip-todos'       => 'striptodos',
-        '{http://calendarserver.org/ns/}subscribed-strip-alarms'      => 'stripalarms',
-        '{http://calendarserver.org/ns/}subscribed-strip-attachments' => 'stripattachments',
-    ];
-
-    /**
-     * Creates the backend
-     *
-     * @param \PDO $pdo
-     */
-    public function __construct(\PDO $pdo) {
-
-        $this->pdo = $pdo;
-
-    }
-
-    /**
-     * 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. This is just the 'base uri' or 'filename' of the calendar.
-     *  * 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\Xml\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) {
-
-        $fields = array_values($this->propertyMap);
-        $fields[] = 'id';
-        $fields[] = 'uri';
-        $fields[] = 'synctoken';
-        $fields[] = 'components';
-        $fields[] = 'principaluri';
-        $fields[] = 'transparent';
-
-        // Making fields a comma-delimited list
-        $fields = implode(', ', $fields);
+	/**
+	 * We need to specify a max date, because we need to stop *somewhere*
+	 *
+	 * On 32 bit system the maximum for a signed integer is 2147483647, so
+	 * MAX_DATE cannot be higher than date('Y-m-d', 2147483647) which results
+	 * in 2038-01-19 to avoid problems when the date is converted
+	 * to a unix timestamp.
+	 */
+	const MAX_DATE = '2038-01-01';
+
+	/**
+	 * pdo
+	 *
+	 * @var \PDO
+	 */
+	protected $pdo;
+
+	/**
+	 * The table name that will be used for calendars
+	 *
+	 * @var string
+	 */
+	public $calendarTableName = 'calendars';
+
+	/**
+	 * The table name that will be used for calendar objects
+	 *
+	 * @var string
+	 */
+	public $calendarObjectTableName = 'calendarobjects';
+
+	/**
+	 * The table name that will be used for tracking changes in calendars.
+	 *
+	 * @var string
+	 */
+	public $calendarChangesTableName = 'calendarchanges';
+
+	/**
+	 * The table name that will be used inbox items.
+	 *
+	 * @var string
+	 */
+	public $schedulingObjectTableName = 'schedulingobjects';
+
+	/**
+	 * The table name that will be used for calendar subscriptions.
+	 *
+	 * @var string
+	 */
+	public $calendarSubscriptionsTableName = 'calendarsubscriptions';
+
+	/**
+	 * List of CalDAV properties, and how they map to database fieldnames
+	 * Add your own properties by simply adding on to this array.
+	 *
+	 * Note that only string-based properties are supported here.
+	 *
+	 * @var array
+	 */
+	public $propertyMap = [
+		'{DAV:}displayname'                                   => 'displayname',
+		'{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
+		'{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
+		'{http://apple.com/ns/ical/}calendar-order'           => 'calendarorder',
+		'{http://apple.com/ns/ical/}calendar-color'           => 'calendarcolor',
+	];
+
+	/**
+	 * List of subscription properties, and how they map to database fieldnames.
+	 *
+	 * @var array
+	 */
+	public $subscriptionPropertyMap = [
+		'{DAV:}displayname'                                           => 'displayname',
+		'{http://apple.com/ns/ical/}refreshrate'                      => 'refreshrate',
+		'{http://apple.com/ns/ical/}calendar-order'                   => 'calendarorder',
+		'{http://apple.com/ns/ical/}calendar-color'                   => 'calendarcolor',
+		'{http://calendarserver.org/ns/}subscribed-strip-todos'       => 'striptodos',
+		'{http://calendarserver.org/ns/}subscribed-strip-alarms'      => 'stripalarms',
+		'{http://calendarserver.org/ns/}subscribed-strip-attachments' => 'stripattachments',
+	];
+
+	/**
+	 * Creates the backend
+	 *
+	 * @param \PDO $pdo
+	 */
+	public function __construct(\PDO $pdo) {
+
+		$this->pdo = $pdo;
+
+	}
+
+	/**
+	 * 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. This is just the 'base uri' or 'filename' of the calendar.
+	 *  * 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\Xml\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) {
+
+		$fields = array_values($this->propertyMap);
+		$fields[] = 'id';
+		$fields[] = 'uri';
+		$fields[] = 'synctoken';
+		$fields[] = 'components';
+		$fields[] = 'principaluri';
+		$fields[] = 'transparent';
+
+		// Making fields a comma-delimited list
+		$fields = implode(', ', $fields);
 				$stmt = $this->pdo->prepare(
 <<<SQL
 		SELECT $fields FROM {$this->calendarTableName}
 		WHERE principaluri = ? ORDER BY calendarorder ASC
 SQL
 		);
-        $stmt->execute([$principalUri]);
-
-        $calendars = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-            $components = [];
-            if ($row['components']) {
-                $components = explode(',', $row['components']);
-            }
-
-            $calendar = [
-                'id'                                                                 => $row['id'],
-                'uri'                                                                => $row['uri'],
-                'principaluri'                                                       => $row['principaluri'],
-                '{' . CalDAV\Plugin::NS_CALENDARSERVER . '}getctag'                  => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ? $row['synctoken'] : '0'),
-                '{http://sabredav.org/ns}sync-token'                                 => $row['synctoken'] ? $row['synctoken'] : '0',
-                '{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet($components),
-                '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp'         => new CalDAV\Xml\Property\ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
-            ];
-
-
-            foreach ($this->propertyMap as $xmlName => $dbName) {
-                $calendar[$xmlName] = $row[$dbName];
-            }
-
-            $calendars[] = $calendar;
-
-        }
-
-        return $calendars;
-
-    }
-
-    /**
-     * 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.
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     * @return string
-     */
-    public function createCalendar($principalUri, $calendarUri, array $properties) {
-
-        $fieldNames = [
-            'principaluri',
-            'uri',
-            'synctoken',
-            'transparent',
-        ];
-        $values = [
-            ':principaluri' => $principalUri,
-            ':uri'          => $calendarUri,
-            ':synctoken'    => 1,
-            ':transparent'  => 0,
-        ];
-
-        // Default value
-        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-        $fieldNames[] = 'components';
-        if (!isset($properties[$sccs])) {
-            $values[':components'] = 'VEVENT,VTODO';
-        } else {
-            if (!($properties[$sccs] instanceof CalDAV\Xml\Property\SupportedCalendarComponentSet)) {
-                throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet');
-            }
-            $values[':components'] = implode(',', $properties[$sccs]->getValue());
-        }
-        $transp = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
-        if (isset($properties[$transp])) {
-            $values[':transparent'] = $properties[$transp]->getValue() === 'transparent';
-        }
-
-        foreach ($this->propertyMap as $xmlName => $dbName) {
-            if (isset($properties[$xmlName])) {
-
-                $values[':' . $dbName] = $properties[$xmlName];
-                $fieldNames[] = $dbName;
-            }
-        }
-
-        $stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
-        $stmt->execute($values);
-
-        return $this->pdo->lastInsertId();
-
-    }
-
-    /**
-     * 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 documenation for more info and examples.
-     *
-     * @param string $calendarId
-     * @param \Sabre\DAV\PropPatch $propPatch
-     * @return void
-     */
-    public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch) {
-
-        $supportedProperties = array_keys($this->propertyMap);
-        $supportedProperties[] = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
-
-        $propPatch->handle($supportedProperties, function($mutations) use ($calendarId) {
-            $newValues = [];
-            foreach ($mutations as $propertyName => $propertyValue) {
-
-                switch ($propertyName) {
-                    case '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp' :
-                        $fieldName = 'transparent';
-                        $newValues[$fieldName] = $propertyValue->getValue() === 'transparent';
-                        break;
-                    default :
-                        $fieldName = $this->propertyMap[$propertyName];
-                        $newValues[$fieldName] = $propertyValue;
-                        break;
-                }
-
-            }
-            $valuesSql = [];
-            foreach ($newValues as $fieldName => $value) {
-                $valuesSql[] = $fieldName . ' = ?';
-            }
+		$stmt->execute([$principalUri]);
+
+		$calendars = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+			$components = [];
+			if ($row['components']) {
+				$components = explode(',', $row['components']);
+			}
+
+			$calendar = [
+				'id'                                                                 => $row['id'],
+				'uri'                                                                => $row['uri'],
+				'principaluri'                                                       => $row['principaluri'],
+				'{' . CalDAV\Plugin::NS_CALENDARSERVER . '}getctag'                  => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ? $row['synctoken'] : '0'),
+				'{http://sabredav.org/ns}sync-token'                                 => $row['synctoken'] ? $row['synctoken'] : '0',
+				'{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet($components),
+				'{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp'         => new CalDAV\Xml\Property\ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
+			];
+
+
+			foreach ($this->propertyMap as $xmlName => $dbName) {
+				$calendar[$xmlName] = $row[$dbName];
+			}
+
+			$calendars[] = $calendar;
+
+		}
+
+		return $calendars;
+
+	}
+
+	/**
+	 * 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.
+	 *
+	 * @param string $principalUri
+	 * @param string $calendarUri
+	 * @param array $properties
+	 * @return string
+	 */
+	public function createCalendar($principalUri, $calendarUri, array $properties) {
+
+		$fieldNames = [
+			'principaluri',
+			'uri',
+			'synctoken',
+			'transparent',
+		];
+		$values = [
+			':principaluri' => $principalUri,
+			':uri'          => $calendarUri,
+			':synctoken'    => 1,
+			':transparent'  => 0,
+		];
+
+		// Default value
+		$sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+		$fieldNames[] = 'components';
+		if (!isset($properties[$sccs])) {
+			$values[':components'] = 'VEVENT,VTODO';
+		} else {
+			if (!($properties[$sccs] instanceof CalDAV\Xml\Property\SupportedCalendarComponentSet)) {
+				throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet');
+			}
+			$values[':components'] = implode(',', $properties[$sccs]->getValue());
+		}
+		$transp = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
+		if (isset($properties[$transp])) {
+			$values[':transparent'] = $properties[$transp]->getValue() === 'transparent';
+		}
+
+		foreach ($this->propertyMap as $xmlName => $dbName) {
+			if (isset($properties[$xmlName])) {
+
+				$values[':' . $dbName] = $properties[$xmlName];
+				$fieldNames[] = $dbName;
+			}
+		}
+
+		$stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
+		$stmt->execute($values);
+
+		return $this->pdo->lastInsertId();
+
+	}
+
+	/**
+	 * 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 documenation for more info and examples.
+	 *
+	 * @param string $calendarId
+	 * @param \Sabre\DAV\PropPatch $propPatch
+	 * @return void
+	 */
+	public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch) {
+
+		$supportedProperties = array_keys($this->propertyMap);
+		$supportedProperties[] = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
+
+		$propPatch->handle($supportedProperties, function($mutations) use ($calendarId) {
+			$newValues = [];
+			foreach ($mutations as $propertyName => $propertyValue) {
+
+				switch ($propertyName) {
+					case '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp' :
+						$fieldName = 'transparent';
+						$newValues[$fieldName] = $propertyValue->getValue() === 'transparent';
+						break;
+					default :
+						$fieldName = $this->propertyMap[$propertyName];
+						$newValues[$fieldName] = $propertyValue;
+						break;
+				}
+
+			}
+			$valuesSql = [];
+			foreach ($newValues as $fieldName => $value) {
+				$valuesSql[] = $fieldName . ' = ?';
+			}
 			$query = sprintf('UPDATE %s SET %s WHERE id = ?', $this->calendarTableName, implode(', ', $valuesSql));
-            $stmt = $this->pdo->prepare($query);
-            $newValues['id'] = $calendarId;
-            $stmt->execute(array_values($newValues));
+			$stmt = $this->pdo->prepare($query);
+			$newValues['id'] = $calendarId;
+			$stmt->execute(array_values($newValues));
 
-            $this->addChange($calendarId, "", 2);
+			$this->addChange($calendarId, "", 2);
 
-            return true;
+			return true;
 
-        });
+		});
 
-    }
+	}
 
-    /**
-     * Delete a calendar and all it's objects
-     *
-     * @param string $calendarId
-     * @return void
-     */
-    public function deleteCalendar($calendarId) {
+	/**
+	 * Delete a calendar and all it's objects
+	 *
+	 * @param string $calendarId
+	 * @return void
+	 */
+	public function deleteCalendar($calendarId) {
 
 		$query = sprintf('DELETE FROM %s WHERE calendarid = ?', $this->calendarObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId]);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarId]);
 
 		$query = sprintf('DELETE FROM %s WHERE id = ?', $this->calendarTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId]);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarId]);
 
-        $query = sprintf('DELETE FROM %s WHERE calendarid = ?', $this->calendarChangesTableName);
+		$query = sprintf('DELETE FROM %s WHERE calendarid = ?', $this->calendarChangesTableName);
 		$stmt = $this->pdo->prepare($query);
-        $stmt->execute([$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 string $calendarId
-     * @return array
-     */
-    public function getCalendarObjects($calendarId) {
+		$stmt->execute([$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 string $calendarId
+	 * @return array
+	 */
+	public function getCalendarObjects($calendarId) {
 		
 		$query = sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, componenttype FROM %s WHERE calendarid = ?', $this->calendarObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId]);
-
-        $result = [];
-        foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-            $result[] = [
-                'id'           => $row['id'],
-                'uri'          => $row['uri'],
-                'lastmodified' => $row['lastmodified'],
-                'etag'         => '"' . $row['etag'] . '"',
-                'calendarid'   => $row['calendarid'],
-                'size'         => (int)$row['size'],
-                'component'    => strtolower($row['componenttype']),
-            ];
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * 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 string $calendarId
-     * @param string $objectUri
-     * @return array|null
-     */
-    public function getCalendarObject($calendarId, $objectUri) {
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarId]);
+
+		$result = [];
+		foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+			$result[] = [
+				'id'           => $row['id'],
+				'uri'          => $row['uri'],
+				'lastmodified' => $row['lastmodified'],
+				'etag'         => '"' . $row['etag'] . '"',
+				'calendarid'   => $row['calendarid'],
+				'size'         => (int)$row['size'],
+				'component'    => strtolower($row['componenttype']),
+			];
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * 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 string $calendarId
+	 * @param string $objectUri
+	 * @return array|null
+	 */
+	public function getCalendarObject($calendarId, $objectUri) {
 		
 		$query = sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM %s WHERE calendarid = ? && uri = ?', $this->calendarObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId, $objectUri]);
-        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-        if (!$row) return null;
-
-        return [
-            'id'            => $row['id'],
-            'uri'           => $row['uri'],
-            'lastmodified'  => $row['lastmodified'],
-            'etag'          => '"' . $row['etag'] . '"',
-            'calendarid'    => $row['calendarid'],
-            'size'          => (int)$row['size'],
-            'calendardata'  => $row['calendardata'],
-            'component'     => strtolower($row['componenttype']),
-         ];
-
-    }
-
-    /**
-     * 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
-     * @param array $uris
-     * @return array
-     */
-    public function getMultipleCalendarObjects($calendarId, array $uris) {
-
-        $query =sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM %s WHERE calendarid = ? && uri IN (', $this->calendarObjectTableName);
-        // Inserting a whole bunch of question marks
-        $query .= implode(',', array_fill(0, count($uris), '?'));
-        $query .= ')';
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute(array_merge([$calendarId], $uris));
-
-        $result = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-            $result[] = [
-                'id'           => $row['id'],
-                'uri'          => $row['uri'],
-                'lastmodified' => $row['lastmodified'],
-                'etag'         => '"' . $row['etag'] . '"',
-                'calendarid'   => $row['calendarid'],
-                'size'         => (int)$row['size'],
-                'calendardata' => $row['calendardata'],
-                'component'    => strtolower($row['componenttype']),
-            ];
-
-        }
-        return $result;
-
-    }
-
-
-    /**
-     * Creates a new calendar object.
-     *
-     * 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 createCalendarObject($calendarId, $objectUri, $calendarData) {
-
-        $extraData = $this->getDenormalizedData($calendarData);
-
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->calendarObjectTableName . ' (calendarid, uri, calendardata, lastmodified, etag, size, componenttype, firstoccurence, lastoccurence, uid) VALUES (?,?,?,?,?,?,?,?,?,?)');
-        $stmt->execute([
-            $calendarId,
-            $objectUri,
-            $calendarData,
-            time(),
-            $extraData['etag'],
-            $extraData['size'],
-            $extraData['componentType'],
-            $extraData['firstOccurence'],
-            $extraData['lastOccurence'],
-            $extraData['uid'],
-        ]);
-        $this->addChange($calendarId, $objectUri, 1);
-
-        return '"' . $extraData['etag'] . '"';
-
-    }
-
-    /**
-     * 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) {
-
-        $extraData = $this->getDenormalizedData($calendarData);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarId, $objectUri]);
+		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+		if (!$row) return null;
+
+		return [
+			'id'            => $row['id'],
+			'uri'           => $row['uri'],
+			'lastmodified'  => $row['lastmodified'],
+			'etag'          => '"' . $row['etag'] . '"',
+			'calendarid'    => $row['calendarid'],
+			'size'          => (int)$row['size'],
+			'calendardata'  => $row['calendardata'],
+			'component'     => strtolower($row['componenttype']),
+		 ];
+
+	}
+
+	/**
+	 * 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
+	 * @param array $uris
+	 * @return array
+	 */
+	public function getMultipleCalendarObjects($calendarId, array $uris) {
+
+		$query =sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM %s WHERE calendarid = ? && uri IN (', $this->calendarObjectTableName);
+		// Inserting a whole bunch of question marks
+		$query .= implode(',', array_fill(0, count($uris), '?'));
+		$query .= ')';
+
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute(array_merge([$calendarId], $uris));
+
+		$result = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+			$result[] = [
+				'id'           => $row['id'],
+				'uri'          => $row['uri'],
+				'lastmodified' => $row['lastmodified'],
+				'etag'         => '"' . $row['etag'] . '"',
+				'calendarid'   => $row['calendarid'],
+				'size'         => (int)$row['size'],
+				'calendardata' => $row['calendardata'],
+				'component'    => strtolower($row['componenttype']),
+			];
+
+		}
+		return $result;
+
+	}
+
+
+	/**
+	 * Creates a new calendar object.
+	 *
+	 * 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 createCalendarObject($calendarId, $objectUri, $calendarData) {
+
+		$extraData = $this->getDenormalizedData($calendarData);
+
+		$stmt = $this->pdo->prepare('INSERT INTO ' . $this->calendarObjectTableName . ' (calendarid, uri, calendardata, lastmodified, etag, size, componenttype, firstoccurence, lastoccurence, uid) VALUES (?,?,?,?,?,?,?,?,?,?)');
+		$stmt->execute([
+			$calendarId,
+			$objectUri,
+			$calendarData,
+			time(),
+			$extraData['etag'],
+			$extraData['size'],
+			$extraData['componentType'],
+			$extraData['firstOccurence'],
+			$extraData['lastOccurence'],
+			$extraData['uid'],
+		]);
+		$this->addChange($calendarId, $objectUri, 1);
+
+		return '"' . $extraData['etag'] . '"';
+
+	}
+
+	/**
+	 * 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) {
+
+		$extraData = $this->getDenormalizedData($calendarData);
 		$query = sprintf('UPDATE %s SET calendardata = ?, lastmodified = ?, etag = ?, size = ?, componenttype = ?, firstoccurence = ?, lastoccurence = ?, uid = ? WHERE calendarid = ? && uri = ?', $this->calendarObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarData, time(), $extraData['etag'], $extraData['size'], $extraData['componentType'], $extraData['firstOccurence'], $extraData['lastOccurence'], $extraData['uid'], $calendarId, $objectUri]);
-
-        $this->addChange($calendarId, $objectUri, 2);
-
-        return '"' . $extraData['etag'] . '"';
-
-    }
-
-    /**
-     * Parses some information from calendar objects, used for optimized
-     * calendar-queries.
-     *
-     * Returns an array with the following keys:
-     *   * etag - An md5 checksum of the object without the quotes.
-     *   * size - Size of the object in bytes
-     *   * componentType - VEVENT, VTODO or VJOURNAL
-     *   * firstOccurence
-     *   * lastOccurence
-     *   * uid - value of the UID property
-     *
-     * @param string $calendarData
-     * @return array
-     */
-    protected function getDenormalizedData($calendarData) {
-
-        $vObject = VObject\Reader::read($calendarData);
-        $componentType = null;
-        $component = null;
-        $firstOccurence = null;
-        $lastOccurence = null;
-        $uid = null;
-        foreach ($vObject->getComponents() as $component) {
-            if ($component->name !== 'VTIMEZONE') {
-                $componentType = $component->name;
-                $uid = (string)$component->UID;
-                break;
-            }
-        }
-        if (!$componentType) {
-            throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
-        }
-        if ($componentType === 'VEVENT') {
-            $firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp();
-            // Finding the last occurence is a bit harder
-            if (!isset($component->RRULE)) {
-                if (isset($component->DTEND)) {
-                    $lastOccurence = $component->DTEND->getDateTime()->getTimeStamp();
-                } elseif (isset($component->DURATION)) {
-                    $endDate = clone $component->DTSTART->getDateTime();
-                    $endDate = $endDate->add(VObject\DateTimeParser::parse($component->DURATION->getValue()));
-                    $lastOccurence = $endDate->getTimeStamp();
-                } elseif (!$component->DTSTART->hasTime()) {
-                    $endDate = clone $component->DTSTART->getDateTime();
-                    $endDate = $endDate->modify('+1 day');
-                    $lastOccurence = $endDate->getTimeStamp();
-                } else {
-                    $lastOccurence = $firstOccurence;
-                }
-            } else {
-                $it = new VObject\Recur\EventIterator($vObject, (string)$component->UID);
-                $maxDate = new \DateTime(self::MAX_DATE);
-                if ($it->isInfinite()) {
-                    $lastOccurence = $maxDate->getTimeStamp();
-                } else {
-                    $end = $it->getDtEnd();
-                    while ($it->valid() && $end < $maxDate) {
-                        $end = $it->getDtEnd();
-                        $it->next();
-
-                    }
-                    $lastOccurence = $end->getTimeStamp();
-                }
-
-            }
-        }
-
-        // Destroy circular references to PHP will GC the object.
-        $vObject->destroy();
-
-        return [
-            'etag'           => md5($calendarData),
-            'size'           => strlen($calendarData),
-            'componentType'  => $componentType,
-            'firstOccurence' => $firstOccurence,
-            'lastOccurence'  => $lastOccurence,
-            'uid'            => $uid,
-        ];
-
-    }
-
-    /**
-     * Deletes an existing calendar object.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return void
-     */
-    public function deleteCalendarObject($calendarId, $objectUri) {
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarData, time(), $extraData['etag'], $extraData['size'], $extraData['componentType'], $extraData['firstOccurence'], $extraData['lastOccurence'], $extraData['uid'], $calendarId, $objectUri]);
+
+		$this->addChange($calendarId, $objectUri, 2);
+
+		return '"' . $extraData['etag'] . '"';
+
+	}
+
+	/**
+	 * Parses some information from calendar objects, used for optimized
+	 * calendar-queries.
+	 *
+	 * Returns an array with the following keys:
+	 *   * etag - An md5 checksum of the object without the quotes.
+	 *   * size - Size of the object in bytes
+	 *   * componentType - VEVENT, VTODO or VJOURNAL
+	 *   * firstOccurence
+	 *   * lastOccurence
+	 *   * uid - value of the UID property
+	 *
+	 * @param string $calendarData
+	 * @return array
+	 */
+	protected function getDenormalizedData($calendarData) {
+
+		$vObject = VObject\Reader::read($calendarData);
+		$componentType = null;
+		$component = null;
+		$firstOccurence = null;
+		$lastOccurence = null;
+		$uid = null;
+		foreach ($vObject->getComponents() as $component) {
+			if ($component->name !== 'VTIMEZONE') {
+				$componentType = $component->name;
+				$uid = (string)$component->UID;
+				break;
+			}
+		}
+		if (!$componentType) {
+			throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
+		}
+		if ($componentType === 'VEVENT') {
+			$firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp();
+			// Finding the last occurence is a bit harder
+			if (!isset($component->RRULE)) {
+				if (isset($component->DTEND)) {
+					$lastOccurence = $component->DTEND->getDateTime()->getTimeStamp();
+				} elseif (isset($component->DURATION)) {
+					$endDate = clone $component->DTSTART->getDateTime();
+					$endDate = $endDate->add(VObject\DateTimeParser::parse($component->DURATION->getValue()));
+					$lastOccurence = $endDate->getTimeStamp();
+				} elseif (!$component->DTSTART->hasTime()) {
+					$endDate = clone $component->DTSTART->getDateTime();
+					$endDate = $endDate->modify('+1 day');
+					$lastOccurence = $endDate->getTimeStamp();
+				} else {
+					$lastOccurence = $firstOccurence;
+				}
+			} else {
+				$it = new VObject\Recur\EventIterator($vObject, (string)$component->UID);
+				$maxDate = new \DateTime(self::MAX_DATE);
+				if ($it->isInfinite()) {
+					$lastOccurence = $maxDate->getTimeStamp();
+				} else {
+					$end = $it->getDtEnd();
+					while ($it->valid() && $end < $maxDate) {
+						$end = $it->getDtEnd();
+						$it->next();
+
+					}
+					$lastOccurence = $end->getTimeStamp();
+				}
+
+			}
+		}
+
+		// Destroy circular references to PHP will GC the object.
+		$vObject->destroy();
+
+		return [
+			'etag'           => md5($calendarData),
+			'size'           => strlen($calendarData),
+			'componentType'  => $componentType,
+			'firstOccurence' => $firstOccurence,
+			'lastOccurence'  => $lastOccurence,
+			'uid'            => $uid,
+		];
+
+	}
+
+	/**
+	 * Deletes an existing calendar object.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * @param string $calendarId
+	 * @param string $objectUri
+	 * @return void
+	 */
+	public function deleteCalendarObject($calendarId, $objectUri) {
 
 		$query = sprintf('DELETE FROM %s WHERE calendarid = ? && uri = ?', $this->calendarObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$calendarId, $objectUri]);
-
-        $this->addChange($calendarId, $objectUri, 3);
-
-    }
-
-    /**
-     * 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 a VEVENT.
-     *
-     * ..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.
-     *
-     * This specific implementation (for the PDO) backend optimizes filters on
-     * specific components, and VEVENT time-ranges.
-     *
-     * @param string $calendarId
-     * @param array $filters
-     * @return array
-     */
-    public function calendarQuery($calendarId, array $filters) {
-
-        $componentType = null;
-        $requirePostFilter = true;
-        $timeRange = null;
-
-        // if no filters were specified, we don't need to filter after a query
-        if (!$filters['prop-filters'] && !$filters['comp-filters']) {
-            $requirePostFilter = false;
-        }
-
-        // Figuring out if there's a component filter
-        if (count($filters['comp-filters']) > 0 && !$filters['comp-filters'][0]['is-not-defined']) {
-            $componentType = $filters['comp-filters'][0]['name'];
-
-            // Checking if we need post-filters
-            if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['time-range'] && !$filters['comp-filters'][0]['prop-filters']) {
-                $requirePostFilter = false;
-            }
-            // There was a time-range filter
-            if ($componentType == 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
-                $timeRange = $filters['comp-filters'][0]['time-range'];
-
-                // If start time OR the end time is not specified, we can do a
-                // 100% accurate mysql query.
-                if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['prop-filters'] && (!$timeRange['start'] || !$timeRange['end'])) {
-                    $requirePostFilter = false;
-                }
-            }
-
-        }
-
-        if ($requirePostFilter) {
-            $query = sprintf("SELECT uri, calendardata FROM %s WHERE calendarid = :calendarid", $this->calendarObjectTableName);
-        } else {
-            $query = sprintf("SELECT uri FROM %s WHERE calendarid = :calendarid", $this->calendarObjectTableName);
-        }
-
-        $values = [
-            'calendarid' => $calendarId,
-        ];
-
-        if ($componentType) {
-            $query .= " && componenttype = :componenttype";
-            $values['componenttype'] = $componentType;
-        }
-
-        if ($timeRange && $timeRange['start']) {
-            $query .= " && lastoccurence > :startdate";
-            $values['startdate'] = $timeRange['start']->getTimeStamp();
-        }
-        if ($timeRange && $timeRange['end']) {
-            $query .= " && firstoccurence < :enddate";
-            $values['enddate'] = $timeRange['end']->getTimeStamp();
-        }
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-        $result = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            if ($requirePostFilter) {
-                if (!$this->validateFilterForObject($row, $filters)) {
-                    continue;
-                }
-            }
-            $result[] = $row['uri'];
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * 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) {
-
-        $query = <<<SQL
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$calendarId, $objectUri]);
+
+		$this->addChange($calendarId, $objectUri, 3);
+
+	}
+
+	/**
+	 * 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 a VEVENT.
+	 *
+	 * ..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.
+	 *
+	 * This specific implementation (for the PDO) backend optimizes filters on
+	 * specific components, and VEVENT time-ranges.
+	 *
+	 * @param string $calendarId
+	 * @param array $filters
+	 * @return array
+	 */
+	public function calendarQuery($calendarId, array $filters) {
+
+		$componentType = null;
+		$requirePostFilter = true;
+		$timeRange = null;
+
+		// if no filters were specified, we don't need to filter after a query
+		if (!$filters['prop-filters'] && !$filters['comp-filters']) {
+			$requirePostFilter = false;
+		}
+
+		// Figuring out if there's a component filter
+		if (count($filters['comp-filters']) > 0 && !$filters['comp-filters'][0]['is-not-defined']) {
+			$componentType = $filters['comp-filters'][0]['name'];
+
+			// Checking if we need post-filters
+			if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['time-range'] && !$filters['comp-filters'][0]['prop-filters']) {
+				$requirePostFilter = false;
+			}
+			// There was a time-range filter
+			if ($componentType == 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
+				$timeRange = $filters['comp-filters'][0]['time-range'];
+
+				// If start time OR the end time is not specified, we can do a
+				// 100% accurate mysql query.
+				if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['prop-filters'] && (!$timeRange['start'] || !$timeRange['end'])) {
+					$requirePostFilter = false;
+				}
+			}
+
+		}
+
+		if ($requirePostFilter) {
+			$query = sprintf("SELECT uri, calendardata FROM %s WHERE calendarid = :calendarid", $this->calendarObjectTableName);
+		} else {
+			$query = sprintf("SELECT uri FROM %s WHERE calendarid = :calendarid", $this->calendarObjectTableName);
+		}
+
+		$values = [
+			'calendarid' => $calendarId,
+		];
+
+		if ($componentType) {
+			$query .= " && componenttype = :componenttype";
+			$values['componenttype'] = $componentType;
+		}
+
+		if ($timeRange && $timeRange['start']) {
+			$query .= " && lastoccurence > :startdate";
+			$values['startdate'] = $timeRange['start']->getTimeStamp();
+		}
+		if ($timeRange && $timeRange['end']) {
+			$query .= " && firstoccurence < :enddate";
+			$values['enddate'] = $timeRange['end']->getTimeStamp();
+		}
+
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute($values);
+
+		$result = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			if ($requirePostFilter) {
+				if (!$this->validateFilterForObject($row, $filters)) {
+					continue;
+				}
+			}
+			$result[] = $row['uri'];
+
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * 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) {
+
+		$query = <<<SQL
 SELECT
     calendars.uri AS calendaruri, calendarobjects.uri as objecturi
 FROM
@@ -789,439 +789,439 @@ 
     calendarobjects.uid = ?
 SQL;
 
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principalUri, $uid]);
-
-        if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            return $row['calendaruri'] . '/' . $row['objecturi'];
-        }
-
-    }
-
-    /**
-     * The getChanges method returns all the changes that have happened, since
-     * the specified syncToken in the specified calendar.
-     *
-     * This function should return an array, such as the following:
-     *
-     * [
-     *   'syncToken' => 'The current synctoken',
-     *   'added'   => [
-     *      'new.txt',
-     *   ],
-     *   'modified'   => [
-     *      'modified.txt',
-     *   ],
-     *   'deleted' => [
-     *      'foo.php.bak',
-     *      'old.txt'
-     *   ]
-     * ];
-     *
-     * The returned syncToken property should reflect the *current* syncToken
-     * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
-     * property this is needed here too, to ensure the operation is atomic.
-     *
-     * If the $syncToken argument is specified as null, this is an initial
-     * sync, and all members should be reported.
-     *
-     * The modified property is an array of nodenames that have changed since
-     * the last token.
-     *
-     * The deleted property is an array with nodenames, that have been deleted
-     * from collection.
-     *
-     * The $syncLevel argument is basically the 'depth' of the report. If it's
-     * 1, you only have to report changes that happened only directly in
-     * immediate descendants. If it's 2, it should also include changes from
-     * the nodes below the child collections. (grandchildren)
-     *
-     * The $limit argument allows a client to specify how many results should
-     * be returned at most. If the limit is not specified, it should be treated
-     * as infinite.
-     *
-     * If the limit (infinite or not) is higher than you're willing to return,
-     * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
-     *
-     * If the syncToken is expired (due to data cleanup) or unknown, you must
-     * return null.
-     *
-     * The limit is 'suggestive'. You are free to ignore it.
-     *
-     * @param string $calendarId
-     * @param string $syncToken
-     * @param int $syncLevel
-     * @param int $limit
-     * @return array
-     */
-    public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
-
-        // Current synctoken
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$principalUri, $uid]);
+
+		if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			return $row['calendaruri'] . '/' . $row['objecturi'];
+		}
+
+	}
+
+	/**
+	 * The getChanges method returns all the changes that have happened, since
+	 * the specified syncToken in the specified calendar.
+	 *
+	 * This function should return an array, such as the following:
+	 *
+	 * [
+	 *   'syncToken' => 'The current synctoken',
+	 *   'added'   => [
+	 *      'new.txt',
+	 *   ],
+	 *   'modified'   => [
+	 *      'modified.txt',
+	 *   ],
+	 *   'deleted' => [
+	 *      'foo.php.bak',
+	 *      'old.txt'
+	 *   ]
+	 * ];
+	 *
+	 * The returned syncToken property should reflect the *current* syncToken
+	 * of the calendar, as reported in the {http://sabredav.org/ns}sync-token
+	 * property this is needed here too, to ensure the operation is atomic.
+	 *
+	 * If the $syncToken argument is specified as null, this is an initial
+	 * sync, and all members should be reported.
+	 *
+	 * The modified property is an array of nodenames that have changed since
+	 * the last token.
+	 *
+	 * The deleted property is an array with nodenames, that have been deleted
+	 * from collection.
+	 *
+	 * The $syncLevel argument is basically the 'depth' of the report. If it's
+	 * 1, you only have to report changes that happened only directly in
+	 * immediate descendants. If it's 2, it should also include changes from
+	 * the nodes below the child collections. (grandchildren)
+	 *
+	 * The $limit argument allows a client to specify how many results should
+	 * be returned at most. If the limit is not specified, it should be treated
+	 * as infinite.
+	 *
+	 * If the limit (infinite or not) is higher than you're willing to return,
+	 * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
+	 *
+	 * If the syncToken is expired (due to data cleanup) or unknown, you must
+	 * return null.
+	 *
+	 * The limit is 'suggestive'. You are free to ignore it.
+	 *
+	 * @param string $calendarId
+	 * @param string $syncToken
+	 * @param int $syncLevel
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
+
+		// Current synctoken
 		$query = sprintf('SELECT synctoken FROM %s WHERE id = ?', $this->calendarTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([ $calendarId ]);
-        $currentToken = $stmt->fetchColumn(0);
-
-        if (is_null($currentToken)) return null;
-
-        $result = [
-            'syncToken' => $currentToken,
-            'added'     => [],
-            'modified'  => [],
-            'deleted'   => [],
-        ];
-
-        if ($syncToken) {
-
-            $query = sprintf('SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && calendarid = ? ORDER BY synctoken', $this->calendarChangesTableName);
-            if ($limit > 0) $query .= " LIMIT " . (int)$limit;
-
-            // Fetching all changes
-            $stmt = $this->pdo->prepare($query);
-            $stmt->execute([$syncToken, $currentToken, $calendarId]);
-
-            $changes = [];
-
-            // This loop ensures that any duplicates are overwritten, only the
-            // last change on a node is relevant.
-            while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-                $changes[$row['uri']] = $row['operation'];
-
-            }
-
-            foreach ($changes as $uri => $operation) {
-
-                switch ($operation) {
-                    case 1 :
-                        $result['added'][] = $uri;
-                        break;
-                    case 2 :
-                        $result['modified'][] = $uri;
-                        break;
-                    case 3 :
-                        $result['deleted'][] = $uri;
-                        break;
-                }
-
-            }
-        } else {
-            // No synctoken supplied, this is the initial sync.
-            $query = sprintf('SELECT uri FROM %s WHERE calendarid = ?', $this->calendarObjectTableName);
-            $stmt = $this->pdo->prepare($query);
-            $stmt->execute([$calendarId]);
-
-            $result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
-        }
-        return $result;
-
-    }
-
-    /**
-     * Adds a change record to the calendarchanges table.
-     *
-     * @param mixed $calendarId
-     * @param string $objectUri
-     * @param int $operation 1 = add, 2 = modify, 3 = delete.
-     * @return void
-     */
-    protected function addChange($calendarId, $objectUri, $operation) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->calendarChangesTableName . ' (uri, synctoken, calendarid, operation) SELECT ?, synctoken, ?, ? FROM ' . $this->calendarTableName . ' WHERE id = ?');
-        $stmt->execute([
-            $objectUri,
-            $calendarId,
-            $operation,
-            $calendarId
-        ]);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([ $calendarId ]);
+		$currentToken = $stmt->fetchColumn(0);
+
+		if (is_null($currentToken)) return null;
+
+		$result = [
+			'syncToken' => $currentToken,
+			'added'     => [],
+			'modified'  => [],
+			'deleted'   => [],
+		];
+
+		if ($syncToken) {
+
+			$query = sprintf('SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && calendarid = ? ORDER BY synctoken', $this->calendarChangesTableName);
+			if ($limit > 0) $query .= " LIMIT " . (int)$limit;
+
+			// Fetching all changes
+			$stmt = $this->pdo->prepare($query);
+			$stmt->execute([$syncToken, $currentToken, $calendarId]);
+
+			$changes = [];
+
+			// This loop ensures that any duplicates are overwritten, only the
+			// last change on a node is relevant.
+			while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+				$changes[$row['uri']] = $row['operation'];
+
+			}
+
+			foreach ($changes as $uri => $operation) {
+
+				switch ($operation) {
+					case 1 :
+						$result['added'][] = $uri;
+						break;
+					case 2 :
+						$result['modified'][] = $uri;
+						break;
+					case 3 :
+						$result['deleted'][] = $uri;
+						break;
+				}
+
+			}
+		} else {
+			// No synctoken supplied, this is the initial sync.
+			$query = sprintf('SELECT uri FROM %s WHERE calendarid = ?', $this->calendarObjectTableName);
+			$stmt = $this->pdo->prepare($query);
+			$stmt->execute([$calendarId]);
+
+			$result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Adds a change record to the calendarchanges table.
+	 *
+	 * @param mixed $calendarId
+	 * @param string $objectUri
+	 * @param int $operation 1 = add, 2 = modify, 3 = delete.
+	 * @return void
+	 */
+	protected function addChange($calendarId, $objectUri, $operation) {
+
+		$stmt = $this->pdo->prepare('INSERT INTO ' . $this->calendarChangesTableName . ' (uri, synctoken, calendarid, operation) SELECT ?, synctoken, ?, ? FROM ' . $this->calendarTableName . ' WHERE id = ?');
+		$stmt->execute([
+			$objectUri,
+			$calendarId,
+			$operation,
+			$calendarId
+		]);
 		$query = sprintf('UPDATE %s SET synctoken = synctoken + 1 WHERE id = ?', $this->calendarTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([
-            $calendarId
-        ]);
-
-    }
-
-    /**
-     * Returns a list of subscriptions for a principal.
-     *
-     * Every subscription is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    subscription. This can be the same as the uri or a database key.
-     *  * uri. This is just the 'base uri' or 'filename' of the subscription.
-     *  * principaluri. The owner of the subscription. Almost always the same as
-     *    principalUri passed to this method.
-     *  * source. Url to the actual feed
-     *
-     * Furthermore, all the subscription info must be returned too:
-     *
-     * 1. {DAV:}displayname
-     * 2. {http://apple.com/ns/ical/}refreshrate
-     * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
-     *    should not be stripped).
-     * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
-     *    should not be stripped).
-     * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
-     *    attachments should not be stripped).
-     * 7. {http://apple.com/ns/ical/}calendar-color
-     * 8. {http://apple.com/ns/ical/}calendar-order
-     * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-     *    (should just be an instance of
-     *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
-     *    default components).
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getSubscriptionsForUser($principalUri) {
-
-        $fields = array_values($this->subscriptionPropertyMap);
-        $fields[] = 'id';
-        $fields[] = 'uri';
-        $fields[] = 'source';
-        $fields[] = 'principaluri';
-        $fields[] = 'lastmodified';
-
-        // Making fields a comma-delimited list
-        $fields = implode(', ', $fields);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([
+			$calendarId
+		]);
+
+	}
+
+	/**
+	 * Returns a list of subscriptions for a principal.
+	 *
+	 * Every subscription is an array with the following keys:
+	 *  * id, a unique id that will be used by other functions to modify the
+	 *    subscription. This can be the same as the uri or a database key.
+	 *  * uri. This is just the 'base uri' or 'filename' of the subscription.
+	 *  * principaluri. The owner of the subscription. Almost always the same as
+	 *    principalUri passed to this method.
+	 *  * source. Url to the actual feed
+	 *
+	 * Furthermore, all the subscription info must be returned too:
+	 *
+	 * 1. {DAV:}displayname
+	 * 2. {http://apple.com/ns/ical/}refreshrate
+	 * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
+	 *    should not be stripped).
+	 * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
+	 *    should not be stripped).
+	 * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
+	 *    attachments should not be stripped).
+	 * 7. {http://apple.com/ns/ical/}calendar-color
+	 * 8. {http://apple.com/ns/ical/}calendar-order
+	 * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+	 *    (should just be an instance of
+	 *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
+	 *    default components).
+	 *
+	 * @param string $principalUri
+	 * @return array
+	 */
+	public function getSubscriptionsForUser($principalUri) {
+
+		$fields = array_values($this->subscriptionPropertyMap);
+		$fields[] = 'id';
+		$fields[] = 'uri';
+		$fields[] = 'source';
+		$fields[] = 'principaluri';
+		$fields[] = 'lastmodified';
+
+		// Making fields a comma-delimited list
+		$fields = implode(', ', $fields);
 		$query = sprintf('SELECT %s FROM %s WHERE principaluri = ? ORDER BY calendarorder ASC', $fields, $this->calendarSubscriptionsTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principalUri]);
-
-        $subscriptions = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-            $subscription = [
-                'id'           => $row['id'],
-                'uri'          => $row['uri'],
-                'principaluri' => $row['principaluri'],
-                'source'       => $row['source'],
-                'lastmodified' => $row['lastmodified'],
-
-                '{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
-            ];
-
-            foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
-                if (!is_null($row[$dbName])) {
-                    $subscription[$xmlName] = $row[$dbName];
-                }
-            }
-
-            $subscriptions[] = $subscription;
-
-        }
-
-        return $subscriptions;
-
-    }
-
-    /**
-     * Creates a new subscription for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this subscription in other methods, such as updateSubscription.
-     *
-     * @param string $principalUri
-     * @param string $uri
-     * @param array $properties
-     * @return mixed
-     */
-    public function createSubscription($principalUri, $uri, array $properties) {
-
-        $fieldNames = [
-            'principaluri',
-            'uri',
-            'source',
-            'lastmodified',
-        ];
-
-        if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
-            throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
-        }
-
-        $values = [
-            ':principaluri' => $principalUri,
-            ':uri'          => $uri,
-            ':source'       => $properties['{http://calendarserver.org/ns/}source']->getHref(),
-            ':lastmodified' => time(),
-        ];
-
-        foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
-            if (isset($properties[$xmlName])) {
-
-                $values[':' . $dbName] = $properties[$xmlName];
-                $fieldNames[] = $dbName;
-            }
-        }
-
-        $stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarSubscriptionsTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
-        $stmt->execute($values);
-
-        return $this->pdo->lastInsertId();
-
-    }
-
-    /**
-     * Updates a subscription
-     *
-     * 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 documenation for more info and examples.
-     *
-     * @param mixed $subscriptionId
-     * @param \Sabre\DAV\PropPatch $propPatch
-     * @return void
-     */
-    public function updateSubscription($subscriptionId, DAV\PropPatch $propPatch) {
-
-        $supportedProperties = array_keys($this->subscriptionPropertyMap);
-        $supportedProperties[] = '{http://calendarserver.org/ns/}source';
-
-        $propPatch->handle($supportedProperties, function($mutations) use ($subscriptionId) {
-
-            $newValues = [];
-
-            foreach ($mutations as $propertyName => $propertyValue) {
-
-                if ($propertyName === '{http://calendarserver.org/ns/}source') {
-                    $newValues['source'] = $propertyValue->getHref();
-                } else {
-                    $fieldName = $this->subscriptionPropertyMap[$propertyName];
-                    $newValues[$fieldName] = $propertyValue;
-                }
-
-            }
-
-            // Now we're generating the sql query.
-            $valuesSql = [];
-            foreach ($newValues as $fieldName => $value) {
-                $valuesSql[] = $fieldName . ' = ?';
-            }
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$principalUri]);
+
+		$subscriptions = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+			$subscription = [
+				'id'           => $row['id'],
+				'uri'          => $row['uri'],
+				'principaluri' => $row['principaluri'],
+				'source'       => $row['source'],
+				'lastmodified' => $row['lastmodified'],
+
+				'{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
+			];
+
+			foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
+				if (!is_null($row[$dbName])) {
+					$subscription[$xmlName] = $row[$dbName];
+				}
+			}
+
+			$subscriptions[] = $subscription;
+
+		}
+
+		return $subscriptions;
+
+	}
+
+	/**
+	 * Creates a new subscription for a principal.
+	 *
+	 * If the creation was a success, an id must be returned that can be used to reference
+	 * this subscription in other methods, such as updateSubscription.
+	 *
+	 * @param string $principalUri
+	 * @param string $uri
+	 * @param array $properties
+	 * @return mixed
+	 */
+	public function createSubscription($principalUri, $uri, array $properties) {
+
+		$fieldNames = [
+			'principaluri',
+			'uri',
+			'source',
+			'lastmodified',
+		];
+
+		if (!isset($properties['{http://calendarserver.org/ns/}source'])) {
+			throw new Forbidden('The {http://calendarserver.org/ns/}source property is required when creating subscriptions');
+		}
+
+		$values = [
+			':principaluri' => $principalUri,
+			':uri'          => $uri,
+			':source'       => $properties['{http://calendarserver.org/ns/}source']->getHref(),
+			':lastmodified' => time(),
+		];
+
+		foreach ($this->subscriptionPropertyMap as $xmlName => $dbName) {
+			if (isset($properties[$xmlName])) {
+
+				$values[':' . $dbName] = $properties[$xmlName];
+				$fieldNames[] = $dbName;
+			}
+		}
+
+		$stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarSubscriptionsTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
+		$stmt->execute($values);
+
+		return $this->pdo->lastInsertId();
+
+	}
+
+	/**
+	 * Updates a subscription
+	 *
+	 * 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 documenation for more info and examples.
+	 *
+	 * @param mixed $subscriptionId
+	 * @param \Sabre\DAV\PropPatch $propPatch
+	 * @return void
+	 */
+	public function updateSubscription($subscriptionId, DAV\PropPatch $propPatch) {
+
+		$supportedProperties = array_keys($this->subscriptionPropertyMap);
+		$supportedProperties[] = '{http://calendarserver.org/ns/}source';
+
+		$propPatch->handle($supportedProperties, function($mutations) use ($subscriptionId) {
+
+			$newValues = [];
+
+			foreach ($mutations as $propertyName => $propertyValue) {
+
+				if ($propertyName === '{http://calendarserver.org/ns/}source') {
+					$newValues['source'] = $propertyValue->getHref();
+				} else {
+					$fieldName = $this->subscriptionPropertyMap[$propertyName];
+					$newValues[$fieldName] = $propertyValue;
+				}
+
+			}
+
+			// Now we're generating the sql query.
+			$valuesSql = [];
+			foreach ($newValues as $fieldName => $value) {
+				$valuesSql[] = $fieldName . ' = ?';
+			}
 			$query = sprintf('UPDATE %s SET  %s , lastmodified = ? WHERE id = ?', $this->calendarSubscriptionsTableName, implode(', ', $valuesSql));
-            $stmt = $this->pdo->prepare($query);
-            $newValues['lastmodified'] = time();
-            $newValues['id'] = $subscriptionId;
-            $stmt->execute(array_values($newValues));
+			$stmt = $this->pdo->prepare($query);
+			$newValues['lastmodified'] = time();
+			$newValues['id'] = $subscriptionId;
+			$stmt->execute(array_values($newValues));
 
-            return true;
+			return true;
 
-        });
+		});
 
-    }
+	}
 
-    /**
-     * Deletes a subscription
-     *
-     * @param mixed $subscriptionId
-     * @return void
-     */
-    public function deleteSubscription($subscriptionId) {
+	/**
+	 * Deletes a subscription
+	 *
+	 * @param mixed $subscriptionId
+	 * @return void
+	 */
+	public function deleteSubscription($subscriptionId) {
 		$query = sprintf('DELETE FROM %s WHERE id = ?', $this->calendarSubscriptionsTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$subscriptionId]);
-
-    }
-
-    /**
-     * Returns a single scheduling object.
-     *
-     * The returned array should contain the following elements:
-     *   * uri - A unique basename for the object. This will be used to
-     *           construct a full uri.
-     *   * calendardata - The iCalendar object
-     *   * lastmodified - The last modification date. Can be an int for a unix
-     *                    timestamp, or a PHP DateTime object.
-     *   * etag - A unique token that must change if the object changed.
-     *   * size - The size of the object, in bytes.
-     *
-     * @param string $principalUri
-     * @param string $objectUri
-     * @return array
-     */
-    public function getSchedulingObject($principalUri, $objectUri) {
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$subscriptionId]);
+
+	}
+
+	/**
+	 * Returns a single scheduling object.
+	 *
+	 * The returned array should contain the following elements:
+	 *   * uri - A unique basename for the object. This will be used to
+	 *           construct a full uri.
+	 *   * calendardata - The iCalendar object
+	 *   * lastmodified - The last modification date. Can be an int for a unix
+	 *                    timestamp, or a PHP DateTime object.
+	 *   * etag - A unique token that must change if the object changed.
+	 *   * size - The size of the object, in bytes.
+	 *
+	 * @param string $principalUri
+	 * @param string $objectUri
+	 * @return array
+	 */
+	public function getSchedulingObject($principalUri, $objectUri) {
 		
 		$query = sprintf('SELECT uri, calendardata, lastmodified, etag, size FROM %s WHERE principaluri = ? && uri = ?', $this->schedulingObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principalUri, $objectUri]);
-        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-        if (!$row) return null;
-
-        return [
-            'uri'          => $row['uri'],
-            'calendardata' => $row['calendardata'],
-            'lastmodified' => $row['lastmodified'],
-            'etag'         => '"' . $row['etag'] . '"',
-            'size'         => (int)$row['size'],
-         ];
-
-    }
-
-    /**
-     * Returns all scheduling objects for the inbox collection.
-     *
-     * These objects should be returned as an array. Every item in the array
-     * should follow the same structure as returned from getSchedulingObject.
-     *
-     * The main difference is that 'calendardata' is optional.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getSchedulingObjects($principalUri) {
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$principalUri, $objectUri]);
+		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+		if (!$row) return null;
+
+		return [
+			'uri'          => $row['uri'],
+			'calendardata' => $row['calendardata'],
+			'lastmodified' => $row['lastmodified'],
+			'etag'         => '"' . $row['etag'] . '"',
+			'size'         => (int)$row['size'],
+		 ];
+
+	}
+
+	/**
+	 * Returns all scheduling objects for the inbox collection.
+	 *
+	 * These objects should be returned as an array. Every item in the array
+	 * should follow the same structure as returned from getSchedulingObject.
+	 *
+	 * The main difference is that 'calendardata' is optional.
+	 *
+	 * @param string $principalUri
+	 * @return array
+	 */
+	public function getSchedulingObjects($principalUri) {
 
 		$query = sprintf('SELECT id, calendardata, uri, lastmodified, etag, size FROM %s WHERE principaluri = ?', $this->schedulingObjectTableName);
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principalUri]);
-
-        $result = [];
-        foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-            $result[] = [
-                'calendardata' => $row['calendardata'],
-                'uri'          => $row['uri'],
-                'lastmodified' => $row['lastmodified'],
-                'etag'         => '"' . $row['etag'] . '"',
-                'size'         => (int)$row['size'],
-            ];
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Deletes a scheduling object
-     *
-     * @param string $principalUri
-     * @param string $objectUri
-     * @return void
-     */
-    public function deleteSchedulingObject($principalUri, $objectUri) {
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$principalUri]);
+
+		$result = [];
+		foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+			$result[] = [
+				'calendardata' => $row['calendardata'],
+				'uri'          => $row['uri'],
+				'lastmodified' => $row['lastmodified'],
+				'etag'         => '"' . $row['etag'] . '"',
+				'size'         => (int)$row['size'],
+			];
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * Deletes a scheduling object
+	 *
+	 * @param string $principalUri
+	 * @param string $objectUri
+	 * @return void
+	 */
+	public function deleteSchedulingObject($principalUri, $objectUri) {
 
 		$query = sprintf('DELETE FROM %s WHERE principaluri = ? && uri = ?', $this->schedulingObjectTableName);	
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute([$principalUri, $objectUri]);
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute([$principalUri, $objectUri]);
 
-    }
+	}
 
-    /**
-     * Creates a new scheduling object. This should land in a users' inbox.
-     *
-     * @param string $principalUri
-     * @param string $objectUri
-     * @param string $objectData
-     * @return void
-     */
-    public function createSchedulingObject($principalUri, $objectUri, $objectData) {
+	/**
+	 * Creates a new scheduling object. This should land in a users' inbox.
+	 *
+	 * @param string $principalUri
+	 * @param string $objectUri
+	 * @param string $objectData
+	 * @return void
+	 */
+	public function createSchedulingObject($principalUri, $objectUri, $objectData) {
 
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->schedulingObjectTableName . ' (principaluri, calendardata, uri, lastmodified, etag, size) VALUES (?, ?, ?, ?, ?, ?)');
-        $stmt->execute([$principalUri, $objectData, $objectUri, time(), md5($objectData), strlen($objectData) ]);
+		$stmt = $this->pdo->prepare('INSERT INTO ' . $this->schedulingObjectTableName . ' (principaluri, calendardata, uri, lastmodified, etag, size) VALUES (?, ?, ?, ?, ?, ?)');
+		$stmt->execute([$principalUri, $objectData, $objectUri, time(), md5($objectData), strlen($objectData) ]);
 
-    }
+	}
 
 }

Spacing +11 added lines, -11 removed lines

@@ -366,7 +366,7 @@ 
                 'lastmodified' => $row['lastmodified'],
                 'etag'         => '"' . $row['etag'] . '"',
                 'calendarid'   => $row['calendarid'],
-                'size'         => (int)$row['size'],
+                'size'         => (int) $row['size'],
                 'component'    => strtolower($row['componenttype']),
             ];
         }
@@ -406,7 +406,7 @@ 
             'lastmodified'  => $row['lastmodified'],
             'etag'          => '"' . $row['etag'] . '"',
             'calendarid'    => $row['calendarid'],
-            'size'          => (int)$row['size'],
+            'size'          => (int) $row['size'],
             'calendardata'  => $row['calendardata'],
             'component'     => strtolower($row['componenttype']),
          ];
@@ -427,7 +427,7 @@ 
      */
     public function getMultipleCalendarObjects($calendarId, array $uris) {
 
-        $query =sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM %s WHERE calendarid = ? && uri IN (', $this->calendarObjectTableName);
+        $query = sprintf('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM %s WHERE calendarid = ? && uri IN (', $this->calendarObjectTableName);
         // Inserting a whole bunch of question marks
         $query .= implode(',', array_fill(0, count($uris), '?'));
         $query .= ')';
@@ -444,7 +444,7 @@ 
                 'lastmodified' => $row['lastmodified'],
                 'etag'         => '"' . $row['etag'] . '"',
                 'calendarid'   => $row['calendarid'],
-                'size'         => (int)$row['size'],
+                'size'         => (int) $row['size'],
                 'calendardata' => $row['calendardata'],
                 'component'    => strtolower($row['componenttype']),
             ];
@@ -553,7 +553,7 @@ 
         foreach ($vObject->getComponents() as $component) {
             if ($component->name !== 'VTIMEZONE') {
                 $componentType = $component->name;
-                $uid = (string)$component->UID;
+                $uid = (string) $component->UID;
                 break;
             }
         }
@@ -578,7 +578,7 @@ 
                     $lastOccurence = $firstOccurence;
                 }
             } else {
-                $it = new VObject\Recur\EventIterator($vObject, (string)$component->UID);
+                $it = new VObject\Recur\EventIterator($vObject, (string) $component->UID);
                 $maxDate = new \DateTime(self::MAX_DATE);
                 if ($it->isInfinite()) {
                     $lastOccurence = $maxDate->getTimeStamp();
@@ -859,7 +859,7 @@ 
         // Current synctoken
 		$query = sprintf('SELECT synctoken FROM %s WHERE id = ?', $this->calendarTableName);
         $stmt = $this->pdo->prepare($query);
-        $stmt->execute([ $calendarId ]);
+        $stmt->execute([$calendarId]);
         $currentToken = $stmt->fetchColumn(0);
 
         if (is_null($currentToken)) return null;
@@ -874,7 +874,7 @@ 
         if ($syncToken) {
 
             $query = sprintf('SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && calendarid = ? ORDER BY synctoken', $this->calendarChangesTableName);
-            if ($limit > 0) $query .= " LIMIT " . (int)$limit;
+            if ($limit > 0) $query .= " LIMIT " . (int) $limit;
 
             // Fetching all changes
             $stmt = $this->pdo->prepare($query);
@@ -1157,7 +1157,7 @@ 
             'calendardata' => $row['calendardata'],
             'lastmodified' => $row['lastmodified'],
             'etag'         => '"' . $row['etag'] . '"',
-            'size'         => (int)$row['size'],
+            'size'         => (int) $row['size'],
          ];
 
     }
@@ -1186,7 +1186,7 @@ 
                 'uri'          => $row['uri'],
                 'lastmodified' => $row['lastmodified'],
                 'etag'         => '"' . $row['etag'] . '"',
-                'size'         => (int)$row['size'],
+                'size'         => (int) $row['size'],
             ];
         }
 
@@ -1220,7 +1220,7 @@ 
     public function createSchedulingObject($principalUri, $objectUri, $objectData) {
 
         $stmt = $this->pdo->prepare('INSERT INTO ' . $this->schedulingObjectTableName . ' (principaluri, calendardata, uri, lastmodified, etag, size) VALUES (?, ?, ?, ?, ?, ?)');
-        $stmt->execute([$principalUri, $objectData, $objectUri, time(), md5($objectData), strlen($objectData) ]);
+        $stmt->execute([$principalUri, $objectData, $objectUri, time(), md5($objectData), strlen($objectData)]);
 
     }
 

libraries/SabreDAV/CalDAV/Notifications/Plugin.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 
         $this->server = $server;
         $server->on('method:GET', [$this, 'httpGet'], 90);
-        $server->on('propFind',   [$this, 'propFind']);
+        $server->on('propFind', [$this, 'propFind']);
 
         $server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
         $server->resourceTypeMapping['\\Sabre\\CalDAV\\Notifications\\ICollection'] = '{' . self::NS_CALENDARSERVER . '}notification';

Braces +3 added lines, -2 removed lines

@@ -135,8 +135,9 @@
             return;
         }
 
-        if (!$node instanceof INode)
-            return;
+        if (!$node instanceof INode) {
+                    return;
+        }
 
         $writer = $this->server->xml->getWriter();
         $writer->contextUri = $this->server->getBaseUri();

Indentation +150 added lines, -150 removed lines

@@ -26,155 +26,155 @@
  */
 class Plugin extends ServerPlugin {
 
-    /**
-     * This is the namespace for the proprietary calendarserver extensions
-     */
-    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-    /**
-     * Reference to the main server object.
-     *
-     * @var Server
-     */
-    protected $server;
-
-    /**
-     * 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 'notifications';
-
-    }
-
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre\DAV\Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the required event subscriptions.
-     *
-     * @param Server $server
-     * @return void
-     */
-    public function initialize(Server $server) {
-
-        $this->server = $server;
-        $server->on('method:GET', [$this, 'httpGet'], 90);
-        $server->on('propFind',   [$this, 'propFind']);
-
-        $server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Notifications\\ICollection'] = '{' . self::NS_CALENDARSERVER . '}notification';
-
-        array_push($server->protectedProperties,
-            '{' . self::NS_CALENDARSERVER . '}notification-URL',
-            '{' . self::NS_CALENDARSERVER . '}notificationtype'
-        );
-
-    }
-
-    /**
-     * PropFind
-     *
-     * @param PropFind $propFind
-     * @param BaseINode $node
-     * @return void
-     */
-    public function propFind(PropFind $propFind, BaseINode $node) {
-
-        $caldavPlugin = $this->server->getPlugin('caldav');
-
-        if ($node instanceof DAVACL\IPrincipal) {
-
-            $principalUrl = $node->getPrincipalUrl();
-
-            // notification-URL property
-            $propFind->handle('{' . self::NS_CALENDARSERVER . '}notification-URL', function() use ($principalUrl, $caldavPlugin) {
-
-                $notificationPath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl) . '/notifications/';
-                return new DAV\Xml\Property\Href($notificationPath);
-
-            });
-
-        }
-
-        if ($node instanceof INode) {
-
-            $propFind->handle(
-                '{' . self::NS_CALENDARSERVER . '}notificationtype',
-                [$node, 'getNotificationType']
-            );
-
-        }
-
-    }
-
-    /**
-     * This event is triggered before the usual GET request handler.
-     *
-     * We use this to intercept GET calls to notification nodes, and return the
-     * proper response.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function httpGet(RequestInterface $request, ResponseInterface $response) {
-
-        $path = $request->getPath();
-
-        try {
-            $node = $this->server->tree->getNodeForPath($path);
-        } catch (DAV\Exception\NotFound $e) {
-            return;
-        }
-
-        if (!$node instanceof INode)
-            return;
-
-        $writer = $this->server->xml->getWriter();
-        $writer->contextUri = $this->server->getBaseUri();
-        $writer->openMemory();
-        $writer->startDocument('1.0', 'UTF-8');
-        $writer->startElement('{http://calendarserver.org/ns/}notification');
-        $node->getNotificationType()->xmlSerializeFull($writer);
-        $writer->endElement();
-
-        $response->setHeader('Content-Type', 'application/xml');
-        $response->setHeader('ETag', $node->getETag());
-        $response->setStatus(200);
-        $response->setBody($writer->outputMemory());
-
-        // Return false to break the event chain.
-        return false;
-
-    }
-
-    /**
-     * 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-notifications, which is required to enable caldav-sharing.',
-            'link'        => 'http://sabre.io/dav/caldav-sharing/',
-        ];
-
-    }
+	/**
+	 * This is the namespace for the proprietary calendarserver extensions
+	 */
+	const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+	/**
+	 * Reference to the main server object.
+	 *
+	 * @var Server
+	 */
+	protected $server;
+
+	/**
+	 * 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 'notifications';
+
+	}
+
+	/**
+	 * This initializes the plugin.
+	 *
+	 * This function is called by Sabre\DAV\Server, after
+	 * addPlugin is called.
+	 *
+	 * This method should set up the required event subscriptions.
+	 *
+	 * @param Server $server
+	 * @return void
+	 */
+	public function initialize(Server $server) {
+
+		$this->server = $server;
+		$server->on('method:GET', [$this, 'httpGet'], 90);
+		$server->on('propFind',   [$this, 'propFind']);
+
+		$server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
+		$server->resourceTypeMapping['\\Sabre\\CalDAV\\Notifications\\ICollection'] = '{' . self::NS_CALENDARSERVER . '}notification';
+
+		array_push($server->protectedProperties,
+			'{' . self::NS_CALENDARSERVER . '}notification-URL',
+			'{' . self::NS_CALENDARSERVER . '}notificationtype'
+		);
+
+	}
+
+	/**
+	 * PropFind
+	 *
+	 * @param PropFind $propFind
+	 * @param BaseINode $node
+	 * @return void
+	 */
+	public function propFind(PropFind $propFind, BaseINode $node) {
+
+		$caldavPlugin = $this->server->getPlugin('caldav');
+
+		if ($node instanceof DAVACL\IPrincipal) {
+
+			$principalUrl = $node->getPrincipalUrl();
+
+			// notification-URL property
+			$propFind->handle('{' . self::NS_CALENDARSERVER . '}notification-URL', function() use ($principalUrl, $caldavPlugin) {
+
+				$notificationPath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl) . '/notifications/';
+				return new DAV\Xml\Property\Href($notificationPath);
+
+			});
+
+		}
+
+		if ($node instanceof INode) {
+
+			$propFind->handle(
+				'{' . self::NS_CALENDARSERVER . '}notificationtype',
+				[$node, 'getNotificationType']
+			);
+
+		}
+
+	}
+
+	/**
+	 * This event is triggered before the usual GET request handler.
+	 *
+	 * We use this to intercept GET calls to notification nodes, and return the
+	 * proper response.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	public function httpGet(RequestInterface $request, ResponseInterface $response) {
+
+		$path = $request->getPath();
+
+		try {
+			$node = $this->server->tree->getNodeForPath($path);
+		} catch (DAV\Exception\NotFound $e) {
+			return;
+		}
+
+		if (!$node instanceof INode)
+			return;
+
+		$writer = $this->server->xml->getWriter();
+		$writer->contextUri = $this->server->getBaseUri();
+		$writer->openMemory();
+		$writer->startDocument('1.0', 'UTF-8');
+		$writer->startElement('{http://calendarserver.org/ns/}notification');
+		$node->getNotificationType()->xmlSerializeFull($writer);
+		$writer->endElement();
+
+		$response->setHeader('Content-Type', 'application/xml');
+		$response->setHeader('ETag', $node->getETag());
+		$response->setStatus(200);
+		$response->setBody($writer->outputMemory());
+
+		// Return false to break the event chain.
+		return false;
+
+	}
+
+	/**
+	 * 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-notifications, which is required to enable caldav-sharing.',
+			'link'        => 'http://sabre.io/dav/caldav-sharing/',
+		];
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Plugin.php

Spacing +10 added lines, -10 removed lines

@@ -179,13 +179,13 @@ 
 
         $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('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->xml->namespaceMap[self::NS_CALDAV] = 'cal';
         $server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
@@ -294,7 +294,7 @@ 
         if (isset($properties['{DAV:}resourcetype'])) {
             $resourceType = $properties['{DAV:}resourcetype']->getValue();
         } else {
-            $resourceType = ['{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar'];
+            $resourceType = ['{DAV:}collection', '{urn:ietf:params:xml:ns:caldav}calendar'];
         }
 
         $this->server->createCollection($path, new MkCol($resourceType, $properties));
@@ -881,12 +881,12 @@ 
                         if (!isset($component->UID)) {
                             throw new DAV\Exception\BadRequest('Every ' . $component->name . ' component must have an UID');
                         }
-                        $foundUID = (string)$component->UID;
+                        $foundUID = (string) $component->UID;
                     } else {
                         if ($foundType !== $component->name) {
                             throw new DAV\Exception\BadRequest('A calendar object must only contain 1 component. We found a ' . $component->name . ' as well as a ' . $foundType);
                         }
-                        if ($foundUID !== (string)$component->UID) {
+                        if ($foundUID !== (string) $component->UID) {
                             throw new DAV\Exception\BadRequest('Every ' . $component->name . ' in this object must have identical UIDs');
                         }
                     }

Indentation +986 added lines, -986 removed lines

@@ -26,929 +26,929 @@ 
  */
 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);
-
-        $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 (count($parts) !== 2) return;
-        if ($parts[0] !== 'principals') 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
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    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->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
-     * @return bool
-     */
-    public function report($reportName, $report) {
-
-        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.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @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(), null, $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));
-
-        $this->server->httpResponse->setStatus(201);
-        $this->server->httpResponse->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.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode $node
-     * @return void
-     */
-    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 Href($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 Href($addresses, false);
-            });
-            // 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 (substr($address, 0, 7) === 'mailto:') {
-                        $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 ($propFind->getStatus($propRead) === 404 || $propFind->getStatus($propWrite) === 404) {
-
-                $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 Href($readList));
-                $propFind->set($propWrite, new Href($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
-     * @return void
-     */
-    public function calendarMultiGetReport($report) {
-
-        $needsJson = $report->contentType === 'application/calendar+json';
-
-        $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, $prefer['return'] === 'minimal'));
-
-    }
-
-    /**
-     * 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
-     * @return void
-     */
-    public function calendarQueryReport($report) {
-
-        $path = $this->server->getRequestUri();
-
-        $needsJson = $report->contentType === 'application/calendar+json';
-
-        $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 ($depth == 0 && $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 && $depth === 0) {
-
-            if (strpos($this->server->httpRequest->getHeader('User-Agent'), 'MSFT-') === 0) {
-                // 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 && $depth == 1) {
-
-            $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, $prefer['return'] === 'minimal'));
-
-    }
-
-    /**
-     * This method is responsible for parsing the request and generating the
-     * response for the CALDAV:free-busy-query REPORT.
-     *
-     * @param Xml\Request\FreeBusyQueryReport $report
-     * @return void
-     */
-    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 DAV\IFile $node
-     * @param resource $data
-     * @param bool $modified Should be set to true, if this event handler
-     *                       changed &$data.
-     * @return void
-     */
-    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 DAV\ICollection $parentNode
-     * @param bool $modified Should be set to true, if this event handler
-     *                       changed &$data.
-     * @return void
-     */
-    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.
-     * @return void
-     */
-    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 = md5($data);
-        // Converting the data to unicode, if needed.
-        $data = DAV\StringUtil::ensureUTF8($data);
-
-        if ($before !== md5($data)) $modified = true;
-
-        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 ($vobj->name !== 'VCALENDAR') {
-            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;
-        $foundUID = null;
-        foreach ($vobj->getComponents() as $component) {
-            switch ($component->name) {
-                case 'VTIMEZONE' :
-                    continue 2;
-                case 'VEVENT' :
-                case 'VTODO' :
-                case 'VJOURNAL' :
-                    if (is_null($foundType)) {
-                        $foundType = $component->name;
-                        if (!in_array($foundType, $supportedComponents)) {
-                            throw new Exception\InvalidComponentType('This calendar only supports ' . implode(', ', $supportedComponents) . '. We found a ' . $foundType);
-                        }
-                        if (!isset($component->UID)) {
-                            throw new DAV\Exception\BadRequest('Every ' . $component->name . ' component must have an UID');
-                        }
-                        $foundUID = (string)$component->UID;
-                    } else {
-                        if ($foundType !== $component->name) {
-                            throw new DAV\Exception\BadRequest('A calendar object must only contain 1 component. We found a ' . $component->name . ' as well as a ' . $foundType);
-                        }
-                        if ($foundUID !== (string)$component->UID) {
-                            throw new DAV\Exception\BadRequest('Every ' . $component->name . ' in this object must have identical UIDs');
-                        }
-                    }
-                    break;
-                default :
-                    throw new DAV\Exception\BadRequest('You are not allowed to create components of type: ' . $component->name . ' here');
-
-            }
-        }
-        if (!$foundType)
-            throw new DAV\Exception\BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
-
-        // We use an extra variable to allow event handles to tell us wether
-        // 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 ($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 && $before !== md5($data)) {
-                $modified = true;
-            }
-
-        }
-
-        // Destroy circular references so PHP will garbage collect the object.
-        $vobj->destroy();
-
-    }
-
-
-    /**
-     * 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 DAV\INode $node
-     * @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);
+
+		$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 (count($parts) !== 2) return;
+		if ($parts[0] !== 'principals') 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
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	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->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
+	 * @return bool
+	 */
+	public function report($reportName, $report) {
+
+		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.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @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(), null, $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));
+
+		$this->server->httpResponse->setStatus(201);
+		$this->server->httpResponse->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.
+	 *
+	 * @param DAV\PropFind $propFind
+	 * @param DAV\INode $node
+	 * @return void
+	 */
+	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 Href($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 Href($addresses, false);
+			});
+			// 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 (substr($address, 0, 7) === 'mailto:') {
+						$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 ($propFind->getStatus($propRead) === 404 || $propFind->getStatus($propWrite) === 404) {
+
+				$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 Href($readList));
+				$propFind->set($propWrite, new Href($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
+	 * @return void
+	 */
+	public function calendarMultiGetReport($report) {
+
+		$needsJson = $report->contentType === 'application/calendar+json';
+
+		$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, $prefer['return'] === 'minimal'));
+
+	}
+
+	/**
+	 * 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
+	 * @return void
+	 */
+	public function calendarQueryReport($report) {
+
+		$path = $this->server->getRequestUri();
+
+		$needsJson = $report->contentType === 'application/calendar+json';
+
+		$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 ($depth == 0 && $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 && $depth === 0) {
+
+			if (strpos($this->server->httpRequest->getHeader('User-Agent'), 'MSFT-') === 0) {
+				// 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 && $depth == 1) {
+
+			$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, $prefer['return'] === 'minimal'));
+
+	}
+
+	/**
+	 * This method is responsible for parsing the request and generating the
+	 * response for the CALDAV:free-busy-query REPORT.
+	 *
+	 * @param Xml\Request\FreeBusyQueryReport $report
+	 * @return void
+	 */
+	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 DAV\IFile $node
+	 * @param resource $data
+	 * @param bool $modified Should be set to true, if this event handler
+	 *                       changed &$data.
+	 * @return void
+	 */
+	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 DAV\ICollection $parentNode
+	 * @param bool $modified Should be set to true, if this event handler
+	 *                       changed &$data.
+	 * @return void
+	 */
+	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.
+	 * @return void
+	 */
+	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 = md5($data);
+		// Converting the data to unicode, if needed.
+		$data = DAV\StringUtil::ensureUTF8($data);
+
+		if ($before !== md5($data)) $modified = true;
+
+		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 ($vobj->name !== 'VCALENDAR') {
+			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;
+		$foundUID = null;
+		foreach ($vobj->getComponents() as $component) {
+			switch ($component->name) {
+				case 'VTIMEZONE' :
+					continue 2;
+				case 'VEVENT' :
+				case 'VTODO' :
+				case 'VJOURNAL' :
+					if (is_null($foundType)) {
+						$foundType = $component->name;
+						if (!in_array($foundType, $supportedComponents)) {
+							throw new Exception\InvalidComponentType('This calendar only supports ' . implode(', ', $supportedComponents) . '. We found a ' . $foundType);
+						}
+						if (!isset($component->UID)) {
+							throw new DAV\Exception\BadRequest('Every ' . $component->name . ' component must have an UID');
+						}
+						$foundUID = (string)$component->UID;
+					} else {
+						if ($foundType !== $component->name) {
+							throw new DAV\Exception\BadRequest('A calendar object must only contain 1 component. We found a ' . $component->name . ' as well as a ' . $foundType);
+						}
+						if ($foundUID !== (string)$component->UID) {
+							throw new DAV\Exception\BadRequest('Every ' . $component->name . ' in this object must have identical UIDs');
+						}
+					}
+					break;
+				default :
+					throw new DAV\Exception\BadRequest('You are not allowed to create components of type: ' . $component->name . ' here');
+
+			}
+		}
+		if (!$foundType)
+			throw new DAV\Exception\BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
+
+		// We use an extra variable to allow event handles to tell us wether
+		// 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 ($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 && $before !== md5($data)) {
+				$modified = true;
+			}
+
+		}
+
+		// Destroy circular references so PHP will garbage collect the object.
+		$vobj->destroy();
+
+	}
+
+
+	/**
+	 * 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 DAV\INode $node
+	 * @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" />
@@ -958,68 +958,68 @@ 
             </form>
             </td></tr>';
 
-        return false;
-
-    }
-
-    /**
-     * This event is triggered after GET requests.
-     *
-     * This is used to transform data into jCal, if this was requested.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function httpAfterGet(RequestInterface $request, ResponseInterface $response) {
-
-        if (strpos($response->getHeader('Content-Type'), 'text/calendar') === false) {
-            return;
-        }
-
-        $result = HTTP\Util::negotiate(
-            $request->getHeader('Accept'),
-            ['text/calendar', 'application/calendar+json']
-        );
-
-        if ($result !== 'application/calendar+json') {
-            // 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.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	public function httpAfterGet(RequestInterface $request, ResponseInterface $response) {
+
+		if (strpos($response->getHeader('Content-Type'), 'text/calendar') === false) {
+			return;
+		}
+
+		$result = HTTP\Util::negotiate(
+			$request->getHeader('Accept'),
+			['text/calendar', 'application/calendar+json']
+		);
+
+		if ($result !== 'application/calendar+json') {
+			// 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/',
+		];
+
+	}
 
 }

Braces +30 added lines, -16 removed lines

@@ -105,8 +105,12 @@ 
         // excludes things like the calendar-proxy-read principal (which it
         // should).
         $parts = explode('/', trim($principalUrl, '/'));
-        if (count($parts) !== 2) return;
-        if ($parts[0] !== 'principals') return;
+        if (count($parts) !== 2) {
+        	return;
+        }
+        if ($parts[0] !== 'principals') {
+        	return;
+        }
 
         return self::CALENDAR_ROOT . '/' . $parts[1];
 
@@ -340,7 +344,9 @@ 
             $propFind->handle('{' . self::NS_CALDAV . '}calendar-home-set', function() use ($principalUrl) {
 
                 $calendarHomePath = $this->getCalendarHomeForPrincipal($principalUrl);
-                if (is_null($calendarHomePath)) return null;
+                if (is_null($calendarHomePath)) {
+                	return null;
+                }
                 return new Href($calendarHomePath . '/');
 
             });
@@ -408,8 +414,9 @@ 
             // 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);
+                if (is_resource($val)) {
+                                    $val = stream_get_contents($val);
+                }
 
                 // Taking out \r to not screw up the xml output
                 return str_replace("\r", "", $val);
@@ -748,8 +755,9 @@ 
      */
     public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified) {
 
-        if (!$node instanceof ICalendarObject)
-            return;
+        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
@@ -757,8 +765,9 @@ 
         list($parent) = Uri\split($path);
         $parentNode = $this->server->tree->getNodeForPath($parent);
 
-        if (!$parentNode instanceof ICalendar)
-            return;
+        if (!$parentNode instanceof ICalendar) {
+                    return;
+        }
 
         $this->validateICalendar(
             $data,
@@ -786,8 +795,9 @@ 
      */
     public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified) {
 
-        if (!$parentNode instanceof ICalendar)
-            return;
+        if (!$parentNode instanceof ICalendar) {
+                    return;
+        }
 
         $this->validateICalendar(
             $data,
@@ -825,7 +835,9 @@ 
         // Converting the data to unicode, if needed.
         $data = DAV\StringUtil::ensureUTF8($data);
 
-        if ($before !== md5($data)) $modified = true;
+        if ($before !== md5($data)) {
+        	$modified = true;
+        }
 
         try {
 
@@ -896,8 +908,9 @@ 
 
             }
         }
-        if (!$foundType)
-            throw new DAV\Exception\BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
+        if (!$foundType) {
+                    throw new DAV\Exception\BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
+        }
 
         // We use an extra variable to allow event handles to tell us wether
         // the object was modified or not.
@@ -945,8 +958,9 @@ 
      */
     public function htmlActionsPanel(DAV\INode $node, &$output) {
 
-        if (!$node instanceof CalendarHome)
-            return;
+        if (!$node instanceof CalendarHome) {
+                    return;
+        }
 
         $output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Create new calendar</h3>

libraries/SabreDAV/CalDAV/CalendarQueryValidator.php

Spacing +2 added lines, -2 removed lines

@@ -301,7 +301,7 @@ 
                 if ($component->parent->name === 'VEVENT' && $component->parent->RRULE) {
 
                     // Fire up the iterator!
-                    $it = new VObject\Recur\EventIterator($component->parent->parent, (string)$component->parent->UID);
+                    $it = new VObject\Recur\EventIterator($component->parent->parent, (string) $component->parent->UID);
                     while ($it->valid()) {
                         $expandedEvent = $it->getEventObject();
 
@@ -317,7 +317,7 @@ 
                                     return true;
                                 }
 
-                                if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
+                                if ((string) $expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
                                     // This is an alarm with a non-relative trigger
                                     // time, likely created by a buggy client. The
                                     // implication is that every alarm in this

Indentation +351 added lines, -351 removed lines

@@ -20,356 +20,356 @@
  */
 class CalendarQueryValidator {
 
-    /**
-     * Verify if a list of filters applies to the calendar data object
-     *
-     * The list of filters must be formatted as parsed by \Sabre\CalDAV\CalendarQueryParser
-     *
-     * @param VObject\Component $vObject
-     * @param array $filters
-     * @return bool
-     */
-    public function validate(VObject\Component\VCalendar $vObject, array $filters) {
-
-        // The top level object is always a component filter.
-        // We'll parse it manually, as it's pretty simple.
-        if ($vObject->name !== $filters['name']) {
-            return false;
-        }
-
-        return
-            $this->validateCompFilters($vObject, $filters['comp-filters']) &&
-            $this->validatePropFilters($vObject, $filters['prop-filters']);
-
-
-    }
-
-    /**
-     * This method checks the validity of comp-filters.
-     *
-     * A list of comp-filters needs to be specified. Also the parent of the
-     * component we're checking should be specified, not the component to check
-     * itself.
-     *
-     * @param VObject\Component $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validateCompFilters(VObject\Component $parent, array $filters) {
-
-        foreach ($filters as $filter) {
-
-            $isDefined = isset($parent->{$filter['name']});
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if ($filter['time-range']) {
-                foreach ($parent->{$filter['name']} as $subComponent) {
-                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
-                        continue 2;
-                    }
-                }
-                return false;
-            }
-
-            if (!$filter['comp-filters'] && !$filter['prop-filters']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one component
-            // for which the subfilters hold true.
-            foreach ($parent->{$filter['name']} as $subComponent) {
-
-                if (
-                    $this->validateCompFilters($subComponent, $filter['comp-filters']) &&
-                    $this->validatePropFilters($subComponent, $filter['prop-filters'])) {
-                        // We had a match, so this comp-filter succeeds
-                        continue 2;
-                }
-
-            }
-
-            // If we got here it means there were sub-comp-filters or
-            // sub-prop-filters and there was no match. This means this filter
-            // needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all comp-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of prop-filters.
-     *
-     * A list of prop-filters needs to be specified. Also the parent of the
-     * property we're checking should be specified, not the property to check
-     * itself.
-     *
-     * @param VObject\Component $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validatePropFilters(VObject\Component $parent, array $filters) {
-
-        foreach ($filters as $filter) {
-
-            $isDefined = isset($parent->{$filter['name']});
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if ($filter['time-range']) {
-                foreach ($parent->{$filter['name']} as $subComponent) {
-                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
-                        continue 2;
-                    }
-                }
-                return false;
-            }
-
-            if (!$filter['param-filters'] && !$filter['text-match']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one property
-            // for which the subfilters hold true.
-            foreach ($parent->{$filter['name']} as $subComponent) {
-
-                if (
-                    $this->validateParamFilters($subComponent, $filter['param-filters']) &&
-                    (!$filter['text-match'] || $this->validateTextMatch($subComponent, $filter['text-match']))
-                ) {
-                    // We had a match, so this prop-filter succeeds
-                    continue 2;
-                }
-
-            }
-
-            // If we got here it means there were sub-param-filters or
-            // text-match filters and there was no match. This means the
-            // filter needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all prop-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of param-filters.
-     *
-     * A list of param-filters needs to be specified. Also the parent of the
-     * parameter we're checking should be specified, not the parameter to check
-     * itself.
-     *
-     * @param VObject\Property $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validateParamFilters(VObject\Property $parent, array $filters) {
-
-        foreach ($filters as $filter) {
-
-            $isDefined = isset($parent[$filter['name']]);
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if (!$filter['text-match']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one parameter
-            // for which the subfilters hold true.
-            foreach ($parent[$filter['name']]->getParts() as $paramPart) {
-
-                if ($this->validateTextMatch($paramPart, $filter['text-match'])) {
-                    // We had a match, so this param-filter succeeds
-                    continue 2;
-                }
-
-            }
-
-            // If we got here it means there was a text-match filter and there
-            // were no matches. This means the filter needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all param-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of a text-match.
-     *
-     * A single text-match should be specified as well as the specific property
-     * or parameter we need to validate.
-     *
-     * @param VObject\Node|string $check Value to check against.
-     * @param array $textMatch
-     * @return bool
-     */
-    protected function validateTextMatch($check, array $textMatch) {
-
-        if ($check instanceof VObject\Node) {
-            $check = $check->getValue();
-        }
-
-        $isMatching = \Sabre\DAV\StringUtil::textMatch($check, $textMatch['value'], $textMatch['collation']);
-
-        return ($textMatch['negate-condition'] xor $isMatching);
-
-    }
-
-    /**
-     * Validates if a component matches the given time range.
-     *
-     * This is all based on the rules specified in rfc4791, which are quite
-     * complex.
-     *
-     * @param VObject\Node $component
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return bool
-     */
-    protected function validateTimeRange(VObject\Node $component, $start, $end) {
-
-        if (is_null($start)) {
-            $start = new DateTime('1900-01-01');
-        }
-        if (is_null($end)) {
-            $end = new DateTime('3000-01-01');
-        }
-
-        switch ($component->name) {
-
-            case 'VEVENT' :
-            case 'VTODO' :
-            case 'VJOURNAL' :
-
-                return $component->isInTimeRange($start, $end);
-
-            case 'VALARM' :
-
-                // If the valarm is wrapped in a recurring event, we need to
-                // expand the recursions, and validate each.
-                //
-                // Our datamodel doesn't easily allow us to do this straight
-                // in the VALARM component code, so this is a hack, and an
-                // expensive one too.
-                if ($component->parent->name === 'VEVENT' && $component->parent->RRULE) {
-
-                    // Fire up the iterator!
-                    $it = new VObject\Recur\EventIterator($component->parent->parent, (string)$component->parent->UID);
-                    while ($it->valid()) {
-                        $expandedEvent = $it->getEventObject();
-
-                        // We need to check from these expanded alarms, which
-                        // one is the first to trigger. Based on this, we can
-                        // determine if we can 'give up' expanding events.
-                        $firstAlarm = null;
-                        if ($expandedEvent->VALARM !== null) {
-                            foreach ($expandedEvent->VALARM as $expandedAlarm) {
-
-                                $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
-                                if ($expandedAlarm->isInTimeRange($start, $end)) {
-                                    return true;
-                                }
-
-                                if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
-                                    // This is an alarm with a non-relative trigger
-                                    // time, likely created by a buggy client. The
-                                    // implication is that every alarm in this
-                                    // recurring event trigger at the exact same
-                                    // time. It doesn't make sense to traverse
-                                    // further.
-                                } else {
-                                    // We store the first alarm as a means to
-                                    // figure out when we can stop traversing.
-                                    if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
-                                        $firstAlarm = $effectiveTrigger;
-                                    }
-                                }
-                            }
-                        }
-                        if (is_null($firstAlarm)) {
-                            // No alarm was found.
-                            //
-                            // Or technically: No alarm that will change for
-                            // every instance of the recurrence was found,
-                            // which means we can assume there was no match.
-                            return false;
-                        }
-                        if ($firstAlarm > $end) {
-                            return false;
-                        }
-                        $it->next();
-                    }
-                    return false;
-                } else {
-                    return $component->isInTimeRange($start, $end);
-                }
-
-            case 'VFREEBUSY' :
-                throw new \Sabre\DAV\Exception\NotImplemented('time-range filters are currently not supported on ' . $component->name . ' components');
-
-            case 'COMPLETED' :
-            case 'CREATED' :
-            case 'DTEND' :
-            case 'DTSTAMP' :
-            case 'DTSTART' :
-            case 'DUE' :
-            case 'LAST-MODIFIED' :
-                return ($start <= $component->getDateTime() && $end >= $component->getDateTime());
-
-
-
-            default :
-                throw new \Sabre\DAV\Exception\BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
-
-        }
-
-    }
+	/**
+	 * Verify if a list of filters applies to the calendar data object
+	 *
+	 * The list of filters must be formatted as parsed by \Sabre\CalDAV\CalendarQueryParser
+	 *
+	 * @param VObject\Component $vObject
+	 * @param array $filters
+	 * @return bool
+	 */
+	public function validate(VObject\Component\VCalendar $vObject, array $filters) {
+
+		// The top level object is always a component filter.
+		// We'll parse it manually, as it's pretty simple.
+		if ($vObject->name !== $filters['name']) {
+			return false;
+		}
+
+		return
+			$this->validateCompFilters($vObject, $filters['comp-filters']) &&
+			$this->validatePropFilters($vObject, $filters['prop-filters']);
+
+
+	}
+
+	/**
+	 * This method checks the validity of comp-filters.
+	 *
+	 * A list of comp-filters needs to be specified. Also the parent of the
+	 * component we're checking should be specified, not the component to check
+	 * itself.
+	 *
+	 * @param VObject\Component $parent
+	 * @param array $filters
+	 * @return bool
+	 */
+	protected function validateCompFilters(VObject\Component $parent, array $filters) {
+
+		foreach ($filters as $filter) {
+
+			$isDefined = isset($parent->{$filter['name']});
+
+			if ($filter['is-not-defined']) {
+
+				if ($isDefined) {
+					return false;
+				} else {
+					continue;
+				}
+
+			}
+			if (!$isDefined) {
+				return false;
+			}
+
+			if ($filter['time-range']) {
+				foreach ($parent->{$filter['name']} as $subComponent) {
+					if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
+						continue 2;
+					}
+				}
+				return false;
+			}
+
+			if (!$filter['comp-filters'] && !$filter['prop-filters']) {
+				continue;
+			}
+
+			// If there are sub-filters, we need to find at least one component
+			// for which the subfilters hold true.
+			foreach ($parent->{$filter['name']} as $subComponent) {
+
+				if (
+					$this->validateCompFilters($subComponent, $filter['comp-filters']) &&
+					$this->validatePropFilters($subComponent, $filter['prop-filters'])) {
+						// We had a match, so this comp-filter succeeds
+						continue 2;
+				}
+
+			}
+
+			// If we got here it means there were sub-comp-filters or
+			// sub-prop-filters and there was no match. This means this filter
+			// needs to return false.
+			return false;
+
+		}
+
+		// If we got here it means we got through all comp-filters alive so the
+		// filters were all true.
+		return true;
+
+	}
+
+	/**
+	 * This method checks the validity of prop-filters.
+	 *
+	 * A list of prop-filters needs to be specified. Also the parent of the
+	 * property we're checking should be specified, not the property to check
+	 * itself.
+	 *
+	 * @param VObject\Component $parent
+	 * @param array $filters
+	 * @return bool
+	 */
+	protected function validatePropFilters(VObject\Component $parent, array $filters) {
+
+		foreach ($filters as $filter) {
+
+			$isDefined = isset($parent->{$filter['name']});
+
+			if ($filter['is-not-defined']) {
+
+				if ($isDefined) {
+					return false;
+				} else {
+					continue;
+				}
+
+			}
+			if (!$isDefined) {
+				return false;
+			}
+
+			if ($filter['time-range']) {
+				foreach ($parent->{$filter['name']} as $subComponent) {
+					if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
+						continue 2;
+					}
+				}
+				return false;
+			}
+
+			if (!$filter['param-filters'] && !$filter['text-match']) {
+				continue;
+			}
+
+			// If there are sub-filters, we need to find at least one property
+			// for which the subfilters hold true.
+			foreach ($parent->{$filter['name']} as $subComponent) {
+
+				if (
+					$this->validateParamFilters($subComponent, $filter['param-filters']) &&
+					(!$filter['text-match'] || $this->validateTextMatch($subComponent, $filter['text-match']))
+				) {
+					// We had a match, so this prop-filter succeeds
+					continue 2;
+				}
+
+			}
+
+			// If we got here it means there were sub-param-filters or
+			// text-match filters and there was no match. This means the
+			// filter needs to return false.
+			return false;
+
+		}
+
+		// If we got here it means we got through all prop-filters alive so the
+		// filters were all true.
+		return true;
+
+	}
+
+	/**
+	 * This method checks the validity of param-filters.
+	 *
+	 * A list of param-filters needs to be specified. Also the parent of the
+	 * parameter we're checking should be specified, not the parameter to check
+	 * itself.
+	 *
+	 * @param VObject\Property $parent
+	 * @param array $filters
+	 * @return bool
+	 */
+	protected function validateParamFilters(VObject\Property $parent, array $filters) {
+
+		foreach ($filters as $filter) {
+
+			$isDefined = isset($parent[$filter['name']]);
+
+			if ($filter['is-not-defined']) {
+
+				if ($isDefined) {
+					return false;
+				} else {
+					continue;
+				}
+
+			}
+			if (!$isDefined) {
+				return false;
+			}
+
+			if (!$filter['text-match']) {
+				continue;
+			}
+
+			// If there are sub-filters, we need to find at least one parameter
+			// for which the subfilters hold true.
+			foreach ($parent[$filter['name']]->getParts() as $paramPart) {
+
+				if ($this->validateTextMatch($paramPart, $filter['text-match'])) {
+					// We had a match, so this param-filter succeeds
+					continue 2;
+				}
+
+			}
+
+			// If we got here it means there was a text-match filter and there
+			// were no matches. This means the filter needs to return false.
+			return false;
+
+		}
+
+		// If we got here it means we got through all param-filters alive so the
+		// filters were all true.
+		return true;
+
+	}
+
+	/**
+	 * This method checks the validity of a text-match.
+	 *
+	 * A single text-match should be specified as well as the specific property
+	 * or parameter we need to validate.
+	 *
+	 * @param VObject\Node|string $check Value to check against.
+	 * @param array $textMatch
+	 * @return bool
+	 */
+	protected function validateTextMatch($check, array $textMatch) {
+
+		if ($check instanceof VObject\Node) {
+			$check = $check->getValue();
+		}
+
+		$isMatching = \Sabre\DAV\StringUtil::textMatch($check, $textMatch['value'], $textMatch['collation']);
+
+		return ($textMatch['negate-condition'] xor $isMatching);
+
+	}
+
+	/**
+	 * Validates if a component matches the given time range.
+	 *
+	 * This is all based on the rules specified in rfc4791, which are quite
+	 * complex.
+	 *
+	 * @param VObject\Node $component
+	 * @param DateTime $start
+	 * @param DateTime $end
+	 * @return bool
+	 */
+	protected function validateTimeRange(VObject\Node $component, $start, $end) {
+
+		if (is_null($start)) {
+			$start = new DateTime('1900-01-01');
+		}
+		if (is_null($end)) {
+			$end = new DateTime('3000-01-01');
+		}
+
+		switch ($component->name) {
+
+			case 'VEVENT' :
+			case 'VTODO' :
+			case 'VJOURNAL' :
+
+				return $component->isInTimeRange($start, $end);
+
+			case 'VALARM' :
+
+				// If the valarm is wrapped in a recurring event, we need to
+				// expand the recursions, and validate each.
+				//
+				// Our datamodel doesn't easily allow us to do this straight
+				// in the VALARM component code, so this is a hack, and an
+				// expensive one too.
+				if ($component->parent->name === 'VEVENT' && $component->parent->RRULE) {
+
+					// Fire up the iterator!
+					$it = new VObject\Recur\EventIterator($component->parent->parent, (string)$component->parent->UID);
+					while ($it->valid()) {
+						$expandedEvent = $it->getEventObject();
+
+						// We need to check from these expanded alarms, which
+						// one is the first to trigger. Based on this, we can
+						// determine if we can 'give up' expanding events.
+						$firstAlarm = null;
+						if ($expandedEvent->VALARM !== null) {
+							foreach ($expandedEvent->VALARM as $expandedAlarm) {
+
+								$effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
+								if ($expandedAlarm->isInTimeRange($start, $end)) {
+									return true;
+								}
+
+								if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
+									// This is an alarm with a non-relative trigger
+									// time, likely created by a buggy client. The
+									// implication is that every alarm in this
+									// recurring event trigger at the exact same
+									// time. It doesn't make sense to traverse
+									// further.
+								} else {
+									// We store the first alarm as a means to
+									// figure out when we can stop traversing.
+									if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
+										$firstAlarm = $effectiveTrigger;
+									}
+								}
+							}
+						}
+						if (is_null($firstAlarm)) {
+							// No alarm was found.
+							//
+							// Or technically: No alarm that will change for
+							// every instance of the recurrence was found,
+							// which means we can assume there was no match.
+							return false;
+						}
+						if ($firstAlarm > $end) {
+							return false;
+						}
+						$it->next();
+					}
+					return false;
+				} else {
+					return $component->isInTimeRange($start, $end);
+				}
+
+			case 'VFREEBUSY' :
+				throw new \Sabre\DAV\Exception\NotImplemented('time-range filters are currently not supported on ' . $component->name . ' components');
+
+			case 'COMPLETED' :
+			case 'CREATED' :
+			case 'DTEND' :
+			case 'DTSTAMP' :
+			case 'DTSTART' :
+			case 'DUE' :
+			case 'LAST-MODIFIED' :
+				return ($start <= $component->getDateTime() && $end >= $component->getDateTime());
+
+
+
+			default :
+				throw new \Sabre\DAV\Exception\BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
+
+		}
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Xml/Request/FreeBusyQueryReport.php

Indentation +56 added lines, -56 removed lines

@@ -21,71 +21,71 @@
  */
 class FreeBusyQueryReport implements XmlDeserializable {
 
-    /**
-     * Starttime of report
-     *
-     * @var DateTime|null
-     */
-    public $start;
+	/**
+	 * Starttime of report
+	 *
+	 * @var DateTime|null
+	 */
+	public $start;
 
-    /**
-     * End time of report
-     *
-     * @var DateTime|null
-     */
-    public $end;
+	/**
+	 * End time of report
+	 *
+	 * @var DateTime|null
+	 */
+	public $end;
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
 
-        $timeRange = '{' . Plugin::NS_CALDAV . '}time-range';
+		$timeRange = '{' . Plugin::NS_CALDAV . '}time-range';
 
-        $start = null;
-        $end = null;
+		$start = null;
+		$end = null;
 
-        foreach ((array)$reader->parseInnerTree([]) as $elem) {
+		foreach ((array)$reader->parseInnerTree([]) as $elem) {
 
-            if ($elem['name'] !== $timeRange) continue;
+			if ($elem['name'] !== $timeRange) continue;
 
-            $start = empty($elem['attributes']['start']) ?: $elem['attributes']['start'];
-            $end = empty($elem['attributes']['end']) ?: $elem['attributes']['end'];
+			$start = empty($elem['attributes']['start']) ?: $elem['attributes']['start'];
+			$end = empty($elem['attributes']['end']) ?: $elem['attributes']['end'];
 
-        }
-        if (!$start && !$end) {
-            throw new BadRequest('The freebusy report must have a time-range element');
-        }
-        if ($start) {
-            $start = DateTimeParser::parseDateTime($start);
-        }
-        if ($end) {
-            $end = DateTimeParser::parseDateTime($end);
-        }
-        $result = new self();
-        $result->start = $start;
-        $result->end = $end;
+		}
+		if (!$start && !$end) {
+			throw new BadRequest('The freebusy report must have a time-range element');
+		}
+		if ($start) {
+			$start = DateTimeParser::parseDateTime($start);
+		}
+		if ($end) {
+			$end = DateTimeParser::parseDateTime($end);
+		}
+		$result = new self();
+		$result->start = $start;
+		$result->end = $end;
 
-        return $result;
+		return $result;
 
-    }
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         $start = null;
         $end = null;
 
-        foreach ((array)$reader->parseInnerTree([]) as $elem) {
+        foreach ((array) $reader->parseInnerTree([]) as $elem) {
 
             if ($elem['name'] !== $timeRange) continue;
 

Braces +3 added lines, -1 removed lines

@@ -65,7 +65,9 @@
 
         foreach ((array)$reader->parseInnerTree([]) as $elem) {
 
-            if ($elem['name'] !== $timeRange) continue;
+            if ($elem['name'] !== $timeRange) {
+            	continue;
+            }
 
             $start = empty($elem['attributes']['start']) ?: $elem['attributes']['start'];
             $end = empty($elem['attributes']['end']) ?: $elem['attributes']['end'];

libraries/SabreDAV/CalDAV/Xml/Request/CalendarMultiGetReport.php

Indentation +99 added lines, -99 removed lines

@@ -21,104 +21,104 @@
  */
 class CalendarMultiGetReport implements XmlDeserializable {
 
-    /**
-     * An array with requested properties.
-     *
-     * @var array
-     */
-    public $properties;
-
-    /**
-     * This is an array with the urls that are being requested.
-     *
-     * @var array
-     */
-    public $hrefs;
-
-    /**
-     * If the calendar data must be expanded, this will contain an array with 2
-     * elements: start and end.
-     *
-     * Each may be a DateTime or null.
-     *
-     * @var array|null
-     */
-    public $expand = null;
-
-    /**
-     * The mimetype of the content that should be returend. Usually
-     * text/calendar.
-     *
-     * @var string
-     */
-    public $contentType = null;
-
-    /**
-     * The version of calendar-data that should be returned. Usually '2.0',
-     * referring to iCalendar 2.0.
-     *
-     * @var string
-     */
-    public $version = null;
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $elems = $reader->parseInnerTree([
-            '{urn:ietf:params:xml:ns:caldav}calendar-data' => 'Sabre\\CalDAV\\Xml\\Filter\\CalendarData',
-            '{DAV:}prop'                                   => 'Sabre\\Xml\\Element\\KeyValue',
-        ]);
-
-        $newProps = [
-            'hrefs'      => [],
-            'properties' => [],
-        ];
-
-        foreach ($elems as $elem) {
-
-            switch ($elem['name']) {
-
-                case '{DAV:}prop' :
-                    $newProps['properties'] = array_keys($elem['value']);
-                    if (isset($elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'])) {
-                        $newProps += $elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'];
-                    }
-                    break;
-                case '{DAV:}href' :
-                    $newProps['hrefs'][] = Uri\resolve($reader->contextUri, $elem['value']);
-                    break;
-
-            }
-
-        }
-
-        $obj = new self();
-        foreach ($newProps as $key => $value) {
-            $obj->$key = $value;
-        }
-
-        return $obj;
-
-    }
+	/**
+	 * An array with requested properties.
+	 *
+	 * @var array
+	 */
+	public $properties;
+
+	/**
+	 * This is an array with the urls that are being requested.
+	 *
+	 * @var array
+	 */
+	public $hrefs;
+
+	/**
+	 * If the calendar data must be expanded, this will contain an array with 2
+	 * elements: start and end.
+	 *
+	 * Each may be a DateTime or null.
+	 *
+	 * @var array|null
+	 */
+	public $expand = null;
+
+	/**
+	 * The mimetype of the content that should be returend. Usually
+	 * text/calendar.
+	 *
+	 * @var string
+	 */
+	public $contentType = null;
+
+	/**
+	 * The version of calendar-data that should be returned. Usually '2.0',
+	 * referring to iCalendar 2.0.
+	 *
+	 * @var string
+	 */
+	public $version = null;
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$elems = $reader->parseInnerTree([
+			'{urn:ietf:params:xml:ns:caldav}calendar-data' => 'Sabre\\CalDAV\\Xml\\Filter\\CalendarData',
+			'{DAV:}prop'                                   => 'Sabre\\Xml\\Element\\KeyValue',
+		]);
+
+		$newProps = [
+			'hrefs'      => [],
+			'properties' => [],
+		];
+
+		foreach ($elems as $elem) {
+
+			switch ($elem['name']) {
+
+				case '{DAV:}prop' :
+					$newProps['properties'] = array_keys($elem['value']);
+					if (isset($elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'])) {
+						$newProps += $elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'];
+					}
+					break;
+				case '{DAV:}href' :
+					$newProps['hrefs'][] = Uri\resolve($reader->contextUri, $elem['value']);
+					break;
+
+			}
+
+		}
+
+		$obj = new self();
+		foreach ($newProps as $key => $value) {
+			$obj->$key = $value;
+		}
+
+		return $obj;
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Xml/Request/CalendarQueryReport.php

Indentation +114 added lines, -114 removed lines

@@ -21,119 +21,119 @@
  */
 class CalendarQueryReport implements XmlDeserializable {
 
-    /**
-     * An array with requested properties.
-     *
-     * @var array
-     */
-    public $properties;
-
-    /**
-     * List of property/component filters.
-     *
-     * @var array
-     */
-    public $filters;
-
-    /**
-     * If the calendar data must be expanded, this will contain an array with 2
-     * elements: start and end.
-     *
-     * Each may be a DateTime or null.
-     *
-     * @var array|null
-     */
-    public $expand = null;
-
-    /**
-     * The mimetype of the content that should be returend. Usually
-     * text/calendar.
-     *
-     * @var string
-     */
-    public $contentType = null;
-
-    /**
-     * The version of calendar-data that should be returned. Usually '2.0',
-     * referring to iCalendar 2.0.
-     *
-     * @var string
-     */
-    public $version = null;
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $elems = $reader->parseInnerTree([
-            '{urn:ietf:params:xml:ns:caldav}comp-filter'   => 'Sabre\\CalDAV\\Xml\\Filter\\CompFilter',
-            '{urn:ietf:params:xml:ns:caldav}prop-filter'   => 'Sabre\\CalDAV\\Xml\\Filter\\PropFilter',
-            '{urn:ietf:params:xml:ns:caldav}param-filter'  => 'Sabre\\CalDAV\\Xml\\Filter\\ParamFilter',
-            '{urn:ietf:params:xml:ns:caldav}calendar-data' => 'Sabre\\CalDAV\\Xml\\Filter\\CalendarData',
-            '{DAV:}prop'                                   => 'Sabre\\Xml\\Element\\KeyValue',
-        ]);
-
-        $newProps = [
-            'filters'    => null,
-            'properties' => [],
-        ];
-
-        if (!is_array($elems)) $elems = [];
-
-        foreach ($elems as $elem) {
-
-            switch ($elem['name']) {
-
-                case '{DAV:}prop' :
-                    $newProps['properties'] = array_keys($elem['value']);
-                    if (isset($elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'])) {
-                        $newProps += $elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'];
-                    }
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}filter' :
-                    foreach ($elem['value'] as $subElem) {
-                        if ($subElem['name'] === '{' . Plugin::NS_CALDAV . '}comp-filter') {
-                            if (!is_null($newProps['filters'])) {
-                                throw new BadRequest('Only one top-level comp-filter may be defined');
-                            }
-                            $newProps['filters'] = $subElem['value'];
-                        }
-                    }
-                    break;
-
-            }
-
-        }
-
-        if (is_null($newProps['filters'])) {
-            throw new BadRequest('The {' . Plugin::NS_CALDAV . '}filter element is required for this request');
-        }
-
-        $obj = new self();
-        foreach ($newProps as $key => $value) {
-            $obj->$key = $value;
-        }
-        return $obj;
-
-    }
+	/**
+	 * An array with requested properties.
+	 *
+	 * @var array
+	 */
+	public $properties;
+
+	/**
+	 * List of property/component filters.
+	 *
+	 * @var array
+	 */
+	public $filters;
+
+	/**
+	 * If the calendar data must be expanded, this will contain an array with 2
+	 * elements: start and end.
+	 *
+	 * Each may be a DateTime or null.
+	 *
+	 * @var array|null
+	 */
+	public $expand = null;
+
+	/**
+	 * The mimetype of the content that should be returend. Usually
+	 * text/calendar.
+	 *
+	 * @var string
+	 */
+	public $contentType = null;
+
+	/**
+	 * The version of calendar-data that should be returned. Usually '2.0',
+	 * referring to iCalendar 2.0.
+	 *
+	 * @var string
+	 */
+	public $version = null;
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$elems = $reader->parseInnerTree([
+			'{urn:ietf:params:xml:ns:caldav}comp-filter'   => 'Sabre\\CalDAV\\Xml\\Filter\\CompFilter',
+			'{urn:ietf:params:xml:ns:caldav}prop-filter'   => 'Sabre\\CalDAV\\Xml\\Filter\\PropFilter',
+			'{urn:ietf:params:xml:ns:caldav}param-filter'  => 'Sabre\\CalDAV\\Xml\\Filter\\ParamFilter',
+			'{urn:ietf:params:xml:ns:caldav}calendar-data' => 'Sabre\\CalDAV\\Xml\\Filter\\CalendarData',
+			'{DAV:}prop'                                   => 'Sabre\\Xml\\Element\\KeyValue',
+		]);
+
+		$newProps = [
+			'filters'    => null,
+			'properties' => [],
+		];
+
+		if (!is_array($elems)) $elems = [];
+
+		foreach ($elems as $elem) {
+
+			switch ($elem['name']) {
+
+				case '{DAV:}prop' :
+					$newProps['properties'] = array_keys($elem['value']);
+					if (isset($elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'])) {
+						$newProps += $elem['value']['{' . Plugin::NS_CALDAV . '}calendar-data'];
+					}
+					break;
+				case '{' . Plugin::NS_CALDAV . '}filter' :
+					foreach ($elem['value'] as $subElem) {
+						if ($subElem['name'] === '{' . Plugin::NS_CALDAV . '}comp-filter') {
+							if (!is_null($newProps['filters'])) {
+								throw new BadRequest('Only one top-level comp-filter may be defined');
+							}
+							$newProps['filters'] = $subElem['value'];
+						}
+					}
+					break;
+
+			}
+
+		}
+
+		if (is_null($newProps['filters'])) {
+			throw new BadRequest('The {' . Plugin::NS_CALDAV . '}filter element is required for this request');
+		}
+
+		$obj = new self();
+		foreach ($newProps as $key => $value) {
+			$obj->$key = $value;
+		}
+		return $obj;
+
+	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -97,7 +97,9 @@
             'properties' => [],
         ];
 
-        if (!is_array($elems)) $elems = [];
+        if (!is_array($elems)) {
+        	$elems = [];
+        }
 
         foreach ($elems as $elem) {
 

libraries/SabreDAV/CalDAV/Xml/Filter/PropFilter.php

Indentation +60 added lines, -60 removed lines

@@ -24,75 +24,75 @@
  */
 class PropFilter implements XmlDeserializable {
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
 
-        $result = [
-            'name'           => null,
-            'is-not-defined' => false,
-            'param-filters'  => [],
-            'text-match'     => null,
-            'time-range'     => false,
-        ];
+		$result = [
+			'name'           => null,
+			'is-not-defined' => false,
+			'param-filters'  => [],
+			'text-match'     => null,
+			'time-range'     => false,
+		];
 
-        $att = $reader->parseAttributes();
-        $result['name'] = $att['name'];
+		$att = $reader->parseAttributes();
+		$result['name'] = $att['name'];
 
-        $elems = $reader->parseInnerTree();
+		$elems = $reader->parseInnerTree();
 
-        if (is_array($elems)) foreach ($elems as $elem) {
+		if (is_array($elems)) foreach ($elems as $elem) {
 
-            switch ($elem['name']) {
+			switch ($elem['name']) {
 
-                case '{' . Plugin::NS_CALDAV . '}param-filter' :
-                    $result['param-filters'][] = $elem['value'];
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}is-not-defined' :
-                    $result['is-not-defined'] = true;
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}time-range' :
-                    $result['time-range'] = [
-                        'start' => isset($elem['attributes']['start']) ? DateTimeParser::parseDateTime($elem['attributes']['start']) : null,
-                        'end'   => isset($elem['attributes']['end']) ? DateTimeParser::parseDateTime($elem['attributes']['end']) : null,
-                    ];
-                    if ($result['time-range']['start'] && $result['time-range']['end'] && $result['time-range']['end'] <= $result['time-range']['start']) {
-                        throw new BadRequest('The end-date must be larger than the start-date');
-                    }
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}text-match' :
-                    $result['text-match'] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && $elem['attributes']['negate-condition'] === 'yes',
-                        'collation'        => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;ascii-casemap',
-                        'value'            => $elem['value'],
-                    ];
-                    break;
+				case '{' . Plugin::NS_CALDAV . '}param-filter' :
+					$result['param-filters'][] = $elem['value'];
+					break;
+				case '{' . Plugin::NS_CALDAV . '}is-not-defined' :
+					$result['is-not-defined'] = true;
+					break;
+				case '{' . Plugin::NS_CALDAV . '}time-range' :
+					$result['time-range'] = [
+						'start' => isset($elem['attributes']['start']) ? DateTimeParser::parseDateTime($elem['attributes']['start']) : null,
+						'end'   => isset($elem['attributes']['end']) ? DateTimeParser::parseDateTime($elem['attributes']['end']) : null,
+					];
+					if ($result['time-range']['start'] && $result['time-range']['end'] && $result['time-range']['end'] <= $result['time-range']['start']) {
+						throw new BadRequest('The end-date must be larger than the start-date');
+					}
+					break;
+				case '{' . Plugin::NS_CALDAV . '}text-match' :
+					$result['text-match'] = [
+						'negate-condition' => isset($elem['attributes']['negate-condition']) && $elem['attributes']['negate-condition'] === 'yes',
+						'collation'        => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;ascii-casemap',
+						'value'            => $elem['value'],
+					];
+					break;
 
-            }
+			}
 
-        }
+		}
 
-        return $result;
+		return $result;
 
-    }
+	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -60,12 +60,14 @@
 
         $elems = $reader->parseInnerTree();
 
-        if (is_array($elems)) foreach ($elems as $elem) {
+        if (is_array($elems)) {
+        	foreach ($elems as $elem) {
 
             switch ($elem['name']) {
 
                 case '{' . Plugin::NS_CALDAV . '}param-filter' :
                     $result['param-filters'][] = $elem['value'];
+        }
                     break;
                 case '{' . Plugin::NS_CALDAV . '}is-not-defined' :
                     $result['is-not-defined'] = true;

libraries/SabreDAV/CalDAV/Xml/Filter/ParamFilter.php

Indentation +46 added lines, -46 removed lines

@@ -22,61 +22,61 @@
  */
 class ParamFilter implements XmlDeserializable {
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * Important note 2: You are responsible for advancing the reader to the
-     * next element. Not doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * Important note 2: You are responsible for advancing the reader to the
+	 * next element. Not doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
 
-        $result = [
-            'name'           => null,
-            'is-not-defined' => false,
-            'text-match'     => null,
-        ];
+		$result = [
+			'name'           => null,
+			'is-not-defined' => false,
+			'text-match'     => null,
+		];
 
-        $att = $reader->parseAttributes();
-        $result['name'] = $att['name'];
+		$att = $reader->parseAttributes();
+		$result['name'] = $att['name'];
 
-        $elems = $reader->parseInnerTree();
+		$elems = $reader->parseInnerTree();
 
-        if (is_array($elems)) foreach ($elems as $elem) {
+		if (is_array($elems)) foreach ($elems as $elem) {
 
-            switch ($elem['name']) {
+			switch ($elem['name']) {
 
-                case '{' . Plugin::NS_CALDAV . '}is-not-defined' :
-                    $result['is-not-defined'] = true;
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}text-match' :
-                    $result['text-match'] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && $elem['attributes']['negate-condition'] === 'yes',
-                        'collation'        => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;ascii-casemap',
-                        'value'            => $elem['value'],
-                    ];
-                    break;
+				case '{' . Plugin::NS_CALDAV . '}is-not-defined' :
+					$result['is-not-defined'] = true;
+					break;
+				case '{' . Plugin::NS_CALDAV . '}text-match' :
+					$result['text-match'] = [
+						'negate-condition' => isset($elem['attributes']['negate-condition']) && $elem['attributes']['negate-condition'] === 'yes',
+						'collation'        => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;ascii-casemap',
+						'value'            => $elem['value'],
+					];
+					break;
 
-            }
+			}
 
-        }
+		}
 
-        return $result;
+		return $result;
 
-    }
+	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -56,12 +56,14 @@
 
         $elems = $reader->parseInnerTree();
 
-        if (is_array($elems)) foreach ($elems as $elem) {
+        if (is_array($elems)) {
+        	foreach ($elems as $elem) {
 
             switch ($elem['name']) {
 
                 case '{' . Plugin::NS_CALDAV . '}is-not-defined' :
                     $result['is-not-defined'] = true;
+        }
                     break;
                 case '{' . Plugin::NS_CALDAV . '}text-match' :
                     $result['text-match'] = [