Dolibarr / dolibarr

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Notifications/INode.php

Indentation +15 added lines, -15 removed lines

@@ -22,20 +22,20 @@
  */
 interface INode
 {
-    /**
-     * This method must return an xml element, using the
-     * Sabre\CalDAV\Xml\Notification\NotificationInterface classes.
-     *
-     * @return NotificationInterface
-     */
-    public function getNotificationType();
+	/**
+	 * This method must return an xml element, using the
+	 * Sabre\CalDAV\Xml\Notification\NotificationInterface classes.
+	 *
+	 * @return NotificationInterface
+	 */
+	public function getNotificationType();
 
-    /**
-     * Returns the etag for the notification.
-     *
-     * The etag must be surrounded by literal double-quotes.
-     *
-     * @return string
-     */
-    public function getETag();
+	/**
+	 * Returns the etag for the notification.
+	 *
+	 * The etag must be surrounded by literal double-quotes.
+	 *
+	 * @return string
+	 */
+	public function getETag();
 }

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

Indentation +316 added lines, -316 removed lines

@@ -27,320 +27,320 @@
  */
 class SharingPlugin extends DAV\ServerPlugin
 {
-    /**
-     * Reference to SabreDAV server object.
-     *
-     * @var DAV\Server
-     */
-    protected $server;
-
-    /**
-     * This method should return a list of server-features.
-     *
-     * This is for example 'versioning' and is added to the DAV: header
-     * in an OPTIONS response.
-     *
-     * @return array
-     */
-    public function getFeatures()
-    {
-        return ['calendarserver-sharing'];
-    }
-
-    /**
-     * 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 'caldav-sharing';
-    }
-
-    /**
-     * 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.
-     */
-    public function initialize(DAV\Server $server)
-    {
-        $this->server = $server;
-
-        if (is_null($this->server->getPlugin('sharing'))) {
-            throw new \LogicException('The generic "sharing" plugin must be loaded before the caldav sharing plugin. Call $server->addPlugin(new \Sabre\DAV\Sharing\Plugin()); before this one.');
-        }
-
-        array_push(
-            $this->server->protectedProperties,
-            '{'.Plugin::NS_CALENDARSERVER.'}invite',
-            '{'.Plugin::NS_CALENDARSERVER.'}allowed-sharing-modes',
-            '{'.Plugin::NS_CALENDARSERVER.'}shared-url'
-        );
-
-        $this->server->xml->elementMap['{'.Plugin::NS_CALENDARSERVER.'}share'] = 'Sabre\\CalDAV\\Xml\\Request\\Share';
-        $this->server->xml->elementMap['{'.Plugin::NS_CALENDARSERVER.'}invite-reply'] = 'Sabre\\CalDAV\\Xml\\Request\\InviteReply';
-
-        $this->server->on('propFind', [$this, 'propFindEarly']);
-        $this->server->on('propFind', [$this, 'propFindLate'], 150);
-        $this->server->on('propPatch', [$this, 'propPatch'], 40);
-        $this->server->on('method:POST', [$this, 'httpPost']);
-    }
-
-    /**
-     * This event is triggered when properties are requested for a certain
-     * node.
-     *
-     * This allows us to inject any properties early.
-     */
-    public function propFindEarly(DAV\PropFind $propFind, DAV\INode $node)
-    {
-        if ($node instanceof ISharedCalendar) {
-            $propFind->handle('{'.Plugin::NS_CALENDARSERVER.'}invite', function () use ($node) {
-                return new Xml\Property\Invite(
-                    $node->getInvites()
-                );
-            });
-        }
-    }
-
-    /**
-     * This method is triggered *after* all properties have been retrieved.
-     * This allows us to inject the correct resourcetype for calendars that
-     * have been shared.
-     */
-    public function propFindLate(DAV\PropFind $propFind, DAV\INode $node)
-    {
-        if ($node instanceof ISharedCalendar) {
-            $shareAccess = $node->getShareAccess();
-            if ($rt = $propFind->get('{DAV:}resourcetype')) {
-                switch ($shareAccess) {
-                    case \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER:
-                        $rt->add('{'.Plugin::NS_CALENDARSERVER.'}shared-owner');
-                        break;
-                    case \Sabre\DAV\Sharing\Plugin::ACCESS_READ:
-                    case \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE:
-                        $rt->add('{'.Plugin::NS_CALENDARSERVER.'}shared');
-                        break;
-                }
-            }
-            $propFind->handle('{'.Plugin::NS_CALENDARSERVER.'}allowed-sharing-modes', function () {
-                return new Xml\Property\AllowedSharingModes(true, false);
-            });
-        }
-    }
-
-    /**
-     * This method is trigged when a user attempts to update a node's
-     * properties.
-     *
-     * A previous draft of the sharing spec stated that it was possible to use
-     * PROPPATCH to remove 'shared-owner' from the resourcetype, thus unsharing
-     * the calendar.
-     *
-     * Even though this is no longer in the current spec, we keep this around
-     * because OS X 10.7 may still make use of this feature.
-     *
-     * @param string $path
-     */
-    public function propPatch($path, DAV\PropPatch $propPatch)
-    {
-        $node = $this->server->tree->getNodeForPath($path);
-        if (!$node instanceof ISharedCalendar) {
-            return;
-        }
-
-        if (\Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER === $node->getShareAccess() || \Sabre\DAV\Sharing\Plugin::ACCESS_NOTSHARED === $node->getShareAccess()) {
-            $propPatch->handle('{DAV:}resourcetype', function ($value) use ($node) {
-                if ($value->is('{'.Plugin::NS_CALENDARSERVER.'}shared-owner')) {
-                    return false;
-                }
-                $shares = $node->getInvites();
-                foreach ($shares as $share) {
-                    $share->access = DAV\Sharing\Plugin::ACCESS_NOACCESS;
-                }
-                $node->updateInvites($shares);
-
-                return true;
-            });
-        }
-    }
-
-    /**
-     * We intercept this to handle POST requests on calendars.
-     *
-     * @return bool|null
-     */
-    public function httpPost(RequestInterface $request, ResponseInterface $response)
-    {
-        $path = $request->getPath();
-
-        // Only handling xml
-        $contentType = $request->getHeader('Content-Type');
-        if (null === $contentType) {
-            return;
-        }
-        if (false === strpos($contentType, 'application/xml') && false === strpos($contentType, 'text/xml')) {
-            return;
-        }
-
-        // Making sure the node exists
-        try {
-            $node = $this->server->tree->getNodeForPath($path);
-        } catch (DAV\Exception\NotFound $e) {
-            return;
-        }
-
-        $requestBody = $request->getBodyAsString();
-
-        // If this request handler could not deal with this POST request, it
-        // will return 'null' and other plugins get a chance to handle the
-        // request.
-        //
-        // However, we already requested the full body. This is a problem,
-        // because a body can only be read once. This is why we preemptively
-        // re-populated the request body with the existing data.
-        $request->setBody($requestBody);
-
-        $message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-        switch ($documentType) {
-            // Both the DAV:share-resource and CALENDARSERVER:share requests
-            // behave identically.
-            case '{'.Plugin::NS_CALENDARSERVER.'}share':
-                $sharingPlugin = $this->server->getPlugin('sharing');
-                $sharingPlugin->shareResource($path, $message->sharees);
-
-                $response->setStatus(200);
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-                // Breaking the event chain
-                return false;
-
-            // The invite-reply document is sent when the user replies to an
-            // invitation of a calendar share.
-            case '{'.Plugin::NS_CALENDARSERVER.'}invite-reply':
-                // This only works on the calendar-home-root node.
-                if (!$node instanceof CalendarHome) {
-                    return;
-                }
-                $this->server->transactionType = 'post-invite-reply';
-
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
-
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($path, '{DAV:}write');
-                }
-
-                $url = $node->shareReply(
-                    $message->href,
-                    $message->status,
-                    $message->calendarUri,
-                    $message->inReplyTo,
-                    $message->summary
-                );
-
-                $response->setStatus(200);
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-                if ($url) {
-                    $writer = $this->server->xml->getWriter();
-                    $writer->contextUri = $request->getUrl();
-                    $writer->openMemory();
-                    $writer->startDocument();
-                    $writer->startElement('{'.Plugin::NS_CALENDARSERVER.'}shared-as');
-                    $writer->write(new LocalHref($url));
-                    $writer->endElement();
-                    $response->setHeader('Content-Type', 'application/xml');
-                    $response->setBody($writer->outputMemory());
-                }
-
-                // Breaking the event chain
-                return false;
-
-            case '{'.Plugin::NS_CALENDARSERVER.'}publish-calendar':
-                // We can only deal with IShareableCalendar objects
-                if (!$node instanceof ISharedCalendar) {
-                    return;
-                }
-                $this->server->transactionType = 'post-publish-calendar';
-
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
-
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($path, '{DAV:}share');
-                }
-
-                $node->setPublishStatus(true);
-
-                // iCloud sends back the 202, so we will too.
-                $response->setStatus(202);
-
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-                // Breaking the event chain
-                return false;
-
-            case '{'.Plugin::NS_CALENDARSERVER.'}unpublish-calendar':
-                // We can only deal with IShareableCalendar objects
-                if (!$node instanceof ISharedCalendar) {
-                    return;
-                }
-                $this->server->transactionType = 'post-unpublish-calendar';
-
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
-
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($path, '{DAV:}share');
-                }
-
-                $node->setPublishStatus(false);
-
-                $response->setStatus(200);
-
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-                // Breaking 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-sharing.',
-            'link' => 'http://sabre.io/dav/caldav-sharing/',
-        ];
-    }
+	/**
+	 * Reference to SabreDAV server object.
+	 *
+	 * @var DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * This method should return a list of server-features.
+	 *
+	 * This is for example 'versioning' and is added to the DAV: header
+	 * in an OPTIONS response.
+	 *
+	 * @return array
+	 */
+	public function getFeatures()
+	{
+		return ['calendarserver-sharing'];
+	}
+
+	/**
+	 * 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 'caldav-sharing';
+	}
+
+	/**
+	 * 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.
+	 */
+	public function initialize(DAV\Server $server)
+	{
+		$this->server = $server;
+
+		if (is_null($this->server->getPlugin('sharing'))) {
+			throw new \LogicException('The generic "sharing" plugin must be loaded before the caldav sharing plugin. Call $server->addPlugin(new \Sabre\DAV\Sharing\Plugin()); before this one.');
+		}
+
+		array_push(
+			$this->server->protectedProperties,
+			'{'.Plugin::NS_CALENDARSERVER.'}invite',
+			'{'.Plugin::NS_CALENDARSERVER.'}allowed-sharing-modes',
+			'{'.Plugin::NS_CALENDARSERVER.'}shared-url'
+		);
+
+		$this->server->xml->elementMap['{'.Plugin::NS_CALENDARSERVER.'}share'] = 'Sabre\\CalDAV\\Xml\\Request\\Share';
+		$this->server->xml->elementMap['{'.Plugin::NS_CALENDARSERVER.'}invite-reply'] = 'Sabre\\CalDAV\\Xml\\Request\\InviteReply';
+
+		$this->server->on('propFind', [$this, 'propFindEarly']);
+		$this->server->on('propFind', [$this, 'propFindLate'], 150);
+		$this->server->on('propPatch', [$this, 'propPatch'], 40);
+		$this->server->on('method:POST', [$this, 'httpPost']);
+	}
+
+	/**
+	 * This event is triggered when properties are requested for a certain
+	 * node.
+	 *
+	 * This allows us to inject any properties early.
+	 */
+	public function propFindEarly(DAV\PropFind $propFind, DAV\INode $node)
+	{
+		if ($node instanceof ISharedCalendar) {
+			$propFind->handle('{'.Plugin::NS_CALENDARSERVER.'}invite', function () use ($node) {
+				return new Xml\Property\Invite(
+					$node->getInvites()
+				);
+			});
+		}
+	}
+
+	/**
+	 * This method is triggered *after* all properties have been retrieved.
+	 * This allows us to inject the correct resourcetype for calendars that
+	 * have been shared.
+	 */
+	public function propFindLate(DAV\PropFind $propFind, DAV\INode $node)
+	{
+		if ($node instanceof ISharedCalendar) {
+			$shareAccess = $node->getShareAccess();
+			if ($rt = $propFind->get('{DAV:}resourcetype')) {
+				switch ($shareAccess) {
+					case \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER:
+						$rt->add('{'.Plugin::NS_CALENDARSERVER.'}shared-owner');
+						break;
+					case \Sabre\DAV\Sharing\Plugin::ACCESS_READ:
+					case \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE:
+						$rt->add('{'.Plugin::NS_CALENDARSERVER.'}shared');
+						break;
+				}
+			}
+			$propFind->handle('{'.Plugin::NS_CALENDARSERVER.'}allowed-sharing-modes', function () {
+				return new Xml\Property\AllowedSharingModes(true, false);
+			});
+		}
+	}
+
+	/**
+	 * This method is trigged when a user attempts to update a node's
+	 * properties.
+	 *
+	 * A previous draft of the sharing spec stated that it was possible to use
+	 * PROPPATCH to remove 'shared-owner' from the resourcetype, thus unsharing
+	 * the calendar.
+	 *
+	 * Even though this is no longer in the current spec, we keep this around
+	 * because OS X 10.7 may still make use of this feature.
+	 *
+	 * @param string $path
+	 */
+	public function propPatch($path, DAV\PropPatch $propPatch)
+	{
+		$node = $this->server->tree->getNodeForPath($path);
+		if (!$node instanceof ISharedCalendar) {
+			return;
+		}
+
+		if (\Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER === $node->getShareAccess() || \Sabre\DAV\Sharing\Plugin::ACCESS_NOTSHARED === $node->getShareAccess()) {
+			$propPatch->handle('{DAV:}resourcetype', function ($value) use ($node) {
+				if ($value->is('{'.Plugin::NS_CALENDARSERVER.'}shared-owner')) {
+					return false;
+				}
+				$shares = $node->getInvites();
+				foreach ($shares as $share) {
+					$share->access = DAV\Sharing\Plugin::ACCESS_NOACCESS;
+				}
+				$node->updateInvites($shares);
+
+				return true;
+			});
+		}
+	}
+
+	/**
+	 * We intercept this to handle POST requests on calendars.
+	 *
+	 * @return bool|null
+	 */
+	public function httpPost(RequestInterface $request, ResponseInterface $response)
+	{
+		$path = $request->getPath();
+
+		// Only handling xml
+		$contentType = $request->getHeader('Content-Type');
+		if (null === $contentType) {
+			return;
+		}
+		if (false === strpos($contentType, 'application/xml') && false === strpos($contentType, 'text/xml')) {
+			return;
+		}
+
+		// Making sure the node exists
+		try {
+			$node = $this->server->tree->getNodeForPath($path);
+		} catch (DAV\Exception\NotFound $e) {
+			return;
+		}
+
+		$requestBody = $request->getBodyAsString();
+
+		// If this request handler could not deal with this POST request, it
+		// will return 'null' and other plugins get a chance to handle the
+		// request.
+		//
+		// However, we already requested the full body. This is a problem,
+		// because a body can only be read once. This is why we preemptively
+		// re-populated the request body with the existing data.
+		$request->setBody($requestBody);
+
+		$message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+		switch ($documentType) {
+			// Both the DAV:share-resource and CALENDARSERVER:share requests
+			// behave identically.
+			case '{'.Plugin::NS_CALENDARSERVER.'}share':
+				$sharingPlugin = $this->server->getPlugin('sharing');
+				$sharingPlugin->shareResource($path, $message->sharees);
+
+				$response->setStatus(200);
+				// Adding this because sending a response body may cause issues,
+				// and I wanted some type of indicator the response was handled.
+				$response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+				// Breaking the event chain
+				return false;
+
+			// The invite-reply document is sent when the user replies to an
+			// invitation of a calendar share.
+			case '{'.Plugin::NS_CALENDARSERVER.'}invite-reply':
+				// This only works on the calendar-home-root node.
+				if (!$node instanceof CalendarHome) {
+					return;
+				}
+				$this->server->transactionType = 'post-invite-reply';
+
+				// Getting ACL info
+				$acl = $this->server->getPlugin('acl');
+
+				// If there's no ACL support, we allow everything
+				if ($acl) {
+					$acl->checkPrivileges($path, '{DAV:}write');
+				}
+
+				$url = $node->shareReply(
+					$message->href,
+					$message->status,
+					$message->calendarUri,
+					$message->inReplyTo,
+					$message->summary
+				);
+
+				$response->setStatus(200);
+				// Adding this because sending a response body may cause issues,
+				// and I wanted some type of indicator the response was handled.
+				$response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+				if ($url) {
+					$writer = $this->server->xml->getWriter();
+					$writer->contextUri = $request->getUrl();
+					$writer->openMemory();
+					$writer->startDocument();
+					$writer->startElement('{'.Plugin::NS_CALENDARSERVER.'}shared-as');
+					$writer->write(new LocalHref($url));
+					$writer->endElement();
+					$response->setHeader('Content-Type', 'application/xml');
+					$response->setBody($writer->outputMemory());
+				}
+
+				// Breaking the event chain
+				return false;
+
+			case '{'.Plugin::NS_CALENDARSERVER.'}publish-calendar':
+				// We can only deal with IShareableCalendar objects
+				if (!$node instanceof ISharedCalendar) {
+					return;
+				}
+				$this->server->transactionType = 'post-publish-calendar';
+
+				// Getting ACL info
+				$acl = $this->server->getPlugin('acl');
+
+				// If there's no ACL support, we allow everything
+				if ($acl) {
+					$acl->checkPrivileges($path, '{DAV:}share');
+				}
+
+				$node->setPublishStatus(true);
+
+				// iCloud sends back the 202, so we will too.
+				$response->setStatus(202);
+
+				// Adding this because sending a response body may cause issues,
+				// and I wanted some type of indicator the response was handled.
+				$response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+				// Breaking the event chain
+				return false;
+
+			case '{'.Plugin::NS_CALENDARSERVER.'}unpublish-calendar':
+				// We can only deal with IShareableCalendar objects
+				if (!$node instanceof ISharedCalendar) {
+					return;
+				}
+				$this->server->transactionType = 'post-unpublish-calendar';
+
+				// Getting ACL info
+				$acl = $this->server->getPlugin('acl');
+
+				// If there's no ACL support, we allow everything
+				if ($acl) {
+					$acl->checkPrivileges($path, '{DAV:}share');
+				}
+
+				$node->setPublishStatus(false);
+
+				$response->setStatus(200);
+
+				// Adding this because sending a response body may cause issues,
+				// and I wanted some type of indicator the response was handled.
+				$response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+				// Breaking 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-sharing.',
+			'link' => 'http://sabre.io/dav/caldav-sharing/',
+		];
+	}
 }

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

Indentation +17 added lines, -17 removed lines

@@ -19,21 +19,21 @@
  */
 interface ICalendarObjectContainer extends \Sabre\DAV\ICollection
 {
-    /**
-     * 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.
-     *
-     * @return array
-     */
-    public function calendarQuery(array $filters);
+	/**
+	 * Performs a calendar-query on the contents of this calendar.
+	 *
+	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
+	 * calendar-query it is possible for a client to request a specific set of
+	 * object, based on contents of iCalendar properties, date-ranges and
+	 * iCalendar component types (VTODO, VEVENT).
+	 *
+	 * This method should just return a list of (relative) urls that match this
+	 * query.
+	 *
+	 * The list of filters are specified as an array. The exact array is
+	 * documented by \Sabre\CalDAV\CalendarQueryParser.
+	 *
+	 * @return array
+	 */
+	public function calendarQuery(array $filters);
 }

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

Indentation +207 added lines, -207 removed lines

@@ -13,211 +13,211 @@
  */
 class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\DAVACL\IACL
 {
-    use \Sabre\DAVACL\ACLTrait;
-
-    /**
-     * Sabre\CalDAV\Backend\BackendInterface.
-     *
-     * @var Backend\AbstractBackend
-     */
-    protected $caldavBackend;
-
-    /**
-     * Array with information about this CalendarObject.
-     *
-     * @var array
-     */
-    protected $objectData;
-
-    /**
-     * Array with information about the containing calendar.
-     *
-     * @var array
-     */
-    protected $calendarInfo;
-
-    /**
-     * Constructor.
-     *
-     * The following properties may be passed within $objectData:
-     *
-     *   * calendarid - This must refer to a calendarid from a caldavBackend
-     *   * uri - A unique uri. Only the 'basename' must be passed.
-     *   * calendardata (optional) - The iCalendar data
-     *   * etag - (optional) The etag for this object, MUST be encloded with
-     *            double-quotes.
-     *   * size - (optional) The size of the data in bytes.
-     *   * lastmodified - (optional) format as a unix timestamp.
-     *   * acl - (optional) Use this to override the default ACL for the node.
-     */
-    public function __construct(Backend\BackendInterface $caldavBackend, array $calendarInfo, array $objectData)
-    {
-        $this->caldavBackend = $caldavBackend;
-
-        if (!isset($objectData['uri'])) {
-            throw new \InvalidArgumentException('The objectData argument must contain an \'uri\' property');
-        }
-
-        $this->calendarInfo = $calendarInfo;
-        $this->objectData = $objectData;
-    }
-
-    /**
-     * Returns the uri for this object.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->objectData['uri'];
-    }
-
-    /**
-     * Returns the ICalendar-formatted object.
-     *
-     * @return string
-     */
-    public function get()
-    {
-        // Pre-populating the 'calendardata' is optional, if we don't have it
-        // already we fetch it from the backend.
-        if (!isset($this->objectData['calendardata'])) {
-            $this->objectData = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
-        }
-
-        return $this->objectData['calendardata'];
-    }
-
-    /**
-     * Updates the ICalendar-formatted object.
-     *
-     * @param string|resource $calendarData
-     *
-     * @return string
-     */
-    public function put($calendarData)
-    {
-        if (is_resource($calendarData)) {
-            $calendarData = stream_get_contents($calendarData);
-        }
-        $etag = $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'], $this->objectData['uri'], $calendarData);
-        $this->objectData['calendardata'] = $calendarData;
-        $this->objectData['etag'] = $etag;
-
-        return $etag;
-    }
-
-    /**
-     * Deletes the calendar object.
-     */
-    public function delete()
-    {
-        $this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
-    }
-
-    /**
-     * Returns the mime content-type.
-     *
-     * @return string
-     */
-    public function getContentType()
-    {
-        $mime = 'text/calendar; charset=utf-8';
-        if (isset($this->objectData['component']) && $this->objectData['component']) {
-            $mime .= '; component='.$this->objectData['component'];
-        }
-
-        return $mime;
-    }
-
-    /**
-     * Returns an ETag for this object.
-     *
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * @return string
-     */
-    public function getETag()
-    {
-        if (isset($this->objectData['etag'])) {
-            return $this->objectData['etag'];
-        } else {
-            return '"'.md5($this->get()).'"';
-        }
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     *
-     * @return int
-     */
-    public function getLastModified()
-    {
-        return $this->objectData['lastmodified'];
-    }
-
-    /**
-     * Returns the size of this object in bytes.
-     *
-     * @return int
-     */
-    public function getSize()
-    {
-        if (array_key_exists('size', $this->objectData)) {
-            return $this->objectData['size'];
-        } else {
-            return strlen($this->get());
-        }
-    }
-
-    /**
-     * Returns the owner principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner()
-    {
-        return $this->calendarInfo['principaluri'];
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL()
-    {
-        // An alternative acl may be specified in the object data.
-        if (isset($this->objectData['acl'])) {
-            return $this->objectData['acl'];
-        }
-
-        // The default ACL
-        return [
-            [
-                'privilege' => '{DAV:}all',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}all',
-                'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-read',
-                'protected' => true,
-            ],
-        ];
-    }
+	use \Sabre\DAVACL\ACLTrait;
+
+	/**
+	 * Sabre\CalDAV\Backend\BackendInterface.
+	 *
+	 * @var Backend\AbstractBackend
+	 */
+	protected $caldavBackend;
+
+	/**
+	 * Array with information about this CalendarObject.
+	 *
+	 * @var array
+	 */
+	protected $objectData;
+
+	/**
+	 * Array with information about the containing calendar.
+	 *
+	 * @var array
+	 */
+	protected $calendarInfo;
+
+	/**
+	 * Constructor.
+	 *
+	 * The following properties may be passed within $objectData:
+	 *
+	 *   * calendarid - This must refer to a calendarid from a caldavBackend
+	 *   * uri - A unique uri. Only the 'basename' must be passed.
+	 *   * calendardata (optional) - The iCalendar data
+	 *   * etag - (optional) The etag for this object, MUST be encloded with
+	 *            double-quotes.
+	 *   * size - (optional) The size of the data in bytes.
+	 *   * lastmodified - (optional) format as a unix timestamp.
+	 *   * acl - (optional) Use this to override the default ACL for the node.
+	 */
+	public function __construct(Backend\BackendInterface $caldavBackend, array $calendarInfo, array $objectData)
+	{
+		$this->caldavBackend = $caldavBackend;
+
+		if (!isset($objectData['uri'])) {
+			throw new \InvalidArgumentException('The objectData argument must contain an \'uri\' property');
+		}
+
+		$this->calendarInfo = $calendarInfo;
+		$this->objectData = $objectData;
+	}
+
+	/**
+	 * Returns the uri for this object.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->objectData['uri'];
+	}
+
+	/**
+	 * Returns the ICalendar-formatted object.
+	 *
+	 * @return string
+	 */
+	public function get()
+	{
+		// Pre-populating the 'calendardata' is optional, if we don't have it
+		// already we fetch it from the backend.
+		if (!isset($this->objectData['calendardata'])) {
+			$this->objectData = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
+		}
+
+		return $this->objectData['calendardata'];
+	}
+
+	/**
+	 * Updates the ICalendar-formatted object.
+	 *
+	 * @param string|resource $calendarData
+	 *
+	 * @return string
+	 */
+	public function put($calendarData)
+	{
+		if (is_resource($calendarData)) {
+			$calendarData = stream_get_contents($calendarData);
+		}
+		$etag = $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'], $this->objectData['uri'], $calendarData);
+		$this->objectData['calendardata'] = $calendarData;
+		$this->objectData['etag'] = $etag;
+
+		return $etag;
+	}
+
+	/**
+	 * Deletes the calendar object.
+	 */
+	public function delete()
+	{
+		$this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
+	}
+
+	/**
+	 * Returns the mime content-type.
+	 *
+	 * @return string
+	 */
+	public function getContentType()
+	{
+		$mime = 'text/calendar; charset=utf-8';
+		if (isset($this->objectData['component']) && $this->objectData['component']) {
+			$mime .= '; component='.$this->objectData['component'];
+		}
+
+		return $mime;
+	}
+
+	/**
+	 * Returns an ETag for this object.
+	 *
+	 * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+	 *
+	 * @return string
+	 */
+	public function getETag()
+	{
+		if (isset($this->objectData['etag'])) {
+			return $this->objectData['etag'];
+		} else {
+			return '"'.md5($this->get()).'"';
+		}
+	}
+
+	/**
+	 * Returns the last modification date as a unix timestamp.
+	 *
+	 * @return int
+	 */
+	public function getLastModified()
+	{
+		return $this->objectData['lastmodified'];
+	}
+
+	/**
+	 * Returns the size of this object in bytes.
+	 *
+	 * @return int
+	 */
+	public function getSize()
+	{
+		if (array_key_exists('size', $this->objectData)) {
+			return $this->objectData['size'];
+		} else {
+			return strlen($this->get());
+		}
+	}
+
+	/**
+	 * Returns the owner principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner()
+	{
+		return $this->calendarInfo['principaluri'];
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL()
+	{
+		// An alternative acl may be specified in the object data.
+		if (isset($this->objectData['acl'])) {
+			return $this->objectData['acl'];
+		}
+
+		// The default ACL
+		return [
+			[
+				'privilege' => '{DAV:}all',
+				'principal' => $this->calendarInfo['principaluri'],
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}all',
+				'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-read',
+				'protected' => true,
+			],
+		];
+	}
 }

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

Indentation +9 added lines, -9 removed lines

@@ -15,13 +15,13 @@
  */
 interface ISharedCalendar extends ISharedNode
 {
-    /**
-     * Marks this calendar as published.
-     *
-     * Publishing a calendar should automatically create a read-only, public,
-     * subscribable calendar.
-     *
-     * @param bool $value
-     */
-    public function setPublishStatus($value);
+	/**
+	 * Marks this calendar as published.
+	 *
+	 * Publishing a calendar should automatically create a read-only, public,
+	 * subscribable calendar.
+	 *
+	 * @param bool $value
+	 */
+	public function setPublishStatus($value);
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Schedule/Outbox.php

Indentation +89 added lines, -89 removed lines

@@ -21,99 +21,99 @@
  */
 class Outbox extends DAV\Collection implements IOutbox
 {
-    use DAVACL\ACLTrait;
+	use DAVACL\ACLTrait;
 
-    /**
-     * The principal Uri.
-     *
-     * @var string
-     */
-    protected $principalUri;
+	/**
+	 * The principal Uri.
+	 *
+	 * @var string
+	 */
+	protected $principalUri;
 
-    /**
-     * Constructor.
-     *
-     * @param string $principalUri
-     */
-    public function __construct($principalUri)
-    {
-        $this->principalUri = $principalUri;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $principalUri
+	 */
+	public function __construct($principalUri)
+	{
+		$this->principalUri = $principalUri;
+	}
 
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'outbox';
-    }
+	/**
+	 * Returns the name of the node.
+	 *
+	 * This is used to generate the url.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return 'outbox';
+	}
 
-    /**
-     * Returns an array with all the child nodes.
-     *
-     * @return \Sabre\DAV\INode[]
-     */
-    public function getChildren()
-    {
-        return [];
-    }
+	/**
+	 * Returns an array with all the child nodes.
+	 *
+	 * @return \Sabre\DAV\INode[]
+	 */
+	public function getChildren()
+	{
+		return [];
+	}
 
-    /**
-     * Returns the owner principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner()
-    {
-        return $this->principalUri;
-    }
+	/**
+	 * Returns the owner principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner()
+	{
+		return $this->principalUri;
+	}
 
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL()
-    {
-        return [
-            [
-                'privilege' => '{'.CalDAV\Plugin::NS_CALDAV.'}schedule-send',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{'.CalDAV\Plugin::NS_CALDAV.'}schedule-send',
-                'principal' => $this->getOwner().'/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner().'/calendar-proxy-read',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner().'/calendar-proxy-write',
-                'protected' => true,
-            ],
-        ];
-    }
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL()
+	{
+		return [
+			[
+				'privilege' => '{'.CalDAV\Plugin::NS_CALDAV.'}schedule-send',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{'.CalDAV\Plugin::NS_CALDAV.'}schedule-send',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
+				'protected' => true,
+			],
+		];
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Schedule/Inbox.php

Indentation +176 added lines, -176 removed lines

@@ -19,180 +19,180 @@
  */
 class Inbox extends DAV\Collection implements IInbox
 {
-    use DAVACL\ACLTrait;
-
-    /**
-     * CalDAV backend.
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $caldavBackend;
-
-    /**
-     * The principal Uri.
-     *
-     * @var string
-     */
-    protected $principalUri;
-
-    /**
-     * Constructor.
-     *
-     * @param string $principalUri
-     */
-    public function __construct(Backend\SchedulingSupport $caldavBackend, $principalUri)
-    {
-        $this->caldavBackend = $caldavBackend;
-        $this->principalUri = $principalUri;
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'inbox';
-    }
-
-    /**
-     * Returns an array with all the child nodes.
-     *
-     * @return \Sabre\DAV\INode[]
-     */
-    public function getChildren()
-    {
-        $objs = $this->caldavBackend->getSchedulingObjects($this->principalUri);
-        $children = [];
-        foreach ($objs as $obj) {
-            //$obj['acl'] = $this->getACL();
-            $obj['principaluri'] = $this->principalUri;
-            $children[] = new SchedulingObject($this->caldavBackend, $obj);
-        }
-
-        return $children;
-    }
-
-    /**
-     * Creates a new file in the directory.
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After successful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string          $name Name of the file
-     * @param resource|string $data Initial payload
-     *
-     * @return string|null
-     */
-    public function createFile($name, $data = null)
-    {
-        $this->caldavBackend->createSchedulingObject($this->principalUri, $name, $data);
-    }
-
-    /**
-     * Returns the owner principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner()
-    {
-        return $this->principalUri;
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL()
-    {
-        return [
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => '{DAV:}authenticated',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write-properties',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}unbind',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}unbind',
-                'principal' => $this->getOwner().'/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{'.CalDAV\Plugin::NS_CALDAV.'}schedule-deliver',
-                'principal' => '{DAV:}authenticated',
-                'protected' => true,
-            ],
-        ];
-    }
-
-    /**
-     * 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.
-     *
-     * @return array
-     */
-    public function calendarQuery(array $filters)
-    {
-        $result = [];
-        $validator = new CalDAV\CalendarQueryValidator();
-
-        $objects = $this->caldavBackend->getSchedulingObjects($this->principalUri);
-        foreach ($objects as $object) {
-            $vObject = VObject\Reader::read($object['calendardata']);
-            if ($validator->validate($vObject, $filters)) {
-                $result[] = $object['uri'];
-            }
-
-            // Destroy circular references to PHP will GC the object.
-            $vObject->destroy();
-        }
-
-        return $result;
-    }
+	use DAVACL\ACLTrait;
+
+	/**
+	 * CalDAV backend.
+	 *
+	 * @var Backend\BackendInterface
+	 */
+	protected $caldavBackend;
+
+	/**
+	 * The principal Uri.
+	 *
+	 * @var string
+	 */
+	protected $principalUri;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $principalUri
+	 */
+	public function __construct(Backend\SchedulingSupport $caldavBackend, $principalUri)
+	{
+		$this->caldavBackend = $caldavBackend;
+		$this->principalUri = $principalUri;
+	}
+
+	/**
+	 * Returns the name of the node.
+	 *
+	 * This is used to generate the url.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return 'inbox';
+	}
+
+	/**
+	 * Returns an array with all the child nodes.
+	 *
+	 * @return \Sabre\DAV\INode[]
+	 */
+	public function getChildren()
+	{
+		$objs = $this->caldavBackend->getSchedulingObjects($this->principalUri);
+		$children = [];
+		foreach ($objs as $obj) {
+			//$obj['acl'] = $this->getACL();
+			$obj['principaluri'] = $this->principalUri;
+			$children[] = new SchedulingObject($this->caldavBackend, $obj);
+		}
+
+		return $children;
+	}
+
+	/**
+	 * Creates a new file in the directory.
+	 *
+	 * Data will either be supplied as a stream resource, or in certain cases
+	 * as a string. Keep in mind that you may have to support either.
+	 *
+	 * After successful creation of the file, you may choose to return the ETag
+	 * of the new file here.
+	 *
+	 * The returned ETag must be surrounded by double-quotes (The quotes should
+	 * be part of the actual string).
+	 *
+	 * If you cannot accurately determine the ETag, you should not return it.
+	 * If you don't store the file exactly as-is (you're transforming it
+	 * somehow) you should also not return an ETag.
+	 *
+	 * This means that if a subsequent GET to this new file does not exactly
+	 * return the same contents of what was submitted here, you are strongly
+	 * recommended to omit the ETag.
+	 *
+	 * @param string          $name Name of the file
+	 * @param resource|string $data Initial payload
+	 *
+	 * @return string|null
+	 */
+	public function createFile($name, $data = null)
+	{
+		$this->caldavBackend->createSchedulingObject($this->principalUri, $name, $data);
+	}
+
+	/**
+	 * Returns the owner principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner()
+	{
+		return $this->principalUri;
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL()
+	{
+		return [
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => '{DAV:}authenticated',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}write-properties',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}unbind',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}unbind',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{'.CalDAV\Plugin::NS_CALDAV.'}schedule-deliver',
+				'principal' => '{DAV:}authenticated',
+				'protected' => true,
+			],
+		];
+	}
+
+	/**
+	 * 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.
+	 *
+	 * @return array
+	 */
+	public function calendarQuery(array $filters)
+	{
+		$result = [];
+		$validator = new CalDAV\CalendarQueryValidator();
+
+		$objects = $this->caldavBackend->getSchedulingObjects($this->principalUri);
+		foreach ($objects as $object) {
+			$vObject = VObject\Reader::read($object['calendardata']);
+			if ($validator->validate($vObject, $filters)) {
+				$result[] = $object['uri'];
+			}
+
+			// Destroy circular references to PHP will GC the object.
+			$vObject->destroy();
+		}
+
+		return $result;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php

Indentation +102 added lines, -102 removed lines

@@ -16,115 +16,115 @@
  */
 class SchedulingObject extends \Sabre\CalDAV\CalendarObject implements ISchedulingObject
 {
-    /**
-     * Constructor.
-     *
-     * The following properties may be passed within $objectData:
-     *
-     *   * uri - A unique uri. Only the 'basename' must be passed.
-     *   * principaluri - the principal that owns the object.
-     *   * calendardata (optional) - The iCalendar data
-     *   * etag - (optional) The etag for this object, MUST be encloded with
-     *            double-quotes.
-     *   * size - (optional) The size of the data in bytes.
-     *   * lastmodified - (optional) format as a unix timestamp.
-     *   * acl - (optional) Use this to override the default ACL for the node.
-     */
-    public function __construct(Backend\SchedulingSupport $caldavBackend, array $objectData)
-    {
-        parent::__construct($caldavBackend, [], $objectData);
+	/**
+	 * Constructor.
+	 *
+	 * The following properties may be passed within $objectData:
+	 *
+	 *   * uri - A unique uri. Only the 'basename' must be passed.
+	 *   * principaluri - the principal that owns the object.
+	 *   * calendardata (optional) - The iCalendar data
+	 *   * etag - (optional) The etag for this object, MUST be encloded with
+	 *            double-quotes.
+	 *   * size - (optional) The size of the data in bytes.
+	 *   * lastmodified - (optional) format as a unix timestamp.
+	 *   * acl - (optional) Use this to override the default ACL for the node.
+	 */
+	public function __construct(Backend\SchedulingSupport $caldavBackend, array $objectData)
+	{
+		parent::__construct($caldavBackend, [], $objectData);
 
-        if (!isset($objectData['uri'])) {
-            throw new \InvalidArgumentException('The objectData argument must contain an \'uri\' property');
-        }
-    }
+		if (!isset($objectData['uri'])) {
+			throw new \InvalidArgumentException('The objectData argument must contain an \'uri\' property');
+		}
+	}
 
-    /**
-     * Returns the ICalendar-formatted object.
-     *
-     * @return string
-     */
-    public function get()
-    {
-        // Pre-populating the 'calendardata' is optional, if we don't have it
-        // already we fetch it from the backend.
-        if (!isset($this->objectData['calendardata'])) {
-            $this->objectData = $this->caldavBackend->getSchedulingObject($this->objectData['principaluri'], $this->objectData['uri']);
-        }
+	/**
+	 * Returns the ICalendar-formatted object.
+	 *
+	 * @return string
+	 */
+	public function get()
+	{
+		// Pre-populating the 'calendardata' is optional, if we don't have it
+		// already we fetch it from the backend.
+		if (!isset($this->objectData['calendardata'])) {
+			$this->objectData = $this->caldavBackend->getSchedulingObject($this->objectData['principaluri'], $this->objectData['uri']);
+		}
 
-        return $this->objectData['calendardata'];
-    }
+		return $this->objectData['calendardata'];
+	}
 
-    /**
-     * Updates the ICalendar-formatted object.
-     *
-     * @param string|resource $calendarData
-     *
-     * @return string
-     */
-    public function put($calendarData)
-    {
-        throw new MethodNotAllowed('Updating scheduling objects is not supported');
-    }
+	/**
+	 * Updates the ICalendar-formatted object.
+	 *
+	 * @param string|resource $calendarData
+	 *
+	 * @return string
+	 */
+	public function put($calendarData)
+	{
+		throw new MethodNotAllowed('Updating scheduling objects is not supported');
+	}
 
-    /**
-     * Deletes the scheduling message.
-     */
-    public function delete()
-    {
-        $this->caldavBackend->deleteSchedulingObject($this->objectData['principaluri'], $this->objectData['uri']);
-    }
+	/**
+	 * Deletes the scheduling message.
+	 */
+	public function delete()
+	{
+		$this->caldavBackend->deleteSchedulingObject($this->objectData['principaluri'], $this->objectData['uri']);
+	}
 
-    /**
-     * Returns the owner principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner()
-    {
-        return $this->objectData['principaluri'];
-    }
+	/**
+	 * Returns the owner principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner()
+	{
+		return $this->objectData['principaluri'];
+	}
 
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL()
-    {
-        // An alternative acl may be specified in the object data.
-        //
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL()
+	{
+		// An alternative acl may be specified in the object data.
+		//
 
-        if (isset($this->objectData['acl'])) {
-            return $this->objectData['acl'];
-        }
+		if (isset($this->objectData['acl'])) {
+			return $this->objectData['acl'];
+		}
 
-        // The default ACL
-        return [
-            [
-                'privilege' => '{DAV:}all',
-                'principal' => '{DAV:}owner',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}all',
-                'principal' => $this->objectData['principaluri'].'/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->objectData['principaluri'].'/calendar-proxy-read',
-                'protected' => true,
-            ],
-        ];
-    }
+		// The default ACL
+		return [
+			[
+				'privilege' => '{DAV:}all',
+				'principal' => '{DAV:}owner',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}all',
+				'principal' => $this->objectData['principaluri'].'/calendar-proxy-write',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->objectData['principaluri'].'/calendar-proxy-read',
+				'protected' => true,
+			],
+		];
+	}
 }

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

Indentation +849 added lines, -849 removed lines

@@ -25,683 +25,683 @@ 
  */
 class Plugin extends DAV\ServerPlugin
 {
-    /**
-     * Url to the addressbooks.
-     */
-    const ADDRESSBOOK_ROOT = 'addressbooks';
-
-    /**
-     * xml namespace for CardDAV elements.
-     */
-    const NS_CARDDAV = 'urn:ietf:params:xml:ns:carddav';
-
-    /**
-     * Add urls to this property to have them automatically exposed as
-     * 'directories' to the user.
-     *
-     * @var array
-     */
-    public $directories = [];
-
-    /**
-     * Server class.
-     *
-     * @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;
-
-    /**
-     * Initializes the plugin.
-     */
-    public function initialize(DAV\Server $server)
-    {
-        /* Events */
-        $server->on('propFind', [$this, 'propFindEarly']);
-        $server->on('propFind', [$this, 'propFindLate'], 150);
-        $server->on('report', [$this, 'report']);
-        $server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel']);
-        $server->on('beforeWriteContent', [$this, 'beforeWriteContent']);
-        $server->on('beforeCreateFile', [$this, 'beforeCreateFile']);
-        $server->on('afterMethod:GET', [$this, 'httpAfterGet']);
-
-        $server->xml->namespaceMap[self::NS_CARDDAV] = 'card';
-
-        $server->xml->elementMap['{'.self::NS_CARDDAV.'}addressbook-query'] = 'Sabre\\CardDAV\\Xml\\Request\\AddressBookQueryReport';
-        $server->xml->elementMap['{'.self::NS_CARDDAV.'}addressbook-multiget'] = 'Sabre\\CardDAV\\Xml\\Request\\AddressBookMultiGetReport';
-
-        /* Mapping Interfaces to {DAV:}resourcetype values */
-        $server->resourceTypeMapping['Sabre\\CardDAV\\IAddressBook'] = '{'.self::NS_CARDDAV.'}addressbook';
-        $server->resourceTypeMapping['Sabre\\CardDAV\\IDirectory'] = '{'.self::NS_CARDDAV.'}directory';
-
-        /* Adding properties that may never be changed */
-        $server->protectedProperties[] = '{'.self::NS_CARDDAV.'}supported-address-data';
-        $server->protectedProperties[] = '{'.self::NS_CARDDAV.'}max-resource-size';
-        $server->protectedProperties[] = '{'.self::NS_CARDDAV.'}addressbook-home-set';
-        $server->protectedProperties[] = '{'.self::NS_CARDDAV.'}supported-collation-set';
-
-        $server->xml->elementMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre\\DAV\\Xml\\Property\\Href';
-
-        $this->server = $server;
-    }
-
-    /**
-     * Returns a list of supported features.
-     *
-     * This is used in the DAV: header in the OPTIONS and PROPFIND requests.
-     *
-     * @return array
-     */
-    public function getFeatures()
-    {
-        return ['addressbook'];
-    }
-
-    /**
-     * 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);
-        if ($node instanceof IAddressBook || $node instanceof ICard) {
-            return [
-                 '{'.self::NS_CARDDAV.'}addressbook-multiget',
-                 '{'.self::NS_CARDDAV.'}addressbook-query',
-            ];
-        }
-
-        return [];
-    }
-
-    /**
-     * Adds all CardDAV-specific properties.
-     */
-    public function propFindEarly(DAV\PropFind $propFind, DAV\INode $node)
-    {
-        $ns = '{'.self::NS_CARDDAV.'}';
-
-        if ($node instanceof IAddressBook) {
-            $propFind->handle($ns.'max-resource-size', $this->maxResourceSize);
-            $propFind->handle($ns.'supported-address-data', function () {
-                return new Xml\Property\SupportedAddressData();
-            });
-            $propFind->handle($ns.'supported-collation-set', function () {
-                return new Xml\Property\SupportedCollationSet();
-            });
-        }
-        if ($node instanceof DAVACL\IPrincipal) {
-            $path = $propFind->getPath();
-
-            $propFind->handle('{'.self::NS_CARDDAV.'}addressbook-home-set', function () use ($path) {
-                return new LocalHref($this->getAddressBookHomeForPrincipal($path).'/');
-            });
-
-            if ($this->directories) {
-                $propFind->handle('{'.self::NS_CARDDAV.'}directory-gateway', function () {
-                    return new LocalHref($this->directories);
-                });
-            }
-        }
-
-        if ($node instanceof ICard) {
-            // The address-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_CARDDAV.'}address-data', function () use ($node) {
-                $val = $node->get();
-                if (is_resource($val)) {
-                    $val = stream_get_contents($val);
-                }
-
-                return $val;
-            });
-        }
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CardDAV.
-     *
-     * @param string   $reportName
-     * @param \DOMNode $dom
-     * @param mixed    $path
-     *
-     * @return bool
-     */
-    public function report($reportName, $dom, $path)
-    {
-        switch ($reportName) {
-            case '{'.self::NS_CARDDAV.'}addressbook-multiget':
-                $this->server->transactionType = 'report-addressbook-multiget';
-                $this->addressbookMultiGetReport($dom);
-
-                return false;
-            case '{'.self::NS_CARDDAV.'}addressbook-query':
-                $this->server->transactionType = 'report-addressbook-query';
-                $this->addressBookQueryReport($dom);
-
-                return false;
-            default:
-                return;
-        }
-    }
-
-    /**
-     * Returns the addressbook home for a given principal.
-     *
-     * @param string $principal
-     *
-     * @return string
-     */
-    protected function getAddressbookHomeForPrincipal($principal)
-    {
-        list(, $principalId) = Uri\split($principal);
-
-        return self::ADDRESSBOOK_ROOT.'/'.$principalId;
-    }
-
-    /**
-     * This function handles the addressbook-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 Xml\Request\AddressBookMultiGetReport $report
-     */
-    public function addressbookMultiGetReport($report)
-    {
-        $contentType = $report->contentType;
-        $version = $report->version;
-        if ($version) {
-            $contentType .= '; version='.$version;
-        }
-
-        $vcardType = $this->negotiateVCard(
-            $contentType
-        );
-
-        $propertyList = [];
-        $paths = array_map(
-            [$this->server, 'calculateUri'],
-            $report->hrefs
-        );
-        foreach ($this->server->getPropertiesForMultiplePaths($paths, $report->properties) as $props) {
-            if (isset($props['200']['{'.self::NS_CARDDAV.'}address-data'])) {
-                $props['200']['{'.self::NS_CARDDAV.'}address-data'] = $this->convertVCard(
-                    $props[200]['{'.self::NS_CARDDAV.'}address-data'],
-                    $vcardType
-                );
-            }
-            $propertyList[] = $props;
-        }
-
-        $prefer = $this->server->getHTTPPrefer();
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($propertyList, 'minimal' === $prefer['return']));
-    }
-
-    /**
-     * This method is triggered before a file gets updated with new content.
-     *
-     * This plugin uses this method to ensure that Card nodes receive valid
-     * vcard data.
-     *
-     * @param string   $path
-     * @param resource $data
-     * @param bool     $modified should be set to true, if this event handler
-     *                           changed &$data
-     */
-    public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified)
-    {
-        if (!$node instanceof ICard) {
-            return;
-        }
-
-        $this->validateVCard($data, $modified);
-    }
-
-    /**
-     * This method is triggered before a new file is created.
-     *
-     * This plugin uses this method to ensure that Card nodes receive valid
-     * vcard data.
-     *
-     * @param string   $path
-     * @param resource $data
-     * @param bool     $modified should be set to true, if this event handler
-     *                           changed &$data
-     */
-    public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified)
-    {
-        if (!$parentNode instanceof IAddressBook) {
-            return;
-        }
-
-        $this->validateVCard($data, $modified);
-    }
-
-    /**
-     * Checks if the submitted iCalendar data is in fact, valid.
-     *
-     * An exception is thrown if it's not.
-     *
-     * @param resource|string $data
-     * @param bool            $modified should be set to true, if this event handler
-     *                                  changed &$data
-     */
-    protected function validateVCard(&$data, &$modified)
-    {
-        // If it's a stream, we convert it to a string first.
-        if (is_resource($data)) {
-            $data = stream_get_contents($data);
-        }
-
-        $before = $data;
-
-        try {
-            // If the data starts with a [, we can reasonably assume we're dealing
-            // with a jCal object.
-            if ('[' === substr($data, 0, 1)) {
-                $vobj = VObject\Reader::readJson($data);
-
-                // Converting $data back to iCalendar, as that's what we
-                // technically support everywhere.
-                $data = $vobj->serialize();
-                $modified = true;
-            } else {
-                $vobj = VObject\Reader::read($data);
-            }
-        } catch (VObject\ParseException $e) {
-            throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid vCard or jCard data. Parse error: '.$e->getMessage());
-        }
-
-        if ('VCARD' !== $vobj->name) {
-            throw new DAV\Exception\UnsupportedMediaType('This collection can only support vcard objects.');
-        }
-
-        $options = VObject\Node::PROFILE_CARDDAV;
-        $prefer = $this->server->getHTTPPrefer();
-
-        if ('strict' !== $prefer['handling']) {
-            $options |= VObject\Node::REPAIR;
-        }
-
-        $messages = $vobj->validate($options);
-
-        $highestLevel = 0;
-        $warningMessage = null;
-
-        // $messages contains a list of problems with the vcard, along with
-        // their severity.
-        foreach ($messages as $message) {
-            if ($message['level'] > $highestLevel) {
-                // Recording the highest reported error level.
-                $highestLevel = $message['level'];
-                $warningMessage = $message['message'];
-            }
-
-            switch ($message['level']) {
-                case 1:
-                    // Level 1 means that there was a problem, but it was repaired.
-                    $modified = true;
-                    break;
-                case 2:
-                    // Level 2 means a warning, but not critical
-                    break;
-                case 3:
-                    // Level 3 means a critical error
-                    throw new DAV\Exception\UnsupportedMediaType('Validation error in vCard: '.$message['message']);
-            }
-        }
-        if ($warningMessage) {
-            $this->server->httpResponse->setHeader(
-                'X-Sabre-Ew-Gross',
-                'vCard validation warning: '.$warningMessage
-            );
-
-            // Re-serializing object.
-            $data = $vobj->serialize();
-            if (!$modified && 0 !== strcmp($data, $before)) {
-                // This ensures that the system does not send an ETag back.
-                $modified = true;
-            }
-        }
-
-        // Destroy circular references to PHP will GC the object.
-        $vobj->destroy();
-    }
-
-    /**
-     * This function handles the addressbook-query REPORT.
-     *
-     * This report is used by the client to filter an addressbook based on a
-     * complex query.
-     *
-     * @param Xml\Request\AddressBookQueryReport $report
-     */
-    protected function addressbookQueryReport($report)
-    {
-        $depth = $this->server->getHTTPDepth(0);
-
-        if (0 == $depth) {
-            $candidateNodes = [
-                $this->server->tree->getNodeForPath($this->server->getRequestUri()),
-            ];
-            if (!$candidateNodes[0] instanceof ICard) {
-                throw new ReportNotSupported('The addressbook-query report is not supported on this url with Depth: 0');
-            }
-        } else {
-            $candidateNodes = $this->server->tree->getChildren($this->server->getRequestUri());
-        }
-
-        $contentType = $report->contentType;
-        if ($report->version) {
-            $contentType .= '; version='.$report->version;
-        }
-
-        $vcardType = $this->negotiateVCard(
-            $contentType
-        );
-
-        $validNodes = [];
-        foreach ($candidateNodes as $node) {
-            if (!$node instanceof ICard) {
-                continue;
-            }
-
-            $blob = $node->get();
-            if (is_resource($blob)) {
-                $blob = stream_get_contents($blob);
-            }
-
-            if (!$this->validateFilters($blob, $report->filters, $report->test)) {
-                continue;
-            }
-
-            $validNodes[] = $node;
-
-            if ($report->limit && $report->limit <= count($validNodes)) {
-                // We hit the maximum number of items, we can stop now.
-                break;
-            }
-        }
-
-        $result = [];
-        foreach ($validNodes as $validNode) {
-            if (0 == $depth) {
-                $href = $this->server->getRequestUri();
-            } else {
-                $href = $this->server->getRequestUri().'/'.$validNode->getName();
-            }
-
-            list($props) = $this->server->getPropertiesForPath($href, $report->properties, 0);
-
-            if (isset($props[200]['{'.self::NS_CARDDAV.'}address-data'])) {
-                $props[200]['{'.self::NS_CARDDAV.'}address-data'] = $this->convertVCard(
-                    $props[200]['{'.self::NS_CARDDAV.'}address-data'],
-                    $vcardType,
-                    $report->addressDataProperties
-                );
-            }
-            $result[] = $props;
-        }
-
-        $prefer = $this->server->getHTTPPrefer();
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, 'minimal' === $prefer['return']));
-    }
-
-    /**
-     * Validates if a vcard makes it throught a list of filters.
-     *
-     * @param string $vcardData
-     * @param string $test      anyof or allof (which means OR or AND)
-     *
-     * @return bool
-     */
-    public function validateFilters($vcardData, array $filters, $test)
-    {
-        if (!$filters) {
-            return true;
-        }
-        $vcard = VObject\Reader::read($vcardData);
-
-        foreach ($filters as $filter) {
-            $isDefined = isset($vcard->{$filter['name']});
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    $success = false;
-                } else {
-                    $success = true;
-                }
-            } elseif ((!$filter['param-filters'] && !$filter['text-matches']) || !$isDefined) {
-                // We only need to check for existence
-                $success = $isDefined;
-            } else {
-                $vProperties = $vcard->select($filter['name']);
-
-                $results = [];
-                if ($filter['param-filters']) {
-                    $results[] = $this->validateParamFilters($vProperties, $filter['param-filters'], $filter['test']);
-                }
-                if ($filter['text-matches']) {
-                    $texts = [];
-                    foreach ($vProperties as $vProperty) {
-                        $texts[] = $vProperty->getValue();
-                    }
-
-                    $results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
-                }
-
-                if (1 === count($results)) {
-                    $success = $results[0];
-                } else {
-                    if ('anyof' === $filter['test']) {
-                        $success = $results[0] || $results[1];
-                    } else {
-                        $success = $results[0] && $results[1];
-                    }
-                }
-            } // else
-
-            // There are two conditions where we can already determine whether
-            // or not this filter succeeds.
-            if ('anyof' === $test && $success) {
-                // Destroy circular references to PHP will GC the object.
-                $vcard->destroy();
-
-                return true;
-            }
-            if ('allof' === $test && !$success) {
-                // Destroy circular references to PHP will GC the object.
-                $vcard->destroy();
-
-                return false;
-            }
-        } // foreach
-
-        // Destroy circular references to PHP will GC the object.
-        $vcard->destroy();
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return 'allof' === $test;
-    }
-
-    /**
-     * Validates if a param-filter can be applied to a specific property.
-     *
-     * @todo currently we're only validating the first parameter of the passed
-     *       property. Any subsequence parameters with the same name are
-     *       ignored.
-     *
-     * @param string $test
-     *
-     * @return bool
-     */
-    protected function validateParamFilters(array $vProperties, array $filters, $test)
-    {
-        foreach ($filters as $filter) {
-            $isDefined = false;
-            foreach ($vProperties as $vProperty) {
-                $isDefined = isset($vProperty[$filter['name']]);
-                if ($isDefined) {
-                    break;
-                }
-            }
-
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    $success = false;
-                } else {
-                    $success = true;
-                }
-
-                // If there's no text-match, we can just check for existence
-            } elseif (!$filter['text-match'] || !$isDefined) {
-                $success = $isDefined;
-            } else {
-                $success = false;
-                foreach ($vProperties as $vProperty) {
-                    // If we got all the way here, we'll need to validate the
-                    // text-match filter.
-                    if (isset($vProperty[$filter['name']])) {
-                        $success = DAV\StringUtil::textMatch(
-                            $vProperty[$filter['name']]->getValue(),
-                            $filter['text-match']['value'],
-                            $filter['text-match']['collation'],
-                            $filter['text-match']['match-type']
-                        );
-                        if ($filter['text-match']['negate-condition']) {
-                            $success = !$success;
-                        }
-                    }
-                    if ($success) {
-                        break;
-                    }
-                }
-            } // else
-
-            // There are two conditions where we can already determine whether
-            // or not this filter succeeds.
-            if ('anyof' === $test && $success) {
-                return true;
-            }
-            if ('allof' === $test && !$success) {
-                return false;
-            }
-        }
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return 'allof' === $test;
-    }
-
-    /**
-     * Validates if a text-filter can be applied to a specific property.
-     *
-     * @param string $test
-     *
-     * @return bool
-     */
-    protected function validateTextMatches(array $texts, array $filters, $test)
-    {
-        foreach ($filters as $filter) {
-            $success = false;
-            foreach ($texts as $haystack) {
-                $success = DAV\StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
-                if ($filter['negate-condition']) {
-                    $success = !$success;
-                }
-
-                // Breaking on the first match
-                if ($success) {
-                    break;
-                }
-            }
-
-            if ($success && 'anyof' === $test) {
-                return true;
-            }
-
-            if (!$success && 'allof' == $test) {
-                return false;
-            }
-        }
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return 'allof' === $test;
-    }
-
-    /**
-     * This event is triggered when fetching properties.
-     *
-     * This event is scheduled late in the process, after most work for
-     * propfind has been done.
-     */
-    public function propFindLate(DAV\PropFind $propFind, DAV\INode $node)
-    {
-        // If the request was made using the SOGO connector, we must rewrite
-        // the content-type property. By default SabreDAV will send back
-        // text/x-vcard; charset=utf-8, but for SOGO we must strip that last
-        // part.
-        if (false === strpos((string) $this->server->httpRequest->getHeader('User-Agent'), 'Thunderbird')) {
-            return;
-        }
-        $contentType = $propFind->get('{DAV:}getcontenttype');
-        if (null !== $contentType) {
-            list($part) = explode(';', $contentType);
-            if ('text/x-vcard' === $part || 'text/vcard' === $part) {
-                $propFind->set('{DAV:}getcontenttype', 'text/x-vcard');
-            }
-        }
-    }
-
-    /**
-     * This method is used to generate HTML output for the
-     * Sabre\DAV\Browser\Plugin. This allows us to generate an interface users
-     * can use to create new addressbooks.
-     *
-     * @param string $output
-     *
-     * @return bool
-     */
-    public function htmlActionsPanel(DAV\INode $node, &$output)
-    {
-        if (!$node instanceof AddressBookHome) {
-            return;
-        }
-
-        $output .= '<tr><td colspan="2"><form method="post" action="">
+	/**
+	 * Url to the addressbooks.
+	 */
+	const ADDRESSBOOK_ROOT = 'addressbooks';
+
+	/**
+	 * xml namespace for CardDAV elements.
+	 */
+	const NS_CARDDAV = 'urn:ietf:params:xml:ns:carddav';
+
+	/**
+	 * Add urls to this property to have them automatically exposed as
+	 * 'directories' to the user.
+	 *
+	 * @var array
+	 */
+	public $directories = [];
+
+	/**
+	 * Server class.
+	 *
+	 * @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;
+
+	/**
+	 * Initializes the plugin.
+	 */
+	public function initialize(DAV\Server $server)
+	{
+		/* Events */
+		$server->on('propFind', [$this, 'propFindEarly']);
+		$server->on('propFind', [$this, 'propFindLate'], 150);
+		$server->on('report', [$this, 'report']);
+		$server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel']);
+		$server->on('beforeWriteContent', [$this, 'beforeWriteContent']);
+		$server->on('beforeCreateFile', [$this, 'beforeCreateFile']);
+		$server->on('afterMethod:GET', [$this, 'httpAfterGet']);
+
+		$server->xml->namespaceMap[self::NS_CARDDAV] = 'card';
+
+		$server->xml->elementMap['{'.self::NS_CARDDAV.'}addressbook-query'] = 'Sabre\\CardDAV\\Xml\\Request\\AddressBookQueryReport';
+		$server->xml->elementMap['{'.self::NS_CARDDAV.'}addressbook-multiget'] = 'Sabre\\CardDAV\\Xml\\Request\\AddressBookMultiGetReport';
+
+		/* Mapping Interfaces to {DAV:}resourcetype values */
+		$server->resourceTypeMapping['Sabre\\CardDAV\\IAddressBook'] = '{'.self::NS_CARDDAV.'}addressbook';
+		$server->resourceTypeMapping['Sabre\\CardDAV\\IDirectory'] = '{'.self::NS_CARDDAV.'}directory';
+
+		/* Adding properties that may never be changed */
+		$server->protectedProperties[] = '{'.self::NS_CARDDAV.'}supported-address-data';
+		$server->protectedProperties[] = '{'.self::NS_CARDDAV.'}max-resource-size';
+		$server->protectedProperties[] = '{'.self::NS_CARDDAV.'}addressbook-home-set';
+		$server->protectedProperties[] = '{'.self::NS_CARDDAV.'}supported-collation-set';
+
+		$server->xml->elementMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre\\DAV\\Xml\\Property\\Href';
+
+		$this->server = $server;
+	}
+
+	/**
+	 * Returns a list of supported features.
+	 *
+	 * This is used in the DAV: header in the OPTIONS and PROPFIND requests.
+	 *
+	 * @return array
+	 */
+	public function getFeatures()
+	{
+		return ['addressbook'];
+	}
+
+	/**
+	 * 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);
+		if ($node instanceof IAddressBook || $node instanceof ICard) {
+			return [
+				 '{'.self::NS_CARDDAV.'}addressbook-multiget',
+				 '{'.self::NS_CARDDAV.'}addressbook-query',
+			];
+		}
+
+		return [];
+	}
+
+	/**
+	 * Adds all CardDAV-specific properties.
+	 */
+	public function propFindEarly(DAV\PropFind $propFind, DAV\INode $node)
+	{
+		$ns = '{'.self::NS_CARDDAV.'}';
+
+		if ($node instanceof IAddressBook) {
+			$propFind->handle($ns.'max-resource-size', $this->maxResourceSize);
+			$propFind->handle($ns.'supported-address-data', function () {
+				return new Xml\Property\SupportedAddressData();
+			});
+			$propFind->handle($ns.'supported-collation-set', function () {
+				return new Xml\Property\SupportedCollationSet();
+			});
+		}
+		if ($node instanceof DAVACL\IPrincipal) {
+			$path = $propFind->getPath();
+
+			$propFind->handle('{'.self::NS_CARDDAV.'}addressbook-home-set', function () use ($path) {
+				return new LocalHref($this->getAddressBookHomeForPrincipal($path).'/');
+			});
+
+			if ($this->directories) {
+				$propFind->handle('{'.self::NS_CARDDAV.'}directory-gateway', function () {
+					return new LocalHref($this->directories);
+				});
+			}
+		}
+
+		if ($node instanceof ICard) {
+			// The address-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_CARDDAV.'}address-data', function () use ($node) {
+				$val = $node->get();
+				if (is_resource($val)) {
+					$val = stream_get_contents($val);
+				}
+
+				return $val;
+			});
+		}
+	}
+
+	/**
+	 * This functions handles REPORT requests specific to CardDAV.
+	 *
+	 * @param string   $reportName
+	 * @param \DOMNode $dom
+	 * @param mixed    $path
+	 *
+	 * @return bool
+	 */
+	public function report($reportName, $dom, $path)
+	{
+		switch ($reportName) {
+			case '{'.self::NS_CARDDAV.'}addressbook-multiget':
+				$this->server->transactionType = 'report-addressbook-multiget';
+				$this->addressbookMultiGetReport($dom);
+
+				return false;
+			case '{'.self::NS_CARDDAV.'}addressbook-query':
+				$this->server->transactionType = 'report-addressbook-query';
+				$this->addressBookQueryReport($dom);
+
+				return false;
+			default:
+				return;
+		}
+	}
+
+	/**
+	 * Returns the addressbook home for a given principal.
+	 *
+	 * @param string $principal
+	 *
+	 * @return string
+	 */
+	protected function getAddressbookHomeForPrincipal($principal)
+	{
+		list(, $principalId) = Uri\split($principal);
+
+		return self::ADDRESSBOOK_ROOT.'/'.$principalId;
+	}
+
+	/**
+	 * This function handles the addressbook-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 Xml\Request\AddressBookMultiGetReport $report
+	 */
+	public function addressbookMultiGetReport($report)
+	{
+		$contentType = $report->contentType;
+		$version = $report->version;
+		if ($version) {
+			$contentType .= '; version='.$version;
+		}
+
+		$vcardType = $this->negotiateVCard(
+			$contentType
+		);
+
+		$propertyList = [];
+		$paths = array_map(
+			[$this->server, 'calculateUri'],
+			$report->hrefs
+		);
+		foreach ($this->server->getPropertiesForMultiplePaths($paths, $report->properties) as $props) {
+			if (isset($props['200']['{'.self::NS_CARDDAV.'}address-data'])) {
+				$props['200']['{'.self::NS_CARDDAV.'}address-data'] = $this->convertVCard(
+					$props[200]['{'.self::NS_CARDDAV.'}address-data'],
+					$vcardType
+				);
+			}
+			$propertyList[] = $props;
+		}
+
+		$prefer = $this->server->getHTTPPrefer();
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+		$this->server->httpResponse->setBody($this->server->generateMultiStatus($propertyList, 'minimal' === $prefer['return']));
+	}
+
+	/**
+	 * This method is triggered before a file gets updated with new content.
+	 *
+	 * This plugin uses this method to ensure that Card nodes receive valid
+	 * vcard data.
+	 *
+	 * @param string   $path
+	 * @param resource $data
+	 * @param bool     $modified should be set to true, if this event handler
+	 *                           changed &$data
+	 */
+	public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified)
+	{
+		if (!$node instanceof ICard) {
+			return;
+		}
+
+		$this->validateVCard($data, $modified);
+	}
+
+	/**
+	 * This method is triggered before a new file is created.
+	 *
+	 * This plugin uses this method to ensure that Card nodes receive valid
+	 * vcard data.
+	 *
+	 * @param string   $path
+	 * @param resource $data
+	 * @param bool     $modified should be set to true, if this event handler
+	 *                           changed &$data
+	 */
+	public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified)
+	{
+		if (!$parentNode instanceof IAddressBook) {
+			return;
+		}
+
+		$this->validateVCard($data, $modified);
+	}
+
+	/**
+	 * Checks if the submitted iCalendar data is in fact, valid.
+	 *
+	 * An exception is thrown if it's not.
+	 *
+	 * @param resource|string $data
+	 * @param bool            $modified should be set to true, if this event handler
+	 *                                  changed &$data
+	 */
+	protected function validateVCard(&$data, &$modified)
+	{
+		// If it's a stream, we convert it to a string first.
+		if (is_resource($data)) {
+			$data = stream_get_contents($data);
+		}
+
+		$before = $data;
+
+		try {
+			// If the data starts with a [, we can reasonably assume we're dealing
+			// with a jCal object.
+			if ('[' === substr($data, 0, 1)) {
+				$vobj = VObject\Reader::readJson($data);
+
+				// Converting $data back to iCalendar, as that's what we
+				// technically support everywhere.
+				$data = $vobj->serialize();
+				$modified = true;
+			} else {
+				$vobj = VObject\Reader::read($data);
+			}
+		} catch (VObject\ParseException $e) {
+			throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid vCard or jCard data. Parse error: '.$e->getMessage());
+		}
+
+		if ('VCARD' !== $vobj->name) {
+			throw new DAV\Exception\UnsupportedMediaType('This collection can only support vcard objects.');
+		}
+
+		$options = VObject\Node::PROFILE_CARDDAV;
+		$prefer = $this->server->getHTTPPrefer();
+
+		if ('strict' !== $prefer['handling']) {
+			$options |= VObject\Node::REPAIR;
+		}
+
+		$messages = $vobj->validate($options);
+
+		$highestLevel = 0;
+		$warningMessage = null;
+
+		// $messages contains a list of problems with the vcard, along with
+		// their severity.
+		foreach ($messages as $message) {
+			if ($message['level'] > $highestLevel) {
+				// Recording the highest reported error level.
+				$highestLevel = $message['level'];
+				$warningMessage = $message['message'];
+			}
+
+			switch ($message['level']) {
+				case 1:
+					// Level 1 means that there was a problem, but it was repaired.
+					$modified = true;
+					break;
+				case 2:
+					// Level 2 means a warning, but not critical
+					break;
+				case 3:
+					// Level 3 means a critical error
+					throw new DAV\Exception\UnsupportedMediaType('Validation error in vCard: '.$message['message']);
+			}
+		}
+		if ($warningMessage) {
+			$this->server->httpResponse->setHeader(
+				'X-Sabre-Ew-Gross',
+				'vCard validation warning: '.$warningMessage
+			);
+
+			// Re-serializing object.
+			$data = $vobj->serialize();
+			if (!$modified && 0 !== strcmp($data, $before)) {
+				// This ensures that the system does not send an ETag back.
+				$modified = true;
+			}
+		}
+
+		// Destroy circular references to PHP will GC the object.
+		$vobj->destroy();
+	}
+
+	/**
+	 * This function handles the addressbook-query REPORT.
+	 *
+	 * This report is used by the client to filter an addressbook based on a
+	 * complex query.
+	 *
+	 * @param Xml\Request\AddressBookQueryReport $report
+	 */
+	protected function addressbookQueryReport($report)
+	{
+		$depth = $this->server->getHTTPDepth(0);
+
+		if (0 == $depth) {
+			$candidateNodes = [
+				$this->server->tree->getNodeForPath($this->server->getRequestUri()),
+			];
+			if (!$candidateNodes[0] instanceof ICard) {
+				throw new ReportNotSupported('The addressbook-query report is not supported on this url with Depth: 0');
+			}
+		} else {
+			$candidateNodes = $this->server->tree->getChildren($this->server->getRequestUri());
+		}
+
+		$contentType = $report->contentType;
+		if ($report->version) {
+			$contentType .= '; version='.$report->version;
+		}
+
+		$vcardType = $this->negotiateVCard(
+			$contentType
+		);
+
+		$validNodes = [];
+		foreach ($candidateNodes as $node) {
+			if (!$node instanceof ICard) {
+				continue;
+			}
+
+			$blob = $node->get();
+			if (is_resource($blob)) {
+				$blob = stream_get_contents($blob);
+			}
+
+			if (!$this->validateFilters($blob, $report->filters, $report->test)) {
+				continue;
+			}
+
+			$validNodes[] = $node;
+
+			if ($report->limit && $report->limit <= count($validNodes)) {
+				// We hit the maximum number of items, we can stop now.
+				break;
+			}
+		}
+
+		$result = [];
+		foreach ($validNodes as $validNode) {
+			if (0 == $depth) {
+				$href = $this->server->getRequestUri();
+			} else {
+				$href = $this->server->getRequestUri().'/'.$validNode->getName();
+			}
+
+			list($props) = $this->server->getPropertiesForPath($href, $report->properties, 0);
+
+			if (isset($props[200]['{'.self::NS_CARDDAV.'}address-data'])) {
+				$props[200]['{'.self::NS_CARDDAV.'}address-data'] = $this->convertVCard(
+					$props[200]['{'.self::NS_CARDDAV.'}address-data'],
+					$vcardType,
+					$report->addressDataProperties
+				);
+			}
+			$result[] = $props;
+		}
+
+		$prefer = $this->server->getHTTPPrefer();
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+		$this->server->httpResponse->setBody($this->server->generateMultiStatus($result, 'minimal' === $prefer['return']));
+	}
+
+	/**
+	 * Validates if a vcard makes it throught a list of filters.
+	 *
+	 * @param string $vcardData
+	 * @param string $test      anyof or allof (which means OR or AND)
+	 *
+	 * @return bool
+	 */
+	public function validateFilters($vcardData, array $filters, $test)
+	{
+		if (!$filters) {
+			return true;
+		}
+		$vcard = VObject\Reader::read($vcardData);
+
+		foreach ($filters as $filter) {
+			$isDefined = isset($vcard->{$filter['name']});
+			if ($filter['is-not-defined']) {
+				if ($isDefined) {
+					$success = false;
+				} else {
+					$success = true;
+				}
+			} elseif ((!$filter['param-filters'] && !$filter['text-matches']) || !$isDefined) {
+				// We only need to check for existence
+				$success = $isDefined;
+			} else {
+				$vProperties = $vcard->select($filter['name']);
+
+				$results = [];
+				if ($filter['param-filters']) {
+					$results[] = $this->validateParamFilters($vProperties, $filter['param-filters'], $filter['test']);
+				}
+				if ($filter['text-matches']) {
+					$texts = [];
+					foreach ($vProperties as $vProperty) {
+						$texts[] = $vProperty->getValue();
+					}
+
+					$results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
+				}
+
+				if (1 === count($results)) {
+					$success = $results[0];
+				} else {
+					if ('anyof' === $filter['test']) {
+						$success = $results[0] || $results[1];
+					} else {
+						$success = $results[0] && $results[1];
+					}
+				}
+			} // else
+
+			// There are two conditions where we can already determine whether
+			// or not this filter succeeds.
+			if ('anyof' === $test && $success) {
+				// Destroy circular references to PHP will GC the object.
+				$vcard->destroy();
+
+				return true;
+			}
+			if ('allof' === $test && !$success) {
+				// Destroy circular references to PHP will GC the object.
+				$vcard->destroy();
+
+				return false;
+			}
+		} // foreach
+
+		// Destroy circular references to PHP will GC the object.
+		$vcard->destroy();
+
+		// If we got all the way here, it means we haven't been able to
+		// determine early if the test failed or not.
+		//
+		// This implies for 'anyof' that the test failed, and for 'allof' that
+		// we succeeded. Sounds weird, but makes sense.
+		return 'allof' === $test;
+	}
+
+	/**
+	 * Validates if a param-filter can be applied to a specific property.
+	 *
+	 * @todo currently we're only validating the first parameter of the passed
+	 *       property. Any subsequence parameters with the same name are
+	 *       ignored.
+	 *
+	 * @param string $test
+	 *
+	 * @return bool
+	 */
+	protected function validateParamFilters(array $vProperties, array $filters, $test)
+	{
+		foreach ($filters as $filter) {
+			$isDefined = false;
+			foreach ($vProperties as $vProperty) {
+				$isDefined = isset($vProperty[$filter['name']]);
+				if ($isDefined) {
+					break;
+				}
+			}
+
+			if ($filter['is-not-defined']) {
+				if ($isDefined) {
+					$success = false;
+				} else {
+					$success = true;
+				}
+
+				// If there's no text-match, we can just check for existence
+			} elseif (!$filter['text-match'] || !$isDefined) {
+				$success = $isDefined;
+			} else {
+				$success = false;
+				foreach ($vProperties as $vProperty) {
+					// If we got all the way here, we'll need to validate the
+					// text-match filter.
+					if (isset($vProperty[$filter['name']])) {
+						$success = DAV\StringUtil::textMatch(
+							$vProperty[$filter['name']]->getValue(),
+							$filter['text-match']['value'],
+							$filter['text-match']['collation'],
+							$filter['text-match']['match-type']
+						);
+						if ($filter['text-match']['negate-condition']) {
+							$success = !$success;
+						}
+					}
+					if ($success) {
+						break;
+					}
+				}
+			} // else
+
+			// There are two conditions where we can already determine whether
+			// or not this filter succeeds.
+			if ('anyof' === $test && $success) {
+				return true;
+			}
+			if ('allof' === $test && !$success) {
+				return false;
+			}
+		}
+
+		// If we got all the way here, it means we haven't been able to
+		// determine early if the test failed or not.
+		//
+		// This implies for 'anyof' that the test failed, and for 'allof' that
+		// we succeeded. Sounds weird, but makes sense.
+		return 'allof' === $test;
+	}
+
+	/**
+	 * Validates if a text-filter can be applied to a specific property.
+	 *
+	 * @param string $test
+	 *
+	 * @return bool
+	 */
+	protected function validateTextMatches(array $texts, array $filters, $test)
+	{
+		foreach ($filters as $filter) {
+			$success = false;
+			foreach ($texts as $haystack) {
+				$success = DAV\StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
+				if ($filter['negate-condition']) {
+					$success = !$success;
+				}
+
+				// Breaking on the first match
+				if ($success) {
+					break;
+				}
+			}
+
+			if ($success && 'anyof' === $test) {
+				return true;
+			}
+
+			if (!$success && 'allof' == $test) {
+				return false;
+			}
+		}
+
+		// If we got all the way here, it means we haven't been able to
+		// determine early if the test failed or not.
+		//
+		// This implies for 'anyof' that the test failed, and for 'allof' that
+		// we succeeded. Sounds weird, but makes sense.
+		return 'allof' === $test;
+	}
+
+	/**
+	 * This event is triggered when fetching properties.
+	 *
+	 * This event is scheduled late in the process, after most work for
+	 * propfind has been done.
+	 */
+	public function propFindLate(DAV\PropFind $propFind, DAV\INode $node)
+	{
+		// If the request was made using the SOGO connector, we must rewrite
+		// the content-type property. By default SabreDAV will send back
+		// text/x-vcard; charset=utf-8, but for SOGO we must strip that last
+		// part.
+		if (false === strpos((string) $this->server->httpRequest->getHeader('User-Agent'), 'Thunderbird')) {
+			return;
+		}
+		$contentType = $propFind->get('{DAV:}getcontenttype');
+		if (null !== $contentType) {
+			list($part) = explode(';', $contentType);
+			if ('text/x-vcard' === $part || 'text/vcard' === $part) {
+				$propFind->set('{DAV:}getcontenttype', 'text/x-vcard');
+			}
+		}
+	}
+
+	/**
+	 * This method is used to generate HTML output for the
+	 * Sabre\DAV\Browser\Plugin. This allows us to generate an interface users
+	 * can use to create new addressbooks.
+	 *
+	 * @param string $output
+	 *
+	 * @return bool
+	 */
+	public function htmlActionsPanel(DAV\INode $node, &$output)
+	{
+		if (!$node instanceof AddressBookHome) {
+			return;
+		}
+
+		$output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Create new address book</h3>
             <input type="hidden" name="sabreAction" value="mkcol" />
             <input type="hidden" name="resourceType" value="{DAV:}collection,{'.self::NS_CARDDAV.'}addressbook" />
@@ -711,176 +711,176 @@ 
             </form>
             </td></tr>';
 
-        return false;
-    }
-
-    /**
-     * This event is triggered after GET requests.
-     *
-     * This is used to transform data into jCal, if this was requested.
-     */
-    public function httpAfterGet(RequestInterface $request, ResponseInterface $response)
-    {
-        $contentType = $response->getHeader('Content-Type');
-        if (null === $contentType || false === strpos($contentType, 'text/vcard')) {
-            return;
-        }
-
-        $target = $this->negotiateVCard($request->getHeader('Accept'), $mimeType);
-
-        $newBody = $this->convertVCard(
-            $response->getBody(),
-            $target
-        );
-
-        $response->setBody($newBody);
-        $response->setHeader('Content-Type', $mimeType.'; charset=utf-8');
-        $response->setHeader('Content-Length', strlen($newBody));
-    }
-
-    /**
-     * This helper function performs the content-type negotiation for vcards.
-     *
-     * It will return one of the following strings:
-     * 1. vcard3
-     * 2. vcard4
-     * 3. jcard
-     *
-     * It defaults to vcard3.
-     *
-     * @param string $input
-     * @param string $mimeType
-     *
-     * @return string
-     */
-    protected function negotiateVCard($input, &$mimeType = null)
-    {
-        $result = HTTP\negotiateContentType(
-            $input,
-            [
-                // Most often used mime-type. Version 3
-                'text/x-vcard',
-                // The correct standard mime-type. Defaults to version 3 as
-                // well.
-                'text/vcard',
-                // vCard 4
-                'text/vcard; version=4.0',
-                // vCard 3
-                'text/vcard; version=3.0',
-                // jCard
-                'application/vcard+json',
-            ]
-        );
-
-        $mimeType = $result;
-        switch ($result) {
-            default:
-            case 'text/x-vcard':
-            case 'text/vcard':
-            case 'text/vcard; version=3.0':
-                $mimeType = 'text/vcard';
-
-                return 'vcard3';
-            case 'text/vcard; version=4.0':
-                return 'vcard4';
-            case 'application/vcard+json':
-                return 'jcard';
-
-        // @codeCoverageIgnoreStart
-        }
-        // @codeCoverageIgnoreEnd
-    }
-
-    /**
-     * Converts a vcard blob to a different version, or jcard.
-     *
-     * @param string|resource $data
-     * @param string          $target
-     * @param array           $propertiesFilter
-     *
-     * @return string
-     */
-    protected function convertVCard($data, $target, array $propertiesFilter = null)
-    {
-        if (is_resource($data)) {
-            $data = stream_get_contents($data);
-        }
-        $input = VObject\Reader::read($data);
-        if (!empty($propertiesFilter)) {
-            $propertiesFilter = array_merge(['UID', 'VERSION', 'FN'], $propertiesFilter);
-            $keys = array_unique(array_map(function ($child) {
-                return $child->name;
-            }, $input->children()));
-            $keys = array_diff($keys, $propertiesFilter);
-            foreach ($keys as $key) {
-                unset($input->$key);
-            }
-            $data = $input->serialize();
-        }
-        $output = null;
-        try {
-            switch ($target) {
-                default:
-                case 'vcard3':
-                    if (VObject\Document::VCARD30 === $input->getDocumentType()) {
-                        // Do nothing
-                        return $data;
-                    }
-                    $output = $input->convert(VObject\Document::VCARD30);
-
-                    return $output->serialize();
-                case 'vcard4':
-                    if (VObject\Document::VCARD40 === $input->getDocumentType()) {
-                        // Do nothing
-                        return $data;
-                    }
-                    $output = $input->convert(VObject\Document::VCARD40);
-
-                    return $output->serialize();
-                case 'jcard':
-                    $output = $input->convert(VObject\Document::VCARD40);
-
-                    return json_encode($output);
-            }
-        } finally {
-            // Destroy circular references to PHP will GC the object.
-            $input->destroy();
-            if (!is_null($output)) {
-                $output->destroy();
-            }
-        }
-    }
-
-    /**
-     * 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 'carddav';
-    }
-
-    /**
-     * 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 CardDAV (rfc6352)',
-            'link' => 'http://sabre.io/dav/carddav/',
-        ];
-    }
+		return false;
+	}
+
+	/**
+	 * This event is triggered after GET requests.
+	 *
+	 * This is used to transform data into jCal, if this was requested.
+	 */
+	public function httpAfterGet(RequestInterface $request, ResponseInterface $response)
+	{
+		$contentType = $response->getHeader('Content-Type');
+		if (null === $contentType || false === strpos($contentType, 'text/vcard')) {
+			return;
+		}
+
+		$target = $this->negotiateVCard($request->getHeader('Accept'), $mimeType);
+
+		$newBody = $this->convertVCard(
+			$response->getBody(),
+			$target
+		);
+
+		$response->setBody($newBody);
+		$response->setHeader('Content-Type', $mimeType.'; charset=utf-8');
+		$response->setHeader('Content-Length', strlen($newBody));
+	}
+
+	/**
+	 * This helper function performs the content-type negotiation for vcards.
+	 *
+	 * It will return one of the following strings:
+	 * 1. vcard3
+	 * 2. vcard4
+	 * 3. jcard
+	 *
+	 * It defaults to vcard3.
+	 *
+	 * @param string $input
+	 * @param string $mimeType
+	 *
+	 * @return string
+	 */
+	protected function negotiateVCard($input, &$mimeType = null)
+	{
+		$result = HTTP\negotiateContentType(
+			$input,
+			[
+				// Most often used mime-type. Version 3
+				'text/x-vcard',
+				// The correct standard mime-type. Defaults to version 3 as
+				// well.
+				'text/vcard',
+				// vCard 4
+				'text/vcard; version=4.0',
+				// vCard 3
+				'text/vcard; version=3.0',
+				// jCard
+				'application/vcard+json',
+			]
+		);
+
+		$mimeType = $result;
+		switch ($result) {
+			default:
+			case 'text/x-vcard':
+			case 'text/vcard':
+			case 'text/vcard; version=3.0':
+				$mimeType = 'text/vcard';
+
+				return 'vcard3';
+			case 'text/vcard; version=4.0':
+				return 'vcard4';
+			case 'application/vcard+json':
+				return 'jcard';
+
+		// @codeCoverageIgnoreStart
+		}
+		// @codeCoverageIgnoreEnd
+	}
+
+	/**
+	 * Converts a vcard blob to a different version, or jcard.
+	 *
+	 * @param string|resource $data
+	 * @param string          $target
+	 * @param array           $propertiesFilter
+	 *
+	 * @return string
+	 */
+	protected function convertVCard($data, $target, array $propertiesFilter = null)
+	{
+		if (is_resource($data)) {
+			$data = stream_get_contents($data);
+		}
+		$input = VObject\Reader::read($data);
+		if (!empty($propertiesFilter)) {
+			$propertiesFilter = array_merge(['UID', 'VERSION', 'FN'], $propertiesFilter);
+			$keys = array_unique(array_map(function ($child) {
+				return $child->name;
+			}, $input->children()));
+			$keys = array_diff($keys, $propertiesFilter);
+			foreach ($keys as $key) {
+				unset($input->$key);
+			}
+			$data = $input->serialize();
+		}
+		$output = null;
+		try {
+			switch ($target) {
+				default:
+				case 'vcard3':
+					if (VObject\Document::VCARD30 === $input->getDocumentType()) {
+						// Do nothing
+						return $data;
+					}
+					$output = $input->convert(VObject\Document::VCARD30);
+
+					return $output->serialize();
+				case 'vcard4':
+					if (VObject\Document::VCARD40 === $input->getDocumentType()) {
+						// Do nothing
+						return $data;
+					}
+					$output = $input->convert(VObject\Document::VCARD40);
+
+					return $output->serialize();
+				case 'jcard':
+					$output = $input->convert(VObject\Document::VCARD40);
+
+					return json_encode($output);
+			}
+		} finally {
+			// Destroy circular references to PHP will GC the object.
+			$input->destroy();
+			if (!is_null($output)) {
+				$output->destroy();
+			}
+		}
+	}
+
+	/**
+	 * 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 'carddav';
+	}
+
+	/**
+	 * 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 CardDAV (rfc6352)',
+			'link' => 'http://sabre.io/dav/carddav/',
+		];
+	}
 }