YetiForceCompany / YetiForceCRM

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

Doc Comments +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return InviteReply
      */
     static function xmlDeserialize(Reader $reader) {
 

Unused Use Statements +4 added lines, -4 removed lines

@@ -2,12 +2,12 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
-use Sabre\Xml\Reader;
-use Sabre\Xml\XmlDeserializable;
-use Sabre\Xml\Element\KeyValue;
-use Sabre\DAV\Exception\BadRequest;
 use Sabre\CalDAV\Plugin;
 use Sabre\CalDAV\SharingPlugin;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\Xml\Element\KeyValue;
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * Invite-reply POST request parser

Indentation +123 added lines, -123 removed lines

@@ -22,128 +22,128 @@
  */
 class InviteReply implements XmlDeserializable {
 
-    /**
-     * The sharee calendar user address.
-     *
-     * This is the address that the original invite was set to
-     *
-     * @var string
-     */
-    public $href;
-
-    /**
-     * The uri to the calendar that was being shared.
-     *
-     * @var string
-     */
-    public $calendarUri;
-
-    /**
-     * The id of the invite message that's being responded to
-     *
-     * @var string
-     */
-    public $inReplyTo;
-
-    /**
-     * An optional message
-     *
-     * @var string
-     */
-    public $summary;
-
-    /**
-     * Either SharingPlugin::STATUS_ACCEPTED or SharingPlugin::STATUS_DECLINED.
-     *
-     * @var int
-     */
-    public $status;
-
-    /**
-     * Constructor
-     *
-     * @param string $href
-     * @param string $calendarUri
-     * @param string $inReplyTo
-     * @param string $summary
-     * @param int $status
-     */
-    public function __construct($href, $calendarUri, $inReplyTo, $summary, $status) {
-
-        $this->href = $href;
-        $this->calendarUri = $calendarUri;
-        $this->inReplyTo = $inReplyTo;
-        $this->summary = $summary;
-        $this->status = $status;
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $elems = KeyValue::xmlDeserialize($reader);
-
-        $href = null;
-        $calendarUri = null;
-        $inReplyTo = null;
-        $summary = null;
-        $status = null;
-
-        foreach ($elems as $name => $value) {
-
-            switch ($name) {
-
-                case '{' . Plugin::NS_CALENDARSERVER . '}hosturl' :
-                    foreach ($value as $bla) {
-                        if ($bla['name'] === '{DAV:}href') {
-                            $calendarUri = $bla['value'];
-                        }
-                    }
-                    break;
-                case '{' . Plugin::NS_CALENDARSERVER . '}invite-accepted' :
-                    $status = SharingPlugin::STATUS_ACCEPTED;
-                    break;
-                case '{' . Plugin::NS_CALENDARSERVER . '}invite-declined' :
-                    $status = SharingPlugin::STATUS_DECLINED;
-                    break;
-                case '{' . Plugin::NS_CALENDARSERVER . '}in-reply-to' :
-                    $inReplyTo = $value;
-                    break;
-                case '{' . Plugin::NS_CALENDARSERVER . '}summary' :
-                    $summary = $value;
-                    break;
-                case '{DAV:}href' :
-                    $href = $value;
-                    break;
-            }
-
-        }
-        if (is_null($calendarUri)) {
-            throw new BadRequest('The {http://calendarserver.org/ns/}hosturl/{DAV:}href element must exist');
-        }
-
-        return new self($href, $calendarUri, $inReplyTo, $summary, $status);
-
-    }
+	/**
+	 * The sharee calendar user address.
+	 *
+	 * This is the address that the original invite was set to
+	 *
+	 * @var string
+	 */
+	public $href;
+
+	/**
+	 * The uri to the calendar that was being shared.
+	 *
+	 * @var string
+	 */
+	public $calendarUri;
+
+	/**
+	 * The id of the invite message that's being responded to
+	 *
+	 * @var string
+	 */
+	public $inReplyTo;
+
+	/**
+	 * An optional message
+	 *
+	 * @var string
+	 */
+	public $summary;
+
+	/**
+	 * Either SharingPlugin::STATUS_ACCEPTED or SharingPlugin::STATUS_DECLINED.
+	 *
+	 * @var int
+	 */
+	public $status;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $href
+	 * @param string $calendarUri
+	 * @param string $inReplyTo
+	 * @param string $summary
+	 * @param int $status
+	 */
+	public function __construct($href, $calendarUri, $inReplyTo, $summary, $status) {
+
+		$this->href = $href;
+		$this->calendarUri = $calendarUri;
+		$this->inReplyTo = $inReplyTo;
+		$this->summary = $summary;
+		$this->status = $status;
+
+	}
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$elems = KeyValue::xmlDeserialize($reader);
+
+		$href = null;
+		$calendarUri = null;
+		$inReplyTo = null;
+		$summary = null;
+		$status = null;
+
+		foreach ($elems as $name => $value) {
+
+			switch ($name) {
+
+				case '{' . Plugin::NS_CALENDARSERVER . '}hosturl' :
+					foreach ($value as $bla) {
+						if ($bla['name'] === '{DAV:}href') {
+							$calendarUri = $bla['value'];
+						}
+					}
+					break;
+				case '{' . Plugin::NS_CALENDARSERVER . '}invite-accepted' :
+					$status = SharingPlugin::STATUS_ACCEPTED;
+					break;
+				case '{' . Plugin::NS_CALENDARSERVER . '}invite-declined' :
+					$status = SharingPlugin::STATUS_DECLINED;
+					break;
+				case '{' . Plugin::NS_CALENDARSERVER . '}in-reply-to' :
+					$inReplyTo = $value;
+					break;
+				case '{' . Plugin::NS_CALENDARSERVER . '}summary' :
+					$summary = $value;
+					break;
+				case '{DAV:}href' :
+					$href = $value;
+					break;
+			}
+
+		}
+		if (is_null($calendarUri)) {
+			throw new BadRequest('The {http://calendarserver.org/ns/}hosturl/{DAV:}href element must exist');
+		}
+
+		return new self($href, $calendarUri, $inReplyTo, $summary, $status);
+
+	}
 
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return MkCalendar
      */
     static function xmlDeserialize(Reader $reader) {
 

Indentation +48 added lines, -48 removed lines

@@ -18,62 +18,62 @@
  */
 class MkCalendar implements XmlDeserializable {
 
-    /**
-     * The list of properties that will be set.
-     *
-     * @var array
-     */
-    public $properties = [];
+	/**
+	 * The list of properties that will be set.
+	 *
+	 * @var array
+	 */
+	public $properties = [];
 
-    /**
-     * Returns the list of properties the calendar will be initialized with.
-     *
-     * @return array
-     */
-    public function getProperties() {
+	/**
+	 * Returns the list of properties the calendar will be initialized with.
+	 *
+	 * @return array
+	 */
+	public function getProperties() {
 
-        return $this->properties;
+		return $this->properties;
 
-    }
+	}
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
 
-        $self = new self();
+		$self = new self();
 
-        $elementMap = $reader->elementMap;
-        $elementMap['{DAV:}prop']   = 'Sabre\DAV\Xml\Element\Prop';
-        $elementMap['{DAV:}set']    = 'Sabre\Xml\Element\KeyValue';
-        $elems = $reader->parseInnerTree($elementMap);
+		$elementMap = $reader->elementMap;
+		$elementMap['{DAV:}prop']   = 'Sabre\DAV\Xml\Element\Prop';
+		$elementMap['{DAV:}set']    = 'Sabre\Xml\Element\KeyValue';
+		$elems = $reader->parseInnerTree($elementMap);
 
-        foreach ($elems as $elem) {
-            if ($elem['name'] === '{DAV:}set') {
-                $self->properties = array_merge($self->properties, $elem['value']['{DAV:}prop']);
-            }
-        }
+		foreach ($elems as $elem) {
+			if ($elem['name'] === '{DAV:}set') {
+				$self->properties = array_merge($self->properties, $elem['value']['{DAV:}prop']);
+			}
+		}
 
-        return $self;
+		return $self;
 
-    }
+	}
 
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return Share
      */
     static function xmlDeserialize(Reader $reader) {
 

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,9 +2,9 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
+use Sabre\CalDAV\Plugin;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\CalDAV\Plugin;
 
 /**
  * Share POST request parser

Indentation +93 added lines, -93 removed lines

@@ -19,98 +19,98 @@
  */
 class Share implements XmlDeserializable {
 
-    /**
-     * The list of new people added or updated.
-     *
-     * Every element has the following keys:
-     * 1. href - An email address
-     * 2. commonName - Some name
-     * 3. summary - An optional description of the share
-     * 4. readOnly - true or false
-     *
-     * @var array
-     */
-    public $set = [];
-
-    /**
-     * List of people removed from the share list.
-     *
-     * The list is a flat list of email addresses (including mailto:).
-     *
-     * @var array
-     */
-    public $remove = [];
-
-    /**
-     * Constructor
-     *
-     * @param array $set
-     * @param array $remove
-     */
-    public function __construct(array $set, array $remove) {
-
-        $this->set = $set;
-        $this->remove = $remove;
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $elems = $reader->parseInnerTree([
-            '{' . Plugin::NS_CALENDARSERVER . '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
-            '{' . Plugin::NS_CALENDARSERVER . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
-        ]);
-
-        $set = [];
-        $remove = [];
-
-        foreach ($elems as $elem) {
-            switch ($elem['name']) {
-
-                case '{' . Plugin::NS_CALENDARSERVER . '}set' :
-                    $sharee = $elem['value'];
-
-                    $sumElem = '{' . Plugin::NS_CALENDARSERVER . '}summary';
-                    $commonName = '{' . Plugin::NS_CALENDARSERVER . '}common-name';
-
-                    $set[] = [
-                        'href'       => $sharee['{DAV:}href'],
-                        'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
-                        'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-                        'readOnly'   => !array_key_exists('{' . Plugin::NS_CALENDARSERVER . '}read-write', $sharee),
-                    ];
-                    break;
-
-                case '{' . Plugin::NS_CALENDARSERVER . '}remove' :
-                    $remove[] = $elem['value']['{DAV:}href'];
-                    break;
-
-            }
-        }
-
-        return new self($set, $remove);
-
-    }
+	/**
+	 * The list of new people added or updated.
+	 *
+	 * Every element has the following keys:
+	 * 1. href - An email address
+	 * 2. commonName - Some name
+	 * 3. summary - An optional description of the share
+	 * 4. readOnly - true or false
+	 *
+	 * @var array
+	 */
+	public $set = [];
+
+	/**
+	 * List of people removed from the share list.
+	 *
+	 * The list is a flat list of email addresses (including mailto:).
+	 *
+	 * @var array
+	 */
+	public $remove = [];
+
+	/**
+	 * Constructor
+	 *
+	 * @param array $set
+	 * @param array $remove
+	 */
+	public function __construct(array $set, array $remove) {
+
+		$this->set = $set;
+		$this->remove = $remove;
+
+	}
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$elems = $reader->parseInnerTree([
+			'{' . Plugin::NS_CALENDARSERVER . '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
+			'{' . Plugin::NS_CALENDARSERVER . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+		]);
+
+		$set = [];
+		$remove = [];
+
+		foreach ($elems as $elem) {
+			switch ($elem['name']) {
+
+				case '{' . Plugin::NS_CALENDARSERVER . '}set' :
+					$sharee = $elem['value'];
+
+					$sumElem = '{' . Plugin::NS_CALENDARSERVER . '}summary';
+					$commonName = '{' . Plugin::NS_CALENDARSERVER . '}common-name';
+
+					$set[] = [
+						'href'       => $sharee['{DAV:}href'],
+						'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
+						'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
+						'readOnly'   => !array_key_exists('{' . Plugin::NS_CALENDARSERVER . '}read-write', $sharee),
+					];
+					break;
+
+				case '{' . Plugin::NS_CALENDARSERVER . '}remove' :
+					$remove[] = $elem['value']['{DAV:}href'];
+					break;
+
+			}
+		}
+
+		return new self($set, $remove);
+
+	}
 
 }

libraries/SabreDAV/CardDAV/AddressBookHome.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -3,8 +3,8 @@
 namespace Sabre\CardDAV;
 
 use Sabre\DAV;
-use Sabre\DAV\MkCol;
 use Sabre\DAVACL;
+use Sabre\DAV\MkCol;
 use Sabre\Uri;
 
 /**

Indentation +240 added lines, -240 removed lines

@@ -18,245 +18,245 @@
  */
 class AddressBookHome extends DAV\Collection implements DAV\IExtendedCollection, DAVACL\IACL {
 
-    /**
-     * Principal uri
-     *
-     * @var array
-     */
-    protected $principalUri;
-
-    /**
-     * carddavBackend
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $carddavBackend;
-
-    /**
-     * Constructor
-     *
-     * @param Backend\BackendInterface $carddavBackend
-     * @param string $principalUri
-     */
-    public function __construct(Backend\BackendInterface $carddavBackend, $principalUri) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->principalUri = $principalUri;
-
-    }
-
-    /**
-     * Returns the name of this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(, $name) = Uri\split($this->principalUri);
-        return $name;
-
-    }
-
-    /**
-     * Updates the name of this object
-     *
-     * @param string $name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new DAV\Exception\MethodNotAllowed();
-
-    }
-
-    /**
-     * Deletes this object
-     *
-     * @return void
-     */
-    public function delete() {
-
-        throw new DAV\Exception\MethodNotAllowed();
-
-    }
-
-    /**
-     * Returns the last modification date
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Creates a new file under this object.
-     *
-     * This is currently not allowed
-     *
-     * @param string $filename
-     * @param resource $data
-     * @return void
-     */
-    public function createFile($filename, $data = null) {
-
-        throw new DAV\Exception\MethodNotAllowed('Creating new files in this collection is not supported');
-
-    }
-
-    /**
-     * Creates a new directory under this object.
-     *
-     * This is currently not allowed.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function createDirectory($filename) {
-
-        throw new DAV\Exception\MethodNotAllowed('Creating new collections in this collection is not supported');
-
-    }
-
-    /**
-     * Returns a single addressbook, by name
-     *
-     * @param string $name
-     * @return \AddressBook
-     */
-    public function getChild($name) {
-
-        foreach ($this->getChildren() as $child) {
-            if ($name == $child->getName())
-                return $child;
-
-        }
-        throw new DAV\Exception\NotFound('Addressbook with name \'' . $name . '\' could not be found');
-
-    }
-
-    /**
-     * Returns a list of addressbooks
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $addressbooks = $this->carddavBackend->getAddressBooksForUser($this->principalUri);
-        $objs = [];
-        foreach ($addressbooks as $addressbook) {
-            $objs[] = new AddressBook($this->carddavBackend, $addressbook);
-        }
-        return $objs;
-
-    }
-
-    /**
-     * Creates a new address book.
-     *
-     * @param string $name
-     * @param MkCol $mkCol
-     * @throws DAV\Exception\InvalidResourceType
-     * @return void
-     */
-    public function createExtendedCollection($name, MkCol $mkCol) {
-
-        if (!$mkCol->hasResourceType('{' . Plugin::NS_CARDDAV . '}addressbook')) {
-            throw new DAV\Exception\InvalidResourceType('Unknown resourceType for this collection');
-        }
-        $properties = $mkCol->getRemainingValues();
-        $mkCol->setRemainingResultCode(201);
-        $this->carddavBackend->createAddressBook($this->principalUri, $name, $properties);
-
-    }
-
-    /**
-     * 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 group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * 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' => $this->principalUri,
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ],
-        ];
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
+	/**
+	 * Principal uri
+	 *
+	 * @var array
+	 */
+	protected $principalUri;
+
+	/**
+	 * carddavBackend
+	 *
+	 * @var Backend\BackendInterface
+	 */
+	protected $carddavBackend;
+
+	/**
+	 * Constructor
+	 *
+	 * @param Backend\BackendInterface $carddavBackend
+	 * @param string $principalUri
+	 */
+	public function __construct(Backend\BackendInterface $carddavBackend, $principalUri) {
+
+		$this->carddavBackend = $carddavBackend;
+		$this->principalUri = $principalUri;
+
+	}
+
+	/**
+	 * Returns the name of this object
+	 *
+	 * @return string
+	 */
+	public function getName() {
+
+		list(, $name) = Uri\split($this->principalUri);
+		return $name;
+
+	}
+
+	/**
+	 * Updates the name of this object
+	 *
+	 * @param string $name
+	 * @return void
+	 */
+	public function setName($name) {
+
+		throw new DAV\Exception\MethodNotAllowed();
+
+	}
+
+	/**
+	 * Deletes this object
+	 *
+	 * @return void
+	 */
+	public function delete() {
+
+		throw new DAV\Exception\MethodNotAllowed();
+
+	}
+
+	/**
+	 * Returns the last modification date
+	 *
+	 * @return int
+	 */
+	public function getLastModified() {
+
+		return null;
+
+	}
+
+	/**
+	 * Creates a new file under this object.
+	 *
+	 * This is currently not allowed
+	 *
+	 * @param string $filename
+	 * @param resource $data
+	 * @return void
+	 */
+	public function createFile($filename, $data = null) {
+
+		throw new DAV\Exception\MethodNotAllowed('Creating new files in this collection is not supported');
+
+	}
+
+	/**
+	 * Creates a new directory under this object.
+	 *
+	 * This is currently not allowed.
+	 *
+	 * @param string $filename
+	 * @return void
+	 */
+	public function createDirectory($filename) {
+
+		throw new DAV\Exception\MethodNotAllowed('Creating new collections in this collection is not supported');
+
+	}
+
+	/**
+	 * Returns a single addressbook, by name
+	 *
+	 * @param string $name
+	 * @return \AddressBook
+	 */
+	public function getChild($name) {
+
+		foreach ($this->getChildren() as $child) {
+			if ($name == $child->getName())
+				return $child;
+
+		}
+		throw new DAV\Exception\NotFound('Addressbook with name \'' . $name . '\' could not be found');
+
+	}
+
+	/**
+	 * Returns a list of addressbooks
+	 *
+	 * @return array
+	 */
+	public function getChildren() {
+
+		$addressbooks = $this->carddavBackend->getAddressBooksForUser($this->principalUri);
+		$objs = [];
+		foreach ($addressbooks as $addressbook) {
+			$objs[] = new AddressBook($this->carddavBackend, $addressbook);
+		}
+		return $objs;
+
+	}
+
+	/**
+	 * Creates a new address book.
+	 *
+	 * @param string $name
+	 * @param MkCol $mkCol
+	 * @throws DAV\Exception\InvalidResourceType
+	 * @return void
+	 */
+	public function createExtendedCollection($name, MkCol $mkCol) {
+
+		if (!$mkCol->hasResourceType('{' . Plugin::NS_CARDDAV . '}addressbook')) {
+			throw new DAV\Exception\InvalidResourceType('Unknown resourceType for this collection');
+		}
+		$properties = $mkCol->getRemainingValues();
+		$mkCol->setRemainingResultCode(201);
+		$this->carddavBackend->createAddressBook($this->principalUri, $name, $properties);
+
+	}
+
+	/**
+	 * 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 group principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getGroup() {
+
+		return null;
+
+	}
+
+	/**
+	 * 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' => $this->principalUri,
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}write',
+				'principal' => $this->principalUri,
+				'protected' => true,
+			],
+		];
+
+	}
+
+	/**
+	 * Updates the ACL
+	 *
+	 * This method will receive a list of new ACE's.
+	 *
+	 * @param array $acl
+	 * @return void
+	 */
+	public function setACL(array $acl) {
+
+		throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
+
+	}
+
+	/**
+	 * Returns the list of supported privileges for this node.
+	 *
+	 * The returned data structure is a list of nested privileges.
+	 * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+	 * standard structure.
+	 *
+	 * If null is returned from this method, the default privilege set is used,
+	 * which is fine for most common usecases.
+	 *
+	 * @return array|null
+	 */
+	public function getSupportedPrivilegeSet() {
+
+		return null;
+
+	}
 
 }

Braces +3 added lines, -2 removed lines

@@ -129,8 +129,9 @@
     public function getChild($name) {
 
         foreach ($this->getChildren() as $child) {
-            if ($name == $child->getName())
-                return $child;
+            if ($name == $child->getName()) {
+                            return $child;
+            }
 
         }
         throw new DAV\Exception\NotFound('Addressbook with name \'' . $name . '\' could not be found');

libraries/SabreDAV/CardDAV/Card.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace Sabre\CardDAV;
 
-use Sabre\DAVACL;
 use Sabre\DAV;
+use Sabre\DAVACL;
 
 /**
  * The Card object represents a single Card from an addressbook

Indentation +245 added lines, -245 removed lines

@@ -14,250 +14,250 @@
  */
 class Card extends DAV\File implements ICard, DAVACL\IACL {
 
-    /**
-     * CardDAV backend
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $carddavBackend;
-
-    /**
-     * Array with information about this Card
-     *
-     * @var array
-     */
-    protected $cardData;
-
-    /**
-     * Array with information about the containing addressbook
-     *
-     * @var array
-     */
-    protected $addressBookInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Backend\BackendInterface $carddavBackend
-     * @param array $addressBookInfo
-     * @param array $cardData
-     */
-    public function __construct(Backend\BackendInterface $carddavBackend, array $addressBookInfo, array $cardData) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
-        $this->cardData = $cardData;
-
-    }
-
-    /**
-     * Returns the uri for this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->cardData['uri'];
-
-    }
-
-    /**
-     * Returns the VCard-formatted object
-     *
-     * @return string
-     */
-    public function get() {
-
-        // Pre-populating 'carddata' is optional. If we don't yet have it
-        // already, we fetch it from the backend.
-        if (!isset($this->cardData['carddata'])) {
-            $this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
-        }
-        return $this->cardData['carddata'];
-
-    }
-
-    /**
-     * Updates the VCard-formatted object
-     *
-     * @param string $cardData
-     * @return string|null
-     */
-    public function put($cardData) {
-
-        if (is_resource($cardData))
-            $cardData = stream_get_contents($cardData);
-
-        // Converting to UTF-8, if needed
-        $cardData = DAV\StringUtil::ensureUTF8($cardData);
-
-        $etag = $this->carddavBackend->updateCard($this->addressBookInfo['id'], $this->cardData['uri'], $cardData);
-        $this->cardData['carddata'] = $cardData;
-        $this->cardData['etag'] = $etag;
-
-        return $etag;
-
-    }
-
-    /**
-     * Deletes the card
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->carddavBackend->deleteCard($this->addressBookInfo['id'], $this->cardData['uri']);
-
-    }
-
-    /**
-     * Returns the mime content-type
-     *
-     * @return string
-     */
-    public function getContentType() {
-
-        return 'text/vcard; charset=utf-8';
-
-    }
-
-    /**
-     * Returns an ETag for this object
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        if (isset($this->cardData['etag'])) {
-            return $this->cardData['etag'];
-        } else {
-            $data = $this->get();
-            if (is_string($data)) {
-                return '"' . md5($data) . '"';
-            } else {
-                // We refuse to calculate the md5 if it's a stream.
-                return null;
-            }
-        }
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return isset($this->cardData['lastmodified']) ? $this->cardData['lastmodified'] : null;
-
-    }
-
-    /**
-     * Returns the size of this object in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        if (array_key_exists('size', $this->cardData)) {
-            return $this->cardData['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->addressBookInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * 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 through the cardData array.
-        if (isset($this->cardData['acl'])) {
-            return $this->cardData['acl'];
-        }
-
-        return [
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ],
-        ];
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
+	/**
+	 * CardDAV backend
+	 *
+	 * @var Backend\BackendInterface
+	 */
+	protected $carddavBackend;
+
+	/**
+	 * Array with information about this Card
+	 *
+	 * @var array
+	 */
+	protected $cardData;
+
+	/**
+	 * Array with information about the containing addressbook
+	 *
+	 * @var array
+	 */
+	protected $addressBookInfo;
+
+	/**
+	 * Constructor
+	 *
+	 * @param Backend\BackendInterface $carddavBackend
+	 * @param array $addressBookInfo
+	 * @param array $cardData
+	 */
+	public function __construct(Backend\BackendInterface $carddavBackend, array $addressBookInfo, array $cardData) {
+
+		$this->carddavBackend = $carddavBackend;
+		$this->addressBookInfo = $addressBookInfo;
+		$this->cardData = $cardData;
+
+	}
+
+	/**
+	 * Returns the uri for this object
+	 *
+	 * @return string
+	 */
+	public function getName() {
+
+		return $this->cardData['uri'];
+
+	}
+
+	/**
+	 * Returns the VCard-formatted object
+	 *
+	 * @return string
+	 */
+	public function get() {
+
+		// Pre-populating 'carddata' is optional. If we don't yet have it
+		// already, we fetch it from the backend.
+		if (!isset($this->cardData['carddata'])) {
+			$this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
+		}
+		return $this->cardData['carddata'];
+
+	}
+
+	/**
+	 * Updates the VCard-formatted object
+	 *
+	 * @param string $cardData
+	 * @return string|null
+	 */
+	public function put($cardData) {
+
+		if (is_resource($cardData))
+			$cardData = stream_get_contents($cardData);
+
+		// Converting to UTF-8, if needed
+		$cardData = DAV\StringUtil::ensureUTF8($cardData);
+
+		$etag = $this->carddavBackend->updateCard($this->addressBookInfo['id'], $this->cardData['uri'], $cardData);
+		$this->cardData['carddata'] = $cardData;
+		$this->cardData['etag'] = $etag;
+
+		return $etag;
+
+	}
+
+	/**
+	 * Deletes the card
+	 *
+	 * @return void
+	 */
+	public function delete() {
+
+		$this->carddavBackend->deleteCard($this->addressBookInfo['id'], $this->cardData['uri']);
+
+	}
+
+	/**
+	 * Returns the mime content-type
+	 *
+	 * @return string
+	 */
+	public function getContentType() {
+
+		return 'text/vcard; charset=utf-8';
+
+	}
+
+	/**
+	 * Returns an ETag for this object
+	 *
+	 * @return string
+	 */
+	public function getETag() {
+
+		if (isset($this->cardData['etag'])) {
+			return $this->cardData['etag'];
+		} else {
+			$data = $this->get();
+			if (is_string($data)) {
+				return '"' . md5($data) . '"';
+			} else {
+				// We refuse to calculate the md5 if it's a stream.
+				return null;
+			}
+		}
+
+	}
+
+	/**
+	 * Returns the last modification date as a unix timestamp
+	 *
+	 * @return int
+	 */
+	public function getLastModified() {
+
+		return isset($this->cardData['lastmodified']) ? $this->cardData['lastmodified'] : null;
+
+	}
+
+	/**
+	 * Returns the size of this object in bytes
+	 *
+	 * @return int
+	 */
+	public function getSize() {
+
+		if (array_key_exists('size', $this->cardData)) {
+			return $this->cardData['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->addressBookInfo['principaluri'];
+
+	}
+
+	/**
+	 * Returns a group principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getGroup() {
+
+		return null;
+
+	}
+
+	/**
+	 * 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 through the cardData array.
+		if (isset($this->cardData['acl'])) {
+			return $this->cardData['acl'];
+		}
+
+		return [
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->addressBookInfo['principaluri'],
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}write',
+				'principal' => $this->addressBookInfo['principaluri'],
+				'protected' => true,
+			],
+		];
+
+	}
+
+	/**
+	 * Updates the ACL
+	 *
+	 * This method will receive a list of new ACE's.
+	 *
+	 * @param array $acl
+	 * @return void
+	 */
+	public function setACL(array $acl) {
+
+		throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
+
+	}
+
+	/**
+	 * Returns the list of supported privileges for this node.
+	 *
+	 * The returned data structure is a list of nested privileges.
+	 * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+	 * standard structure.
+	 *
+	 * If null is returned from this method, the default privilege set is used,
+	 * which is fine for most common usecases.
+	 *
+	 * @return array|null
+	 */
+	public function getSupportedPrivilegeSet() {
+
+		return null;
+
+	}
 
 }

Braces +3 added lines, -2 removed lines

@@ -85,8 +85,9 @@
      */
     public function put($cardData) {
 
-        if (is_resource($cardData))
-            $cardData = stream_get_contents($cardData);
+        if (is_resource($cardData)) {
+                    $cardData = stream_get_contents($cardData);
+        }
 
         // Converting to UTF-8, if needed
         $cardData = DAV\StringUtil::ensureUTF8($cardData);

libraries/SabreDAV/CardDAV/Plugin.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -3,9 +3,9 @@
 namespace Sabre\CardDAV;
 
 use Sabre\DAV;
+use Sabre\DAVACL;
 use Sabre\DAV\Exception\ReportNotSupported;
 use Sabre\DAV\Xml\Property\Href;
-use Sabre\DAVACL;
 use Sabre\HTTP;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;

Indentation +815 added lines, -815 removed lines

@@ -22,686 +22,686 @@ 
  */
 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 Sabre\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
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    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
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode $node
-     * @return void
-     */
-    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 Href($this->getAddressBookHomeForPrincipal($path) . '/');
-            });
-
-            if ($this->directories) $propFind->handle('{' . self::NS_CARDDAV . '}directory-gateway', function() {
-                return new Href($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) = \Sabre\HTTP\URLUtil::splitPath($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
-     * @return void
-     */
-    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, $prefer['return'] === 'minimal'));
-
-    }
-
-    /**
-     * 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 DAV\IFile $node
-     * @param resource $data
-     * @param bool $modified Should be set to true, if this event handler
-     *                       changed &$data.
-     * @return void
-     */
-    public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified) {
-
-        if (!$node instanceof 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 DAV\ICollection $parentNode
-     * @param bool $modified Should be set to true, if this event handler
-     *                       changed &$data.
-     * @return void
-     */
-    public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified) {
-
-        if (!$parentNode instanceof 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.
-     * @return void
-     */
-    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 = md5($data);
-
-        // Converting the data to unicode, if needed.
-        $data = DAV\StringUtil::ensureUTF8($data);
-
-        if (md5($data) !== $before) $modified = true;
-
-        try {
-
-            // If the data starts with a [, we can reasonably assume we're dealing
-            // with a jCal object.
-            if (substr($data, 0, 1) === '[') {
-                $vobj = VObject\Reader::readJson($data);
-
-                // Converting $data back to iCalendar, as that's what we
-                // technically support everywhere.
-                $data = $vobj->serialize();
-                $modified = true;
-            } else {
-                $vobj = VObject\Reader::read($data);
-            }
-
-        } catch (VObject\ParseException $e) {
-
-            throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid vCard or jCard data. Parse error: ' . $e->getMessage());
-
-        }
-
-        if ($vobj->name !== 'VCARD') {
-            throw new DAV\Exception\UnsupportedMediaType('This collection can only support vcard objects.');
-        }
-
-        if (!isset($vobj->UID)) {
-            // No UID in vcards is invalid, but we'll just add it in anyway.
-            $vobj->add('UID', DAV\UUIDUtil::getUUID());
-            $data = $vobj->serialize();
-            $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
-     * @return void
-     */
-    protected function addressbookQueryReport($report) {
-
-        $depth = $this->server->getHTTPDepth(0);
-
-        if ($depth == 0) {
-            $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
-        );
+	/**
+	 * 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 Sabre\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
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	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
+	 *
+	 * @param DAV\PropFind $propFind
+	 * @param DAV\INode $node
+	 * @return void
+	 */
+	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 Href($this->getAddressBookHomeForPrincipal($path) . '/');
+			});
+
+			if ($this->directories) $propFind->handle('{' . self::NS_CARDDAV . '}directory-gateway', function() {
+				return new Href($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) = \Sabre\HTTP\URLUtil::splitPath($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
+	 * @return void
+	 */
+	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, $prefer['return'] === 'minimal'));
+
+	}
+
+	/**
+	 * 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 DAV\IFile $node
+	 * @param resource $data
+	 * @param bool $modified Should be set to true, if this event handler
+	 *                       changed &$data.
+	 * @return void
+	 */
+	public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified) {
+
+		if (!$node instanceof 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 DAV\ICollection $parentNode
+	 * @param bool $modified Should be set to true, if this event handler
+	 *                       changed &$data.
+	 * @return void
+	 */
+	public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified) {
+
+		if (!$parentNode instanceof 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.
+	 * @return void
+	 */
+	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 = md5($data);
+
+		// Converting the data to unicode, if needed.
+		$data = DAV\StringUtil::ensureUTF8($data);
+
+		if (md5($data) !== $before) $modified = true;
+
+		try {
+
+			// If the data starts with a [, we can reasonably assume we're dealing
+			// with a jCal object.
+			if (substr($data, 0, 1) === '[') {
+				$vobj = VObject\Reader::readJson($data);
+
+				// Converting $data back to iCalendar, as that's what we
+				// technically support everywhere.
+				$data = $vobj->serialize();
+				$modified = true;
+			} else {
+				$vobj = VObject\Reader::read($data);
+			}
+
+		} catch (VObject\ParseException $e) {
+
+			throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid vCard or jCard data. Parse error: ' . $e->getMessage());
+
+		}
+
+		if ($vobj->name !== 'VCARD') {
+			throw new DAV\Exception\UnsupportedMediaType('This collection can only support vcard objects.');
+		}
+
+		if (!isset($vobj->UID)) {
+			// No UID in vcards is invalid, but we'll just add it in anyway.
+			$vobj->add('UID', DAV\UUIDUtil::getUUID());
+			$data = $vobj->serialize();
+			$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
+	 * @return void
+	 */
+	protected function addressbookQueryReport($report) {
+
+		$depth = $this->server->getHTTPDepth(0);
+
+		if ($depth == 0) {
+			$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;
+		$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;
-            }
+			if ($report->limit && $report->limit <= count($validNodes)) {
+				// We hit the maximum number of items, we can stop now.
+				break;
+			}
 
-        }
+		}
 
-        $result = [];
-        foreach ($validNodes as $validNode) {
+		$result = [];
+		foreach ($validNodes as $validNode) {
 
-            if ($depth == 0) {
-                $href = $this->server->getRequestUri();
-            } else {
-                $href = $this->server->getRequestUri() . '/' . $validNode->getName();
-            }
+			if ($depth == 0) {
+				$href = $this->server->getRequestUri();
+			} else {
+				$href = $this->server->getRequestUri() . '/' . $validNode->getName();
+			}
 
-            list($props) = $this->server->getPropertiesForPath($href, $report->properties, 0);
+			list($props) = $this->server->getPropertiesForPath($href, $report->properties, 0);
 
-            if (isset($props[200]['{' . self::NS_CARDDAV . '}address-data'])) {
+			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
-                );
+				$props[200]['{' . self::NS_CARDDAV . '}address-data'] = $this->convertVCard(
+					$props[200]['{' . self::NS_CARDDAV . '}address-data'],
+					$vcardType
+				);
 
-            }
-            $result[] = $props;
+			}
+			$result[] = $props;
 
-        }
+		}
 
-        $prefer = $this->server->getHTTPPrefer();
+		$prefer = $this->server->getHTTPPrefer();
 
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return'] === 'minimal'));
-
-    }
-
-    /**
-     * Validates if a vcard makes it throught a list of filters.
-     *
-     * @param string $vcardData
-     * @param array $filters
-     * @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 {
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+		$this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return'] === 'minimal'));
+
+	}
+
+	/**
+	 * Validates if a vcard makes it throught a list of filters.
+	 *
+	 * @param string $vcardData
+	 * @param array $filters
+	 * @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']);
+				$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 = [];
+				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']);
-                }
+					$results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
+				}
 
-                if (count($results) === 1) {
-                    $success = $results[0];
-                } else {
-                    if ($filter['test'] === 'anyof') {
-                        $success = $results[0] || $results[1];
-                    } else {
-                        $success = $results[0] && $results[1];
-                    }
-                }
+				if (count($results) === 1) {
+					$success = $results[0];
+				} else {
+					if ($filter['test'] === 'anyof') {
+						$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 ($test === 'anyof' && $success) {
-
-                // Destroy circular references to PHP will GC the object.
-                $vcard->destroy();
-
-                return true;
-            }
-            if ($test === 'allof' && !$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 $test === 'allof';
-
-    }
-
-    /**
-     * Validates if a param-filter can be applied to a specific property.
-     * @param array $vProperties
-     * @param array $filters
-     * @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.
-                    $success = DAV\StringUtil::textMatch($vProperty[$filter['name']]->getValue(), $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
-                    if ($success) break;
-                }
-                if ($filter['text-match']['negate-condition']) {
-                    $success = !$success;
-                }
-
-            } // else
-
-            // There are two conditions where we can already determine whether
-            // or not this filter succeeds.
-            if ($test === 'anyof' && $success) {
-                return true;
-            }
-            if ($test === 'allof' && !$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 $test === 'allof';
-
-    }
-
-    /**
-     * Validates if a text-filter can be applied to a specific property.
-     *
-     * @param array $texts
-     * @param array $filters
-     * @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']);
-
-                // Breaking on the first match
-                if ($success) break;
-            }
-            if ($filter['negate-condition']) {
-                $success = !$success;
-            }
-
-            if ($success && $test === 'anyof')
-                return true;
-
-            if (!$success && $test == 'allof')
-                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 $test === 'allof';
-
-    }
-
-    /**
-     * This event is triggered when fetching properties.
-     *
-     * This event is scheduled late in the process, after most work for
-     * propfind has been done.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode $node
-     * @return void
-     */
-    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 (strpos($this->server->httpRequest->getHeader('User-Agent'), 'Thunderbird') === false) {
-            return;
-        }
-        $contentType = $propFind->get('{DAV:}getcontenttype');
-        list($part) = explode(';', $contentType);
-        if ($part === 'text/x-vcard' || $part === 'text/vcard') {
-            $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 DAV\INode $node
-     * @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="">
+			} // else
+
+			// There are two conditions where we can already determine whether
+			// or not this filter succeeds.
+			if ($test === 'anyof' && $success) {
+
+				// Destroy circular references to PHP will GC the object.
+				$vcard->destroy();
+
+				return true;
+			}
+			if ($test === 'allof' && !$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 $test === 'allof';
+
+	}
+
+	/**
+	 * Validates if a param-filter can be applied to a specific property.
+	 * @param array $vProperties
+	 * @param array $filters
+	 * @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.
+					$success = DAV\StringUtil::textMatch($vProperty[$filter['name']]->getValue(), $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
+					if ($success) break;
+				}
+				if ($filter['text-match']['negate-condition']) {
+					$success = !$success;
+				}
+
+			} // else
+
+			// There are two conditions where we can already determine whether
+			// or not this filter succeeds.
+			if ($test === 'anyof' && $success) {
+				return true;
+			}
+			if ($test === 'allof' && !$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 $test === 'allof';
+
+	}
+
+	/**
+	 * Validates if a text-filter can be applied to a specific property.
+	 *
+	 * @param array $texts
+	 * @param array $filters
+	 * @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']);
+
+				// Breaking on the first match
+				if ($success) break;
+			}
+			if ($filter['negate-condition']) {
+				$success = !$success;
+			}
+
+			if ($success && $test === 'anyof')
+				return true;
+
+			if (!$success && $test == 'allof')
+				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 $test === 'allof';
+
+	}
+
+	/**
+	 * This event is triggered when fetching properties.
+	 *
+	 * This event is scheduled late in the process, after most work for
+	 * propfind has been done.
+	 *
+	 * @param DAV\PropFind $propFind
+	 * @param DAV\INode $node
+	 * @return void
+	 */
+	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 (strpos($this->server->httpRequest->getHeader('User-Agent'), 'Thunderbird') === false) {
+			return;
+		}
+		$contentType = $propFind->get('{DAV:}getcontenttype');
+		list($part) = explode(';', $contentType);
+		if ($part === 'text/x-vcard' || $part === 'text/vcard') {
+			$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 DAV\INode $node
+	 * @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,157 +711,157 @@ 
             </form>
             </td></tr>';
 
-        return false;
-
-    }
-
-    /**
-     * This event is triggered after GET requests.
-     *
-     * This is used to transform data into jCal, if this was requested.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function httpAfterGet(RequestInterface $request, ResponseInterface $response) {
-
-        if (strpos($response->getHeader('Content-Type'), 'text/vcard') === false) {
-            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\Util::negotiate(
-            $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 $data
-     * @param string $target
-     * @return string
-     */
-    protected function convertVCard($data, $target) {
-
-        $data = VObject\Reader::read($data);
-        switch ($target) {
-            default :
-            case 'vcard3' :
-                $data = $data->convert(VObject\Document::VCARD30);
-                $newResult = $data->serialize();
-                break;
-            case 'vcard4' :
-                $data = $data->convert(VObject\Document::VCARD40);
-                $newResult = $data->serialize();
-                break;
-            case 'jcard' :
-                $data = $data->convert(VObject\Document::VCARD40);
-                $newResult = json_encode($data->jsonSerialize());
-                break;
-
-        }
-        // Destroy circular references to PHP will GC the object.
-        $data->destroy();
-
-        return $newResult;
-
-    }
-
-    /**
-     * 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.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	public function httpAfterGet(RequestInterface $request, ResponseInterface $response) {
+
+		if (strpos($response->getHeader('Content-Type'), 'text/vcard') === false) {
+			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\Util::negotiate(
+			$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 $data
+	 * @param string $target
+	 * @return string
+	 */
+	protected function convertVCard($data, $target) {
+
+		$data = VObject\Reader::read($data);
+		switch ($target) {
+			default :
+			case 'vcard3' :
+				$data = $data->convert(VObject\Document::VCARD30);
+				$newResult = $data->serialize();
+				break;
+			case 'vcard4' :
+				$data = $data->convert(VObject\Document::VCARD40);
+				$newResult = $data->serialize();
+				break;
+			case 'jcard' :
+				$data = $data->convert(VObject\Document::VCARD40);
+				$newResult = json_encode($data->jsonSerialize());
+				break;
+
+		}
+		// Destroy circular references to PHP will GC the object.
+		$data->destroy();
+
+		return $newResult;
+
+	}
+
+	/**
+	 * 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/',
+		];
+
+	}
 
 }

Doc Comments +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
      *
      * This is used in the DAV: header in the OPTIONS and PROPFIND requests.
      *
-     * @return array
+     * @return string[]
      */
     public function getFeatures() {
 
@@ -189,7 +189,7 @@ 
      * @param string $reportName
      * @param \DOMNode $dom
      * @param mixed $path
-     * @return bool
+     * @return false|null
      */
     public function report($reportName, $dom, $path) {
 
@@ -322,7 +322,7 @@ 
      *
      * An exception is thrown if it's not.
      *
-     * @param resource|string $data
+     * @param resource $data
      * @param bool $modified Should be set to true, if this event handler
      *                       changed &$data.
      * @return void
@@ -694,7 +694,7 @@ 
      *
      * @param DAV\INode $node
      * @param string $output
-     * @return bool
+     * @return null|false
      */
     public function htmlActionsPanel(DAV\INode $node, &$output) {
 

Spacing +7 added lines, -7 removed lines

@@ -63,13 +63,13 @@
     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->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';
 

Braces +42 added lines, -22 removed lines

@@ -159,8 +159,10 @@ 
                 return new Href($this->getAddressBookHomeForPrincipal($path) . '/');
             });
 
-            if ($this->directories) $propFind->handle('{' . self::NS_CARDDAV . '}directory-gateway', function() {
+            if ($this->directories) {
+            	$propFind->handle('{' . self::NS_CARDDAV . '}directory-gateway', function() {
                 return new Href($this->directories);
+            }
             });
 
         }
@@ -172,8 +174,9 @@ 
             // 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);
+                if (is_resource($val)) {
+                                    $val = stream_get_contents($val);
+                }
 
                 return $val;
 
@@ -288,8 +291,9 @@ 
      */
     public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified) {
 
-        if (!$node instanceof ICard)
-            return;
+        if (!$node instanceof ICard) {
+                    return;
+        }
 
         $this->validateVCard($data, $modified);
 
@@ -310,8 +314,9 @@ 
      */
     public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified) {
 
-        if (!$parentNode instanceof IAddressBook)
-            return;
+        if (!$parentNode instanceof IAddressBook) {
+                    return;
+        }
 
         $this->validateVCard($data, $modified);
 
@@ -339,7 +344,9 @@ 
         // Converting the data to unicode, if needed.
         $data = DAV\StringUtil::ensureUTF8($data);
 
-        if (md5($data) !== $before) $modified = true;
+        if (md5($data) !== $before) {
+        	$modified = true;
+        }
 
         try {
 
@@ -414,8 +421,9 @@ 
         $validNodes = [];
         foreach ($candidateNodes as $node) {
 
-            if (!$node instanceof ICard)
-                continue;
+            if (!$node instanceof ICard) {
+                            continue;
+            }
 
             $blob = $node->get();
             if (is_resource($blob)) {
@@ -478,7 +486,9 @@ 
     public function validateFilters($vcardData, array $filters, $test) {
 
 
-        if (!$filters) return true;
+        if (!$filters) {
+        	return true;
+        }
         $vcard = VObject\Reader::read($vcardData);
 
         foreach ($filters as $filter) {
@@ -505,8 +515,9 @@ 
                 }
                 if ($filter['text-matches']) {
                     $texts = [];
-                    foreach ($vProperties as $vProperty)
-                        $texts[] = $vProperty->getValue();
+                    foreach ($vProperties as $vProperty) {
+                                            $texts[] = $vProperty->getValue();
+                    }
 
                     $results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
                 }
@@ -569,7 +580,9 @@ 
             $isDefined = false;
             foreach ($vProperties as $vProperty) {
                 $isDefined = isset($vProperty[$filter['name']]);
-                if ($isDefined) break;
+                if ($isDefined) {
+                	break;
+                }
             }
 
             if ($filter['is-not-defined']) {
@@ -591,7 +604,9 @@ 
                     // If we got all the way here, we'll need to validate the
                     // text-match filter.
                     $success = DAV\StringUtil::textMatch($vProperty[$filter['name']]->getValue(), $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
-                    if ($success) break;
+                    if ($success) {
+                    	break;
+                    }
                 }
                 if ($filter['text-match']['negate-condition']) {
                     $success = !$success;
@@ -636,17 +651,21 @@ 
                 $success = DAV\StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
 
                 // Breaking on the first match
-                if ($success) break;
+                if ($success) {
+                	break;
+                }
             }
             if ($filter['negate-condition']) {
                 $success = !$success;
             }
 
-            if ($success && $test === 'anyof')
-                return true;
+            if ($success && $test === 'anyof') {
+                            return true;
+            }
 
-            if (!$success && $test == 'allof')
-                return false;
+            if (!$success && $test == 'allof') {
+                            return false;
+            }
 
 
         }
@@ -698,8 +717,9 @@ 
      */
     public function htmlActionsPanel(DAV\INode $node, &$output) {
 
-        if (!$node instanceof AddressBookHome)
-            return;
+        if (!$node instanceof AddressBookHome) {
+                    return;
+        }
 
         $output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Create new address book</h3>

libraries/SabreDAV/CardDAV/VCFExportPlugin.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -3,9 +3,9 @@
 namespace Sabre\CardDAV;
 
 use Sabre\DAV;
-use Sabre\VObject;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
+use Sabre\VObject;
 
 /**
  * VCF Exporter

Indentation +124 added lines, -124 removed lines

@@ -21,132 +21,132 @@
  */
 class VCFExportPlugin extends DAV\ServerPlugin {
 
-    /**
-     * Reference to Server class
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
+	/**
+	 * Reference to Server class
+	 *
+	 * @var Sabre\DAV\Server
+	 */
+	protected $server;
 
-    /**
-     * Initializes the plugin and registers event handlers
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $this->server->on('method:GET', [$this, 'httpGet'], 90);
-        $server->on('browserButtonActions', function($path, $node, &$actions) {
-            if ($node instanceof IAddressBook) {
-                $actions .= '<a href="' . htmlspecialchars($path, ENT_QUOTES, 'UTF-8') . '?export"><span class="oi" data-glyph="book"></span></a>';
-            }
-        });
-    }
-
-    /**
-     * Intercepts GET requests on addressbook urls ending with ?export.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpGet(RequestInterface $request, ResponseInterface $response) {
-
-        $queryParams = $request->getQueryParameters();
-        if (!array_key_exists('export', $queryParams)) return;
-
-        $path = $request->getPath();
-
-        $node = $this->server->tree->getNodeForPath($path);
-
-        if (!($node instanceof IAddressBook)) return;
-
-        $this->server->transactionType = 'get-addressbook-export';
-
-        // Checking ACL, if available.
-        if ($aclPlugin = $this->server->getPlugin('acl')) {
-            $aclPlugin->checkPrivileges($path, '{DAV:}read');
-        }
-
-        $response->setHeader('Content-Type', 'text/directory');
-        $response->setStatus(200);
-
-        $nodes = $this->server->getPropertiesForPath($path, [
-            '{' . Plugin::NS_CARDDAV . '}address-data',
-        ], 1);
-
-        $response->setBody($this->generateVCF($nodes));
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Merges all vcard objects, and builds one big vcf export
-     *
-     * @param array $nodes
-     * @return string
-     */
-    public function generateVCF(array $nodes) {
-
-        $output = "";
-
-        foreach ($nodes as $node) {
-
-            if (!isset($node[200]['{' . Plugin::NS_CARDDAV . '}address-data'])) {
-                continue;
-            }
-            $nodeData = $node[200]['{' . Plugin::NS_CARDDAV . '}address-data'];
-
-            // Parsing this node so VObject can clean up the output.
-            $vcard = VObject\Reader::read($nodeData);
-            $output .= $vcard->serialize();
-
-            // Destroy circular references to PHP will GC the object.
-            $vcard->destroy();
-
-        }
-
-        return $output;
-
-    }
-
-    /**
-     * 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 'vcf-export';
-
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo() {
+	/**
+	 * Initializes the plugin and registers event handlers
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(DAV\Server $server) {
+
+		$this->server = $server;
+		$this->server->on('method:GET', [$this, 'httpGet'], 90);
+		$server->on('browserButtonActions', function($path, $node, &$actions) {
+			if ($node instanceof IAddressBook) {
+				$actions .= '<a href="' . htmlspecialchars($path, ENT_QUOTES, 'UTF-8') . '?export"><span class="oi" data-glyph="book"></span></a>';
+			}
+		});
+	}
+
+	/**
+	 * Intercepts GET requests on addressbook urls ending with ?export.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpGet(RequestInterface $request, ResponseInterface $response) {
+
+		$queryParams = $request->getQueryParameters();
+		if (!array_key_exists('export', $queryParams)) return;
+
+		$path = $request->getPath();
+
+		$node = $this->server->tree->getNodeForPath($path);
+
+		if (!($node instanceof IAddressBook)) return;
+
+		$this->server->transactionType = 'get-addressbook-export';
+
+		// Checking ACL, if available.
+		if ($aclPlugin = $this->server->getPlugin('acl')) {
+			$aclPlugin->checkPrivileges($path, '{DAV:}read');
+		}
+
+		$response->setHeader('Content-Type', 'text/directory');
+		$response->setStatus(200);
+
+		$nodes = $this->server->getPropertiesForPath($path, [
+			'{' . Plugin::NS_CARDDAV . '}address-data',
+		], 1);
+
+		$response->setBody($this->generateVCF($nodes));
+
+		// Returning false to break the event chain
+		return false;
+
+	}
+
+	/**
+	 * Merges all vcard objects, and builds one big vcf export
+	 *
+	 * @param array $nodes
+	 * @return string
+	 */
+	public function generateVCF(array $nodes) {
+
+		$output = "";
+
+		foreach ($nodes as $node) {
+
+			if (!isset($node[200]['{' . Plugin::NS_CARDDAV . '}address-data'])) {
+				continue;
+			}
+			$nodeData = $node[200]['{' . Plugin::NS_CARDDAV . '}address-data'];
+
+			// Parsing this node so VObject can clean up the output.
+			$vcard = VObject\Reader::read($nodeData);
+			$output .= $vcard->serialize();
+
+			// Destroy circular references to PHP will GC the object.
+			$vcard->destroy();
+
+		}
+
+		return $output;
+
+	}
+
+	/**
+	 * 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 'vcf-export';
+
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo() {
 
-        return [
-            'name'        => $this->getPluginName(),
-            'description' => 'Adds the ability to export CardDAV addressbooks as a single vCard file.',
-            'link'        => 'http://sabre.io/dav/vcf-export-plugin/',
-        ];
+		return [
+			'name'        => $this->getPluginName(),
+			'description' => 'Adds the ability to export CardDAV addressbooks as a single vCard file.',
+			'link'        => 'http://sabre.io/dav/vcf-export-plugin/',
+		];
 
-    }
+	}
 
 }

Braces +6 added lines, -2 removed lines

@@ -55,13 +55,17 @@
     public function httpGet(RequestInterface $request, ResponseInterface $response) {
 
         $queryParams = $request->getQueryParameters();
-        if (!array_key_exists('export', $queryParams)) return;
+        if (!array_key_exists('export', $queryParams)) {
+        	return;
+        }
 
         $path = $request->getPath();
 
         $node = $this->server->tree->getNodeForPath($path);
 
-        if (!($node instanceof IAddressBook)) return;
+        if (!($node instanceof IAddressBook)) {
+        	return;
+        }
 
         $this->server->transactionType = 'get-addressbook-export';
 

Doc Comments +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
      *
      * @param RequestInterface $request
      * @param ResponseInterface $response
-     * @return bool
+     * @return null|false
      */
     public function httpGet(RequestInterface $request, ResponseInterface $response) {
 

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

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,10 +2,10 @@
 
 namespace Sabre\CardDAV\Xml\Filter;
 
+use Sabre\CardDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Element;
 use Sabre\Xml\Reader;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\CardDAV\Plugin;
 
 /**
  * ParamFilter parser.

Indentation +62 added lines, -62 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -57,12 +57,14 @@
 
         $elems = $reader->parseInnerTree();
 
-        if (is_array($elems)) foreach ($elems as $elem) {
+        if (is_array($elems)) {
+        	foreach ($elems as $elem) {
 
             switch ($elem['name']) {
 
                 case '{' . Plugin::NS_CARDDAV . '}is-not-defined' :
                     $result['is-not-defined'] = true;
+        }
                     break;
                 case '{' . Plugin::NS_CARDDAV . '}text-match' :
                     $matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';

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

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,10 +2,10 @@
 
 namespace Sabre\CardDAV\Xml\Filter;
 
+use Sabre\CardDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\CardDAV\Plugin;
 
 /**
  * PropFilter parser.

Indentation +71 added lines, -71 removed lines

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

Braces +3 added lines, -1 removed lines

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