YetiForceCompany / YetiForceCRM

libraries/SabreDAV/DAV/Xml/Request/SyncCollectionReport.php

Indentation +98 added lines, -98 removed lines

@@ -20,103 +20,103 @@
  */
 class SyncCollectionReport implements XmlDeserializable {
 
-    /**
-     * The sync-token the client supplied for the report.
-     *
-     * @var string|null
-     */
-    public $syncToken;
-
-    /**
-     * The 'depth' of the sync the client is interested in.
-     *
-     * @var int
-     */
-    public $syncLevel;
-
-    /**
-     * Maximum amount of items returned.
-     *
-     * @var int|null
-     */
-    public $limit;
-
-    /**
-     * The list of properties that are being requested for every change.
-     *
-     * @var null|array
-     */
-    public $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) {
-
-        $self = new self();
-
-        $reader->pushContext();
-
-        $reader->elementMap['{DAV:}prop']   = 'Sabre\Xml\Element\Elements';
-        $elems = KeyValue::xmlDeserialize($reader);
-
-        $reader->popContext();
-
-        $required = [
-            '{DAV:}sync-token',
-            '{DAV:}prop',
-            ];
-
-        foreach ($required as $elem) {
-            if (!array_key_exists($elem, $elems)) {
-                throw new BadRequest('The ' . $elem . ' element in the {DAV:}sync-collection report is required');
-            }
-        }
-
-
-        $self->properties = $elems['{DAV:}prop'];
-        $self->syncToken = $elems['{DAV:}sync-token'];
-
-        if (isset($elems['{DAV:}limit'])) {
-            $nresults = null;
-            foreach ($elems['{DAV:}limit'] as $child) {
-                if ($child['name'] === '{DAV:}nresults') {
-                    $nresults = (int)$child['value'];
-                }
-            }
-            $self->limit = $nresults;
-        }
-
-        if (isset($elems['{DAV:}sync-level'])) {
-
-            $value = $elems['{DAV:}sync-level'];
-            if ($value === 'infinity') {
-                $value = \Sabre\DAV\Server::DEPTH_INFINITY;
-            }
-            $self->syncLevel = $value;
-
-        }
-
-        return $self;
-
-    }
+	/**
+	 * The sync-token the client supplied for the report.
+	 *
+	 * @var string|null
+	 */
+	public $syncToken;
+
+	/**
+	 * The 'depth' of the sync the client is interested in.
+	 *
+	 * @var int
+	 */
+	public $syncLevel;
+
+	/**
+	 * Maximum amount of items returned.
+	 *
+	 * @var int|null
+	 */
+	public $limit;
+
+	/**
+	 * The list of properties that are being requested for every change.
+	 *
+	 * @var null|array
+	 */
+	public $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) {
+
+		$self = new self();
+
+		$reader->pushContext();
+
+		$reader->elementMap['{DAV:}prop']   = 'Sabre\Xml\Element\Elements';
+		$elems = KeyValue::xmlDeserialize($reader);
+
+		$reader->popContext();
+
+		$required = [
+			'{DAV:}sync-token',
+			'{DAV:}prop',
+			];
+
+		foreach ($required as $elem) {
+			if (!array_key_exists($elem, $elems)) {
+				throw new BadRequest('The ' . $elem . ' element in the {DAV:}sync-collection report is required');
+			}
+		}
+
+
+		$self->properties = $elems['{DAV:}prop'];
+		$self->syncToken = $elems['{DAV:}sync-token'];
+
+		if (isset($elems['{DAV:}limit'])) {
+			$nresults = null;
+			foreach ($elems['{DAV:}limit'] as $child) {
+				if ($child['name'] === '{DAV:}nresults') {
+					$nresults = (int)$child['value'];
+				}
+			}
+			$self->limit = $nresults;
+		}
+
+		if (isset($elems['{DAV:}sync-level'])) {
+
+			$value = $elems['{DAV:}sync-level'];
+			if ($value === 'infinity') {
+				$value = \Sabre\DAV\Server::DEPTH_INFINITY;
+			}
+			$self->syncLevel = $value;
+
+		}
+
+		return $self;
+
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 
         $reader->pushContext();
 
-        $reader->elementMap['{DAV:}prop']   = 'Sabre\Xml\Element\Elements';
+        $reader->elementMap['{DAV:}prop'] = 'Sabre\Xml\Element\Elements';
         $elems = KeyValue::xmlDeserialize($reader);
 
         $reader->popContext();
@@ -99,7 +99,7 @@ 
             $nresults = null;
             foreach ($elems['{DAV:}limit'] as $child) {
                 if ($child['name'] === '{DAV:}nresults') {
-                    $nresults = (int)$child['value'];
+                    $nresults = (int) $child['value'];
                 }
             }
             $self->limit = $nresults;

libraries/SabreDAV/DAV/Xml/Response/MultiStatus.php

Braces +3 added lines, -1 removed lines

@@ -126,9 +126,11 @@
         $responses = [];
         $syncToken = null;
 
-        if ($elements) foreach ($elements as $elem) {
+        if ($elements) {
+        	foreach ($elements as $elem) {
             if ($elem['name'] === '{DAV:}response') {
                 $responses[] = $elem['value'];
+        }
             }
             if ($elem['name'] === '{DAV:}sync-token') {
                 $syncToken = $elem['value'];

Indentation +117 added lines, -117 removed lines

@@ -21,122 +21,122 @@
  */
 class MultiStatus implements Element {
 
-    /**
-     * The responses
-     *
-     * @var \Sabre\DAV\Xml\Element\Response[]
-     */
-    protected $responses;
-
-    /**
-     * A sync token (from RFC6578).
-     *
-     * @var string
-     */
-    protected $syncToken;
-
-    /**
-     * Constructor
-     *
-     * @param \Sabre\DAV\Xml\Element\Response[] $responses
-     * @param string $syncToken
-     */
-    public function __construct(array $responses, $syncToken = null) {
-
-        $this->responses = $responses;
-        $this->syncToken = $syncToken;
-
-    }
-
-    /**
-     * Returns the response list.
-     *
-     * @return \Sabre\DAV\Xml\Element\Response[]
-     */
-    public function getResponses() {
-
-        return $this->responses;
-
-    }
-
-    /**
-     * Returns the sync-token, if available.
-     *
-     * @return string|null
-     */
-    public function getSyncToken() {
-
-        return $this->syncToken;
-
-    }
-
-    /**
-     * The serialize method is called during xml writing.
-     *
-     * It should use the $writer argument to encode this object into XML.
-     *
-     * Important note: it is not needed to create the parent element. The
-     * parent element is already created, and we only have to worry about
-     * attributes, child elements and text (if any).
-     *
-     * Important note 2: If you are writing any new elements, you are also
-     * responsible for closing them.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        foreach ($this->getResponses() as $response) {
-            $writer->writeElement('{DAV:}response', $response);
-        }
-        if ($syncToken = $this->getSyncToken()) {
-            $writer->writeElement('{DAV:}sync-token', $syncToken);
-        }
-
-    }
-
-    /**
-     * 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) {
-
-        $elementMap = $reader->elementMap;
-        $elementMap['{DAV:}prop'] = 'Sabre\\DAV\\Xml\\Element\\Prop';
-        $elements = $reader->parseInnerTree($elementMap);
-
-        $responses = [];
-        $syncToken = null;
-
-        if ($elements) foreach ($elements as $elem) {
-            if ($elem['name'] === '{DAV:}response') {
-                $responses[] = $elem['value'];
-            }
-            if ($elem['name'] === '{DAV:}sync-token') {
-                $syncToken = $elem['value'];
-            }
-        }
-
-        return new self($responses, $syncToken);
-
-    }
+	/**
+	 * The responses
+	 *
+	 * @var \Sabre\DAV\Xml\Element\Response[]
+	 */
+	protected $responses;
+
+	/**
+	 * A sync token (from RFC6578).
+	 *
+	 * @var string
+	 */
+	protected $syncToken;
+
+	/**
+	 * Constructor
+	 *
+	 * @param \Sabre\DAV\Xml\Element\Response[] $responses
+	 * @param string $syncToken
+	 */
+	public function __construct(array $responses, $syncToken = null) {
+
+		$this->responses = $responses;
+		$this->syncToken = $syncToken;
+
+	}
+
+	/**
+	 * Returns the response list.
+	 *
+	 * @return \Sabre\DAV\Xml\Element\Response[]
+	 */
+	public function getResponses() {
+
+		return $this->responses;
+
+	}
+
+	/**
+	 * Returns the sync-token, if available.
+	 *
+	 * @return string|null
+	 */
+	public function getSyncToken() {
+
+		return $this->syncToken;
+
+	}
+
+	/**
+	 * The serialize method is called during xml writing.
+	 *
+	 * It should use the $writer argument to encode this object into XML.
+	 *
+	 * Important note: it is not needed to create the parent element. The
+	 * parent element is already created, and we only have to worry about
+	 * attributes, child elements and text (if any).
+	 *
+	 * Important note 2: If you are writing any new elements, you are also
+	 * responsible for closing them.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		foreach ($this->getResponses() as $response) {
+			$writer->writeElement('{DAV:}response', $response);
+		}
+		if ($syncToken = $this->getSyncToken()) {
+			$writer->writeElement('{DAV:}sync-token', $syncToken);
+		}
+
+	}
+
+	/**
+	 * 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) {
+
+		$elementMap = $reader->elementMap;
+		$elementMap['{DAV:}prop'] = 'Sabre\\DAV\\Xml\\Element\\Prop';
+		$elements = $reader->parseInnerTree($elementMap);
+
+		$responses = [];
+		$syncToken = null;
+
+		if ($elements) foreach ($elements as $elem) {
+			if ($elem['name'] === '{DAV:}response') {
+				$responses[] = $elem['value'];
+			}
+			if ($elem['name'] === '{DAV:}sync-token') {
+				$syncToken = $elem['value'];
+			}
+		}
+
+		return new self($responses, $syncToken);
+
+	}
 
 }

libraries/SabreDAV/DAV/Xml/Property/Href.php

Spacing +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
     static function xmlDeserialize(Reader $reader) {
 
         $hrefs = [];
-        foreach ((array)$reader->parseInnerTree() as $elem) {
+        foreach ((array) $reader->parseInnerTree() as $elem) {
             if ($elem['name'] !== '{DAV:}href')
                 continue;
 

Braces +3 added lines, -2 removed lines

@@ -161,8 +161,9 @@
 
         $hrefs = [];
         foreach ((array)$reader->parseInnerTree() as $elem) {
-            if ($elem['name'] !== '{DAV:}href')
-                continue;
+            if ($elem['name'] !== '{DAV:}href') {
+                            continue;
+            }
 
             $hrefs[] = $elem['value'];
 

Indentation +148 added lines, -148 removed lines

@@ -24,153 +24,153 @@
  */
 class Href implements Element, HtmlOutput {
 
-    /**
-     * List of uris
-     *
-     * @var array
-     */
-    protected $hrefs;
-
-    /**
-     * Automatically prefix the url with the server base directory
-     *
-     * @var bool
-     */
-    protected $autoPrefix = true;
-
-    /**
-     * Constructor
-     *
-     * You must either pass a string for a single href, or an array of hrefs.
-     *
-     * If auto-prefix is set to false, the hrefs will be treated as absolute
-     * and not relative to the servers base uri.
-     *
-     * @param string|string[] $href
-     * @param bool $autoPrefix
-     */
-    public function __construct($hrefs, $autoPrefix = true) {
-
-        if (is_string($hrefs)) {
-            $hrefs = [$hrefs];
-        }
-        $this->hrefs = $hrefs;
-        $this->autoPrefix = $autoPrefix;
-
-
-    }
-
-    /**
-     * Returns the first Href.
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->hrefs[0];
-
-    }
-
-    /**
-     * Returns the hrefs as an array
-     *
-     * @return array
-     */
-    public function getHrefs() {
-
-        return $this->hrefs;
-
-    }
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        foreach ($this->getHrefs() as $href) {
-            if ($this->autoPrefix) {
-                $href = $writer->contextUri . \Sabre\HTTP\encodePath($href);
-            }
-            $writer->writeElement('{DAV:}href', $href);
-        }
-
-    }
-
-    /**
-     * Generate html representation for this value.
-     *
-     * The html output is 100% trusted, and no effort is being made to sanitize
-     * it. It's up to the implementor to sanitize user provided values.
-     *
-     * The output must be in UTF-8.
-     *
-     * The baseUri parameter is a url to the root of the application, and can
-     * be used to construct local links.
-     *
-     * @param HtmlOutputHelper $html
-     * @return string
-     */
-    public function toHtml(HtmlOutputHelper $html) {
-
-        $links = [];
-        foreach ($this->getHrefs() as $href) {
-            $links[] = $html->link($href);
-        }
-        return implode('<br />', $links);
-
-    }
-
-    /**
-     * 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) {
-
-        $hrefs = [];
-        foreach ((array)$reader->parseInnerTree() as $elem) {
-            if ($elem['name'] !== '{DAV:}href')
-                continue;
-
-            $hrefs[] = $elem['value'];
-
-        }
-        if ($hrefs) {
-            return new self($hrefs, false);
-        }
-
-    }
+	/**
+	 * List of uris
+	 *
+	 * @var array
+	 */
+	protected $hrefs;
+
+	/**
+	 * Automatically prefix the url with the server base directory
+	 *
+	 * @var bool
+	 */
+	protected $autoPrefix = true;
+
+	/**
+	 * Constructor
+	 *
+	 * You must either pass a string for a single href, or an array of hrefs.
+	 *
+	 * If auto-prefix is set to false, the hrefs will be treated as absolute
+	 * and not relative to the servers base uri.
+	 *
+	 * @param string|string[] $href
+	 * @param bool $autoPrefix
+	 */
+	public function __construct($hrefs, $autoPrefix = true) {
+
+		if (is_string($hrefs)) {
+			$hrefs = [$hrefs];
+		}
+		$this->hrefs = $hrefs;
+		$this->autoPrefix = $autoPrefix;
+
+
+	}
+
+	/**
+	 * Returns the first Href.
+	 *
+	 * @return string
+	 */
+	public function getHref() {
+
+		return $this->hrefs[0];
+
+	}
+
+	/**
+	 * Returns the hrefs as an array
+	 *
+	 * @return array
+	 */
+	public function getHrefs() {
+
+		return $this->hrefs;
+
+	}
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		foreach ($this->getHrefs() as $href) {
+			if ($this->autoPrefix) {
+				$href = $writer->contextUri . \Sabre\HTTP\encodePath($href);
+			}
+			$writer->writeElement('{DAV:}href', $href);
+		}
+
+	}
+
+	/**
+	 * Generate html representation for this value.
+	 *
+	 * The html output is 100% trusted, and no effort is being made to sanitize
+	 * it. It's up to the implementor to sanitize user provided values.
+	 *
+	 * The output must be in UTF-8.
+	 *
+	 * The baseUri parameter is a url to the root of the application, and can
+	 * be used to construct local links.
+	 *
+	 * @param HtmlOutputHelper $html
+	 * @return string
+	 */
+	public function toHtml(HtmlOutputHelper $html) {
+
+		$links = [];
+		foreach ($this->getHrefs() as $href) {
+			$links[] = $html->link($href);
+		}
+		return implode('<br />', $links);
+
+	}
+
+	/**
+	 * 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) {
+
+		$hrefs = [];
+		foreach ((array)$reader->parseInnerTree() as $elem) {
+			if ($elem['name'] !== '{DAV:}href')
+				continue;
+
+			$hrefs[] = $elem['value'];
+
+		}
+		if ($hrefs) {
+			return new self($hrefs, false);
+		}
+
+	}
 
 }

libraries/SabreDAV/DAV/Xml/Property/Complex.php

Indentation +58 added lines, -58 removed lines

@@ -17,73 +17,73 @@
  */
 class Complex extends XmlFragment {
 
-    /**
-     * 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) {
 
-        $xml = $reader->readInnerXml();
+		$xml = $reader->readInnerXml();
 
-        if ($reader->nodeType === Reader::ELEMENT && $reader->isEmptyElement) {
-            // Easy!
-            $reader->next();
-            return null;
-        }
-        // Now we have a copy of the inner xml, we need to traverse it to get
-        // all the strings. If there's no non-string data, we just return the
-        // string, otherwise we return an instance of this class.
-        $reader->read();
+		if ($reader->nodeType === Reader::ELEMENT && $reader->isEmptyElement) {
+			// Easy!
+			$reader->next();
+			return null;
+		}
+		// Now we have a copy of the inner xml, we need to traverse it to get
+		// all the strings. If there's no non-string data, we just return the
+		// string, otherwise we return an instance of this class.
+		$reader->read();
 
-        $nonText = false;
-        $text = '';
+		$nonText = false;
+		$text = '';
 
-        while (true) {
+		while (true) {
 
-            switch ($reader->nodeType) {
-                case Reader::ELEMENT :
-                    $nonText = true;
-                    $reader->next();
-                    continue 2;
-                case Reader::TEXT :
-                case Reader::CDATA :
-                    $text .= $reader->value;
-                    break;
-                case Reader::END_ELEMENT :
-                    break 2;
-            }
-            $reader->read();
+			switch ($reader->nodeType) {
+				case Reader::ELEMENT :
+					$nonText = true;
+					$reader->next();
+					continue 2;
+				case Reader::TEXT :
+				case Reader::CDATA :
+					$text .= $reader->value;
+					break;
+				case Reader::END_ELEMENT :
+					break 2;
+			}
+			$reader->read();
 
-        }
+		}
 
-        // Make sure we advance the cursor one step further.
-        $reader->read();
+		// Make sure we advance the cursor one step further.
+		$reader->read();
 
-        if ($nonText) {
-            $new = new self($xml);
-            return $new;
-        } else {
-            return $text;
-        }
+		if ($nonText) {
+			$new = new self($xml);
+			return $new;
+		} else {
+			return $text;
+		}
 
-    }
+	}
 
 
 }

libraries/SabreDAV/DAV/Xml/Element/Response.php

Spacing +2 added lines, -2 removed lines

@@ -234,12 +234,12 @@
                     break;
                 case '{DAV:}propstat' :
                     $status = $elem['value']['{DAV:}status'];
-                    list(, $status, ) = explode(' ', $status, 3);
+                    list(, $status,) = explode(' ', $status, 3);
                     $properties = isset($elem['value']['{DAV:}prop']) ? $elem['value']['{DAV:}prop'] : [];
                     if ($properties) $propertyLists[$status] = $properties;
                     break;
                 case '{DAV:}status' :
-                    list(, $statusCode, ) = explode(' ', $elem['value'], 3);
+                    list(, $statusCode,) = explode(' ', $elem['value'], 3);
                     break;
 
             }

Braces +3 added lines, -1 removed lines

@@ -236,7 +236,9 @@
                     $status = $elem['value']['{DAV:}status'];
                     list(, $status, ) = explode(' ', $status, 3);
                     $properties = isset($elem['value']['{DAV:}prop']) ? $elem['value']['{DAV:}prop'] : [];
-                    if ($properties) $propertyLists[$status] = $properties;
+                    if ($properties) {
+                    	$propertyLists[$status] = $properties;
+                    }
                     break;
                 case '{DAV:}status' :
                     list(, $statusCode, ) = explode(' ', $elem['value'], 3);

Indentation +223 added lines, -223 removed lines

@@ -19,128 +19,128 @@ 
  */
 class Response implements Element {
 
-    /**
-     * Url for the response
-     *
-     * @var string
-     */
-    protected $href;
-
-    /**
-     * Propertylist, ordered by HTTP status code
-     *
-     * @var array
-     */
-    protected $responseProperties;
-
-    /**
-     * The HTTP status for an entire response.
-     *
-     * This is currently only used in WebDAV-Sync
-     *
-     * @var string
-     */
-    protected $httpStatus;
-
-    /**
-     * The href argument is a url relative to the root of the server. This
-     * class will calculate the full path.
-     *
-     * The responseProperties argument is a list of properties
-     * within an array with keys representing HTTP status codes
-     *
-     * Besides specific properties, the entire {DAV:}response element may also
-     * have a http status code.
-     * In most cases you don't need it.
-     *
-     * This is currently used by the Sync extension to indicate that a node is
-     * deleted.
-     *
-     * @param string $href
-     * @param array $responseProperties
-     * @param string $httpStatus
-     */
-    public function __construct($href, array $responseProperties, $httpStatus = null) {
-
-        $this->href = $href;
-        $this->responseProperties = $responseProperties;
-        $this->httpStatus = $httpStatus;
-
-    }
-
-    /**
-     * Returns the url
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Returns the httpStatus value
-     *
-     * @return string
-     */
-    public function getHttpStatus() {
-
-        return $this->httpStatus;
-
-    }
-
-    /**
-     * Returns the property list
-     *
-     * @return array
-     */
-    public function getResponseProperties() {
-
-        return $this->responseProperties;
-
-    }
-
-
-    /**
-     * The serialize method is called during xml writing.
-     *
-     * It should use the $writer argument to encode this object into XML.
-     *
-     * Important note: it is not needed to create the parent element. The
-     * parent element is already created, and we only have to worry about
-     * attributes, child elements and text (if any).
-     *
-     * Important note 2: If you are writing any new elements, you are also
-     * responsible for closing them.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        if ($status = $this->getHTTPStatus()) {
-            $writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
-        }
-        $writer->writeElement('{DAV:}href', $writer->contextUri . \Sabre\HTTP\encodePath($this->getHref()));
-
-        $empty = true;
-
-        foreach ($this->getResponseProperties() as $status => $properties) {
-
-            // Skipping empty lists
-            if (!$properties || (!ctype_digit($status) && !is_int($status))) {
-                continue;
-            }
-            $empty = false;
-            $writer->startElement('{DAV:}propstat');
-            $writer->writeElement('{DAV:}prop', $properties);
-            $writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
-            $writer->endElement(); // {DAV:}propstat
-
-        }
-        if ($empty) {
-            /*
+	/**
+	 * Url for the response
+	 *
+	 * @var string
+	 */
+	protected $href;
+
+	/**
+	 * Propertylist, ordered by HTTP status code
+	 *
+	 * @var array
+	 */
+	protected $responseProperties;
+
+	/**
+	 * The HTTP status for an entire response.
+	 *
+	 * This is currently only used in WebDAV-Sync
+	 *
+	 * @var string
+	 */
+	protected $httpStatus;
+
+	/**
+	 * The href argument is a url relative to the root of the server. This
+	 * class will calculate the full path.
+	 *
+	 * The responseProperties argument is a list of properties
+	 * within an array with keys representing HTTP status codes
+	 *
+	 * Besides specific properties, the entire {DAV:}response element may also
+	 * have a http status code.
+	 * In most cases you don't need it.
+	 *
+	 * This is currently used by the Sync extension to indicate that a node is
+	 * deleted.
+	 *
+	 * @param string $href
+	 * @param array $responseProperties
+	 * @param string $httpStatus
+	 */
+	public function __construct($href, array $responseProperties, $httpStatus = null) {
+
+		$this->href = $href;
+		$this->responseProperties = $responseProperties;
+		$this->httpStatus = $httpStatus;
+
+	}
+
+	/**
+	 * Returns the url
+	 *
+	 * @return string
+	 */
+	public function getHref() {
+
+		return $this->href;
+
+	}
+
+	/**
+	 * Returns the httpStatus value
+	 *
+	 * @return string
+	 */
+	public function getHttpStatus() {
+
+		return $this->httpStatus;
+
+	}
+
+	/**
+	 * Returns the property list
+	 *
+	 * @return array
+	 */
+	public function getResponseProperties() {
+
+		return $this->responseProperties;
+
+	}
+
+
+	/**
+	 * The serialize method is called during xml writing.
+	 *
+	 * It should use the $writer argument to encode this object into XML.
+	 *
+	 * Important note: it is not needed to create the parent element. The
+	 * parent element is already created, and we only have to worry about
+	 * attributes, child elements and text (if any).
+	 *
+	 * Important note 2: If you are writing any new elements, you are also
+	 * responsible for closing them.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		if ($status = $this->getHTTPStatus()) {
+			$writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
+		}
+		$writer->writeElement('{DAV:}href', $writer->contextUri . \Sabre\HTTP\encodePath($this->getHref()));
+
+		$empty = true;
+
+		foreach ($this->getResponseProperties() as $status => $properties) {
+
+			// Skipping empty lists
+			if (!$properties || (!ctype_digit($status) && !is_int($status))) {
+				continue;
+			}
+			$empty = false;
+			$writer->startElement('{DAV:}propstat');
+			$writer->writeElement('{DAV:}prop', $properties);
+			$writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
+			$writer->endElement(); // {DAV:}propstat
+
+		}
+		if ($empty) {
+			/*
              * The WebDAV spec _requires_ at least one DAV:propstat to appear for
              * every DAV:response. In some circumstances however, there are no
              * properties to encode.
@@ -148,106 +148,106 @@ 
              * In those cases we MUST specify at least one DAV:propstat anyway, with
              * no properties.
              */
-            $writer->writeElement('{DAV:}propstat', [
-                '{DAV:}prop'   => [],
-                '{DAV:}status' => 'HTTP/1.1 418 ' . \Sabre\HTTP\Response::$statusCodes[418]
-            ]);
-
-        }
-
-    }
-
-    /**
-     * 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) {
-
-        $reader->pushContext();
-
-        $reader->elementMap['{DAV:}propstat'] = 'Sabre\\Xml\\Element\\KeyValue';
-
-        // We are overriding the parser for {DAV:}prop. This deserializer is
-        // almost identical to the one for Sabre\Xml\Element\KeyValue.
-        //
-        // The difference is that if there are any child-elements inside of
-        // {DAV:}prop, that have no value, normally any deserializers are
-        // called. But we don't want this, because a singular element without
-        // child-elements implies 'no value' in {DAV:}prop, so we want to skip
-        // deserializers and just set null for those.
-        $reader->elementMap['{DAV:}prop'] = function(Reader $reader) {
-
-            if ($reader->isEmptyElement) {
-                $reader->next();
-                return [];
-            }
-            $values = [];
-            $reader->read();
-            do {
-                if ($reader->nodeType === Reader::ELEMENT) {
-                    $clark = $reader->getClark();
-
-                    if ($reader->isEmptyElement) {
-                        $values[$clark] = null;
-                        $reader->next();
-                    } else {
-                        $values[$clark] = $reader->parseCurrentElement()['value'];
-                    }
-                } else {
-                    $reader->read();
-                }
-            } while ($reader->nodeType !== Reader::END_ELEMENT);
-            $reader->read();
-            return $values;
-
-        };
-        $elems = $reader->parseInnerTree();
-        $reader->popContext();
-
-        $href = null;
-        $propertyLists = [];
-        $statusCode = null;
-
-        foreach ($elems as $elem) {
-
-            switch ($elem['name']) {
-
-                case '{DAV:}href' :
-                    $href = $elem['value'];
-                    break;
-                case '{DAV:}propstat' :
-                    $status = $elem['value']['{DAV:}status'];
-                    list(, $status, ) = explode(' ', $status, 3);
-                    $properties = isset($elem['value']['{DAV:}prop']) ? $elem['value']['{DAV:}prop'] : [];
-                    if ($properties) $propertyLists[$status] = $properties;
-                    break;
-                case '{DAV:}status' :
-                    list(, $statusCode, ) = explode(' ', $elem['value'], 3);
-                    break;
-
-            }
-
-        }
-
-        return new self($href, $propertyLists, $statusCode);
-
-    }
+			$writer->writeElement('{DAV:}propstat', [
+				'{DAV:}prop'   => [],
+				'{DAV:}status' => 'HTTP/1.1 418 ' . \Sabre\HTTP\Response::$statusCodes[418]
+			]);
+
+		}
+
+	}
+
+	/**
+	 * 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) {
+
+		$reader->pushContext();
+
+		$reader->elementMap['{DAV:}propstat'] = 'Sabre\\Xml\\Element\\KeyValue';
+
+		// We are overriding the parser for {DAV:}prop. This deserializer is
+		// almost identical to the one for Sabre\Xml\Element\KeyValue.
+		//
+		// The difference is that if there are any child-elements inside of
+		// {DAV:}prop, that have no value, normally any deserializers are
+		// called. But we don't want this, because a singular element without
+		// child-elements implies 'no value' in {DAV:}prop, so we want to skip
+		// deserializers and just set null for those.
+		$reader->elementMap['{DAV:}prop'] = function(Reader $reader) {
+
+			if ($reader->isEmptyElement) {
+				$reader->next();
+				return [];
+			}
+			$values = [];
+			$reader->read();
+			do {
+				if ($reader->nodeType === Reader::ELEMENT) {
+					$clark = $reader->getClark();
+
+					if ($reader->isEmptyElement) {
+						$values[$clark] = null;
+						$reader->next();
+					} else {
+						$values[$clark] = $reader->parseCurrentElement()['value'];
+					}
+				} else {
+					$reader->read();
+				}
+			} while ($reader->nodeType !== Reader::END_ELEMENT);
+			$reader->read();
+			return $values;
+
+		};
+		$elems = $reader->parseInnerTree();
+		$reader->popContext();
+
+		$href = null;
+		$propertyLists = [];
+		$statusCode = null;
+
+		foreach ($elems as $elem) {
+
+			switch ($elem['name']) {
+
+				case '{DAV:}href' :
+					$href = $elem['value'];
+					break;
+				case '{DAV:}propstat' :
+					$status = $elem['value']['{DAV:}status'];
+					list(, $status, ) = explode(' ', $status, 3);
+					$properties = isset($elem['value']['{DAV:}prop']) ? $elem['value']['{DAV:}prop'] : [];
+					if ($properties) $propertyLists[$status] = $properties;
+					break;
+				case '{DAV:}status' :
+					list(, $statusCode, ) = explode(' ', $elem['value'], 3);
+					break;
+
+			}
+
+		}
+
+		return new self($href, $propertyLists, $statusCode);
+
+	}
 
 }

libraries/SabreDAV/DAV/Xml/Element/Prop.php

Indentation +93 added lines, -93 removed lines

@@ -19,98 +19,98 @@
  */
 class Prop 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) {
-
-        // If there's no children, we don't do anything.
-        if ($reader->isEmptyElement) {
-            $reader->next();
-            return [];
-        }
-
-        $values = [];
-
-        $reader->read();
-        do {
-
-            if ($reader->nodeType === Reader::ELEMENT) {
-
-                $clark = $reader->getClark();
-                $values[$clark] = self::parseCurrentElement($reader)['value'];
-
-            } else {
-                $reader->read();
-            }
-
-        } while ($reader->nodeType !== Reader::END_ELEMENT);
-
-        $reader->read();
-
-        return $values;
-
-    }
-
-    /**
-     * This function behaves similar to Sabre\Xml\Reader::parseCurrentElement,
-     * but instead of creating deep xml array structures, it will turn any
-     * top-level element it doesn't recognize into either a string, or an
-     * XmlFragment class.
-     *
-     * This method returns arn array with 2 properties:
-     *   * name - A clark-notation XML element name.
-     *   * value - The parsed value.
-     *
-     * @param Reader $reader
-     * @return array
-     */
-    private static function parseCurrentElement(Reader $reader) {
-
-        $name = $reader->getClark();
-
-        if (array_key_exists($name, $reader->elementMap)) {
-            $deserializer = $reader->elementMap[$name];
-            if (is_subclass_of($deserializer, 'Sabre\\Xml\\XmlDeserializable')) {
-                $value = call_user_func([ $deserializer, 'xmlDeserialize' ], $reader);
-            } elseif (is_callable($deserializer)) {
-                $value = call_user_func($deserializer, $reader);
-            } else {
-                $type = gettype($deserializer);
-                if ($type === 'string') {
-                    $type .= ' (' . $deserializer . ')';
-                } elseif ($type === 'object') {
-                    $type .= ' (' . get_class($deserializer) . ')';
-                }
-                throw new \LogicException('Could not use this type as a deserializer: ' . $type);
-            }
-        } else {
-            $value = Complex::xmlDeserialize($reader);
-        }
-
-        return [
-            'name'  => $name,
-            'value' => $value,
-        ];
-
-    }
+	/**
+	 * 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) {
+
+		// If there's no children, we don't do anything.
+		if ($reader->isEmptyElement) {
+			$reader->next();
+			return [];
+		}
+
+		$values = [];
+
+		$reader->read();
+		do {
+
+			if ($reader->nodeType === Reader::ELEMENT) {
+
+				$clark = $reader->getClark();
+				$values[$clark] = self::parseCurrentElement($reader)['value'];
+
+			} else {
+				$reader->read();
+			}
+
+		} while ($reader->nodeType !== Reader::END_ELEMENT);
+
+		$reader->read();
+
+		return $values;
+
+	}
+
+	/**
+	 * This function behaves similar to Sabre\Xml\Reader::parseCurrentElement,
+	 * but instead of creating deep xml array structures, it will turn any
+	 * top-level element it doesn't recognize into either a string, or an
+	 * XmlFragment class.
+	 *
+	 * This method returns arn array with 2 properties:
+	 *   * name - A clark-notation XML element name.
+	 *   * value - The parsed value.
+	 *
+	 * @param Reader $reader
+	 * @return array
+	 */
+	private static function parseCurrentElement(Reader $reader) {
+
+		$name = $reader->getClark();
+
+		if (array_key_exists($name, $reader->elementMap)) {
+			$deserializer = $reader->elementMap[$name];
+			if (is_subclass_of($deserializer, 'Sabre\\Xml\\XmlDeserializable')) {
+				$value = call_user_func([ $deserializer, 'xmlDeserialize' ], $reader);
+			} elseif (is_callable($deserializer)) {
+				$value = call_user_func($deserializer, $reader);
+			} else {
+				$type = gettype($deserializer);
+				if ($type === 'string') {
+					$type .= ' (' . $deserializer . ')';
+				} elseif ($type === 'object') {
+					$type .= ' (' . get_class($deserializer) . ')';
+				}
+				throw new \LogicException('Could not use this type as a deserializer: ' . $type);
+			}
+		} else {
+			$value = Complex::xmlDeserialize($reader);
+		}
+
+		return [
+			'name'  => $name,
+			'value' => $value,
+		];
+
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
         if (array_key_exists($name, $reader->elementMap)) {
             $deserializer = $reader->elementMap[$name];
             if (is_subclass_of($deserializer, 'Sabre\\Xml\\XmlDeserializable')) {
-                $value = call_user_func([ $deserializer, 'xmlDeserialize' ], $reader);
+                $value = call_user_func([$deserializer, 'xmlDeserialize'], $reader);
             } elseif (is_callable($deserializer)) {
                 $value = call_user_func($deserializer, $reader);
             } else {

libraries/SabreDAV/DAV/Xml/Service.php

Indentation +32 added lines, -32 removed lines

@@ -11,37 +11,37 @@
  */
 class Service extends \Sabre\Xml\Service {
 
-    /**
-     * This is a list of XML elements that we automatically map to PHP classes.
-     *
-     * For instance, this list may contain an entry `{DAV:}propfind` that would
-     * be mapped to Sabre\DAV\Xml\Request\PropFind
-     */
-    public $elementMap = [
-        '{DAV:}multistatus' => 'Sabre\\DAV\\Xml\\Response\\MultiStatus',
-        '{DAV:}response'    => 'Sabre\\DAV\\Xml\\Element\\Response',
-
-        // Requests
-        '{DAV:}propfind'       => 'Sabre\\DAV\\Xml\\Request\\PropFind',
-        '{DAV:}propertyupdate' => 'Sabre\\DAV\\Xml\\Request\\PropPatch',
-        '{DAV:}mkcol'          => 'Sabre\\DAV\\Xml\\Request\\MkCol',
-
-        // Properties
-        '{DAV:}resourcetype' => 'Sabre\\DAV\\Xml\\Property\\ResourceType',
-
-    ];
-
-    /**
-     * This is a default list of namespaces.
-     *
-     * If you are defining your own custom namespace, add it here to reduce
-     * bandwidth and improve legibility of xml bodies.
-     *
-     * @var array
-     */
-    public $namespaceMap = [
-        'DAV:'                   => 'd',
-        'http://sabredav.org/ns' => 's',
-    ];
+	/**
+	 * This is a list of XML elements that we automatically map to PHP classes.
+	 *
+	 * For instance, this list may contain an entry `{DAV:}propfind` that would
+	 * be mapped to Sabre\DAV\Xml\Request\PropFind
+	 */
+	public $elementMap = [
+		'{DAV:}multistatus' => 'Sabre\\DAV\\Xml\\Response\\MultiStatus',
+		'{DAV:}response'    => 'Sabre\\DAV\\Xml\\Element\\Response',
+
+		// Requests
+		'{DAV:}propfind'       => 'Sabre\\DAV\\Xml\\Request\\PropFind',
+		'{DAV:}propertyupdate' => 'Sabre\\DAV\\Xml\\Request\\PropPatch',
+		'{DAV:}mkcol'          => 'Sabre\\DAV\\Xml\\Request\\MkCol',
+
+		// Properties
+		'{DAV:}resourcetype' => 'Sabre\\DAV\\Xml\\Property\\ResourceType',
+
+	];
+
+	/**
+	 * This is a default list of namespaces.
+	 *
+	 * If you are defining your own custom namespace, add it here to reduce
+	 * bandwidth and improve legibility of xml bodies.
+	 *
+	 * @var array
+	 */
+	public $namespaceMap = [
+		'DAV:'                   => 'd',
+		'http://sabredav.org/ns' => 's',
+	];
 
 }

libraries/SabreDAV/CalDAV/Principal/User.php

Braces +6 added lines, -4 removed lines

@@ -57,11 +57,13 @@
         if (!$principal) {
             throw new DAV\Exception\NotFound('Node with name ' . $name . ' was not found');
         }
-        if ($name === 'calendar-proxy-read')
-            return new ProxyRead($this->principalBackend, $this->principalProperties);
+        if ($name === 'calendar-proxy-read') {
+                    return new ProxyRead($this->principalBackend, $this->principalProperties);
+        }
 
-        if ($name === 'calendar-proxy-write')
-            return new ProxyWrite($this->principalBackend, $this->principalProperties);
+        if ($name === 'calendar-proxy-write') {
+                    return new ProxyWrite($this->principalBackend, $this->principalProperties);
+        }
 
         throw new DAV\Exception\NotFound('Node with name ' . $name . ' was not found');
 

Indentation +113 added lines, -113 removed lines

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

libraries/SabreDAV/CalDAV/SharingPlugin.php

Spacing +4 added lines, -4 removed lines

@@ -95,10 +95,10 @@
         $this->server->xml->elementMap['{' . Plugin::NS_CALENDARSERVER . '}share'] = 'Sabre\\CalDAV\\Xml\\Request\\Share';
         $this->server->xml->elementMap['{' . Plugin::NS_CALENDARSERVER . '}invite-reply'] = 'Sabre\\CalDAV\\Xml\\Request\\InviteReply';
 
-        $this->server->on('propFind',     [$this, 'propFindEarly']);
-        $this->server->on('propFind',     [$this, 'propFindLate'], 150);
-        $this->server->on('propPatch',    [$this, 'propPatch'], 40);
-        $this->server->on('method:POST',  [$this, 'httpPost']);
+        $this->server->on('propFind', [$this, 'propFindEarly']);
+        $this->server->on('propFind', [$this, 'propFindLate'], 150);
+        $this->server->on('propPatch', [$this, 'propPatch'], 40);
+        $this->server->on('method:POST', [$this, 'httpPost']);
 
     }
 

Indentation +368 added lines, -368 removed lines

@@ -25,402 +25,402 @@
  */
 class SharingPlugin extends DAV\ServerPlugin {
 
-    /**
-     * These are the various status constants used by sharing-messages.
-     */
-    const STATUS_ACCEPTED = 1;
-    const STATUS_DECLINED = 2;
-    const STATUS_DELETED = 3;
-    const STATUS_NORESPONSE = 4;
-    const STATUS_INVALID = 5;
-
-    /**
-     * Reference to SabreDAV server object.
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * This method should return a list of server-features.
-     *
-     * This is for example 'versioning' and is added to the DAV: header
-     * in an OPTIONS response.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return ['calendarserver-sharing'];
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'caldav-sharing';
-
-    }
-
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre\DAV\Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the required event subscriptions.
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $server->resourceTypeMapping['Sabre\\CalDAV\\ISharedCalendar'] = '{' . Plugin::NS_CALENDARSERVER . '}shared';
-
-        array_push(
-            $this->server->protectedProperties,
-            '{' . Plugin::NS_CALENDARSERVER . '}invite',
-            '{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes',
-            '{' . Plugin::NS_CALENDARSERVER . '}shared-url'
-        );
-
-        $this->server->xml->elementMap['{' . Plugin::NS_CALENDARSERVER . '}share'] = 'Sabre\\CalDAV\\Xml\\Request\\Share';
-        $this->server->xml->elementMap['{' . Plugin::NS_CALENDARSERVER . '}invite-reply'] = 'Sabre\\CalDAV\\Xml\\Request\\InviteReply';
-
-        $this->server->on('propFind',     [$this, 'propFindEarly']);
-        $this->server->on('propFind',     [$this, 'propFindLate'], 150);
-        $this->server->on('propPatch',    [$this, 'propPatch'], 40);
-        $this->server->on('method:POST',  [$this, 'httpPost']);
-
-    }
-
-    /**
-     * This event is triggered when properties are requested for a certain
-     * node.
-     *
-     * This allows us to inject any properties early.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode $node
-     * @return void
-     */
-    public function propFindEarly(DAV\PropFind $propFind, DAV\INode $node) {
-
-        if ($node instanceof IShareableCalendar) {
-
-            $propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}invite', function() use ($node) {
-                return new Xml\Property\Invite(
-                    $node->getShares()
-                );
-            });
-
-        }
-
-        if ($node instanceof ISharedCalendar) {
-
-            $propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}shared-url', function() use ($node) {
-                return new Href(
-                    $node->getSharedUrl()
-                );
-            });
-
-            $propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}invite', function() use ($node) {
-
-                // Fetching owner information
-                $props = $this->server->getPropertiesForPath($node->getOwner(), [
-                    '{http://sabredav.org/ns}email-address',
-                    '{DAV:}displayname',
-                ], 0);
-
-                $ownerInfo = [
-                    'href' => $node->getOwner(),
-                ];
-
-                if (isset($props[0][200])) {
-
-                    // We're mapping the internal webdav properties to the
-                    // elements caldav-sharing expects.
-                    if (isset($props[0][200]['{http://sabredav.org/ns}email-address'])) {
-                        $ownerInfo['href'] = 'mailto:' . $props[0][200]['{http://sabredav.org/ns}email-address'];
-                    }
-                    if (isset($props[0][200]['{DAV:}displayname'])) {
-                        $ownerInfo['commonName'] = $props[0][200]['{DAV:}displayname'];
-                    }
-
-                }
-
-                return new Xml\Property\Invite(
-                    $node->getShares(),
-                    $ownerInfo
-                );
-
-            });
-
-        }
-
-    }
-
-    /**
-     * This method is triggered *after* all properties have been retrieved.
-     * This allows us to inject the correct resourcetype for calendars that
-     * have been shared.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode $node
-     * @return void
-     */
-    public function propFindLate(DAV\PropFind $propFind, DAV\INode $node) {
-
-        if ($node instanceof IShareableCalendar) {
-            if ($rt = $propFind->get('{DAV:}resourcetype')) {
-                if (count($node->getShares()) > 0) {
-                    $rt->add('{' . Plugin::NS_CALENDARSERVER . '}shared-owner');
-                }
-            }
-            $propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes', function() {
-                return new Xml\Property\AllowedSharingModes(true, false);
-            });
-
-        }
-
-    }
-
-    /**
-     * This method is trigged when a user attempts to update a node's
-     * properties.
-     *
-     * A previous draft of the sharing spec stated that it was possible to use
-     * PROPPATCH to remove 'shared-owner' from the resourcetype, thus unsharing
-     * the calendar.
-     *
-     * Even though this is no longer in the current spec, we keep this around
-     * because OS X 10.7 may still make use of this feature.
-     *
-     * @param string $path
-     * @param DAV\PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch($path, DAV\PropPatch $propPatch) {
-
-        $node = $this->server->tree->getNodeForPath($path);
-        if (!$node instanceof IShareableCalendar)
-            return;
-
-        $propPatch->handle('{DAV:}resourcetype', function($value) use ($node) {
-            if ($value->is('{' . Plugin::NS_CALENDARSERVER . '}shared-owner')) return false;
-            $shares = $node->getShares();
-            $remove = [];
-            foreach ($shares as $share) {
-                $remove[] = $share['href'];
-            }
-            $node->updateShares([], $remove);
-
-            return true;
-
-        });
-
-    }
-
-    /**
-     * We intercept this to handle POST requests on calendars.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return null|bool
-     */
-    public function httpPost(RequestInterface $request, ResponseInterface $response) {
-
-        $path = $request->getPath();
-
-        // Only handling xml
-        $contentType = $request->getHeader('Content-Type');
-        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false)
-            return;
-
-        // Making sure the node exists
-        try {
-            $node = $this->server->tree->getNodeForPath($path);
-        } catch (DAV\Exception\NotFound $e) {
-            return;
-        }
-
-        $requestBody = $request->getBodyAsString();
-
-        // If this request handler could not deal with this POST request, it
-        // will return 'null' and other plugins get a chance to handle the
-        // request.
-        //
-        // However, we already requested the full body. This is a problem,
-        // because a body can only be read once. This is why we preemptively
-        // re-populated the request body with the existing data.
-        $request->setBody($requestBody);
-
-        $message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-        switch ($documentType) {
-
-            // Dealing with the 'share' document, which modified invitees on a
-            // calendar.
-            case '{' . Plugin::NS_CALENDARSERVER . '}share' :
-
-                // We can only deal with IShareableCalendar objects
-                if (!$node instanceof IShareableCalendar) {
-                    return;
-                }
-
-                $this->server->transactionType = 'post-calendar-share';
-
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
-
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($path, '{DAV:}write');
-                }
-
-                $node->updateShares($message->set, $message->remove);
-
-                $response->setStatus(200);
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-                // Breaking the event chain
-                return false;
-
-            // The invite-reply document is sent when the user replies to an
-            // invitation of a calendar share.
-            case '{' . Plugin::NS_CALENDARSERVER . '}invite-reply' :
-
-                // This only works on the calendar-home-root node.
-                if (!$node instanceof CalendarHome) {
-                    return;
-                }
-                $this->server->transactionType = 'post-invite-reply';
+	/**
+	 * These are the various status constants used by sharing-messages.
+	 */
+	const STATUS_ACCEPTED = 1;
+	const STATUS_DECLINED = 2;
+	const STATUS_DELETED = 3;
+	const STATUS_NORESPONSE = 4;
+	const STATUS_INVALID = 5;
+
+	/**
+	 * Reference to SabreDAV server object.
+	 *
+	 * @var Sabre\DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * This method should return a list of server-features.
+	 *
+	 * This is for example 'versioning' and is added to the DAV: header
+	 * in an OPTIONS response.
+	 *
+	 * @return array
+	 */
+	public function getFeatures() {
+
+		return ['calendarserver-sharing'];
+
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'caldav-sharing';
+
+	}
+
+	/**
+	 * This initializes the plugin.
+	 *
+	 * This function is called by Sabre\DAV\Server, after
+	 * addPlugin is called.
+	 *
+	 * This method should set up the required event subscriptions.
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(DAV\Server $server) {
+
+		$this->server = $server;
+		$server->resourceTypeMapping['Sabre\\CalDAV\\ISharedCalendar'] = '{' . Plugin::NS_CALENDARSERVER . '}shared';
+
+		array_push(
+			$this->server->protectedProperties,
+			'{' . Plugin::NS_CALENDARSERVER . '}invite',
+			'{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes',
+			'{' . Plugin::NS_CALENDARSERVER . '}shared-url'
+		);
+
+		$this->server->xml->elementMap['{' . Plugin::NS_CALENDARSERVER . '}share'] = 'Sabre\\CalDAV\\Xml\\Request\\Share';
+		$this->server->xml->elementMap['{' . Plugin::NS_CALENDARSERVER . '}invite-reply'] = 'Sabre\\CalDAV\\Xml\\Request\\InviteReply';
+
+		$this->server->on('propFind',     [$this, 'propFindEarly']);
+		$this->server->on('propFind',     [$this, 'propFindLate'], 150);
+		$this->server->on('propPatch',    [$this, 'propPatch'], 40);
+		$this->server->on('method:POST',  [$this, 'httpPost']);
+
+	}
+
+	/**
+	 * This event is triggered when properties are requested for a certain
+	 * node.
+	 *
+	 * This allows us to inject any properties early.
+	 *
+	 * @param DAV\PropFind $propFind
+	 * @param DAV\INode $node
+	 * @return void
+	 */
+	public function propFindEarly(DAV\PropFind $propFind, DAV\INode $node) {
+
+		if ($node instanceof IShareableCalendar) {
+
+			$propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}invite', function() use ($node) {
+				return new Xml\Property\Invite(
+					$node->getShares()
+				);
+			});
+
+		}
+
+		if ($node instanceof ISharedCalendar) {
+
+			$propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}shared-url', function() use ($node) {
+				return new Href(
+					$node->getSharedUrl()
+				);
+			});
+
+			$propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}invite', function() use ($node) {
+
+				// Fetching owner information
+				$props = $this->server->getPropertiesForPath($node->getOwner(), [
+					'{http://sabredav.org/ns}email-address',
+					'{DAV:}displayname',
+				], 0);
+
+				$ownerInfo = [
+					'href' => $node->getOwner(),
+				];
+
+				if (isset($props[0][200])) {
+
+					// We're mapping the internal webdav properties to the
+					// elements caldav-sharing expects.
+					if (isset($props[0][200]['{http://sabredav.org/ns}email-address'])) {
+						$ownerInfo['href'] = 'mailto:' . $props[0][200]['{http://sabredav.org/ns}email-address'];
+					}
+					if (isset($props[0][200]['{DAV:}displayname'])) {
+						$ownerInfo['commonName'] = $props[0][200]['{DAV:}displayname'];
+					}
+
+				}
+
+				return new Xml\Property\Invite(
+					$node->getShares(),
+					$ownerInfo
+				);
+
+			});
+
+		}
+
+	}
+
+	/**
+	 * This method is triggered *after* all properties have been retrieved.
+	 * This allows us to inject the correct resourcetype for calendars that
+	 * have been shared.
+	 *
+	 * @param DAV\PropFind $propFind
+	 * @param DAV\INode $node
+	 * @return void
+	 */
+	public function propFindLate(DAV\PropFind $propFind, DAV\INode $node) {
+
+		if ($node instanceof IShareableCalendar) {
+			if ($rt = $propFind->get('{DAV:}resourcetype')) {
+				if (count($node->getShares()) > 0) {
+					$rt->add('{' . Plugin::NS_CALENDARSERVER . '}shared-owner');
+				}
+			}
+			$propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes', function() {
+				return new Xml\Property\AllowedSharingModes(true, false);
+			});
+
+		}
+
+	}
+
+	/**
+	 * This method is trigged when a user attempts to update a node's
+	 * properties.
+	 *
+	 * A previous draft of the sharing spec stated that it was possible to use
+	 * PROPPATCH to remove 'shared-owner' from the resourcetype, thus unsharing
+	 * the calendar.
+	 *
+	 * Even though this is no longer in the current spec, we keep this around
+	 * because OS X 10.7 may still make use of this feature.
+	 *
+	 * @param string $path
+	 * @param DAV\PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch($path, DAV\PropPatch $propPatch) {
+
+		$node = $this->server->tree->getNodeForPath($path);
+		if (!$node instanceof IShareableCalendar)
+			return;
+
+		$propPatch->handle('{DAV:}resourcetype', function($value) use ($node) {
+			if ($value->is('{' . Plugin::NS_CALENDARSERVER . '}shared-owner')) return false;
+			$shares = $node->getShares();
+			$remove = [];
+			foreach ($shares as $share) {
+				$remove[] = $share['href'];
+			}
+			$node->updateShares([], $remove);
+
+			return true;
+
+		});
+
+	}
+
+	/**
+	 * We intercept this to handle POST requests on calendars.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return null|bool
+	 */
+	public function httpPost(RequestInterface $request, ResponseInterface $response) {
+
+		$path = $request->getPath();
+
+		// Only handling xml
+		$contentType = $request->getHeader('Content-Type');
+		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false)
+			return;
+
+		// Making sure the node exists
+		try {
+			$node = $this->server->tree->getNodeForPath($path);
+		} catch (DAV\Exception\NotFound $e) {
+			return;
+		}
+
+		$requestBody = $request->getBodyAsString();
+
+		// If this request handler could not deal with this POST request, it
+		// will return 'null' and other plugins get a chance to handle the
+		// request.
+		//
+		// However, we already requested the full body. This is a problem,
+		// because a body can only be read once. This is why we preemptively
+		// re-populated the request body with the existing data.
+		$request->setBody($requestBody);
+
+		$message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+		switch ($documentType) {
+
+			// Dealing with the 'share' document, which modified invitees on a
+			// calendar.
+			case '{' . Plugin::NS_CALENDARSERVER . '}share' :
+
+				// We can only deal with IShareableCalendar objects
+				if (!$node instanceof IShareableCalendar) {
+					return;
+				}
+
+				$this->server->transactionType = 'post-calendar-share';
+
+				// Getting ACL info
+				$acl = $this->server->getPlugin('acl');
+
+				// If there's no ACL support, we allow everything
+				if ($acl) {
+					$acl->checkPrivileges($path, '{DAV:}write');
+				}
+
+				$node->updateShares($message->set, $message->remove);
+
+				$response->setStatus(200);
+				// Adding this because sending a response body may cause issues,
+				// and I wanted some type of indicator the response was handled.
+				$response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+				// Breaking the event chain
+				return false;
+
+			// The invite-reply document is sent when the user replies to an
+			// invitation of a calendar share.
+			case '{' . Plugin::NS_CALENDARSERVER . '}invite-reply' :
+
+				// This only works on the calendar-home-root node.
+				if (!$node instanceof CalendarHome) {
+					return;
+				}
+				$this->server->transactionType = 'post-invite-reply';
 
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
+				// Getting ACL info
+				$acl = $this->server->getPlugin('acl');
 
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($path, '{DAV:}write');
-                }
+				// If there's no ACL support, we allow everything
+				if ($acl) {
+					$acl->checkPrivileges($path, '{DAV:}write');
+				}
 
-                $url = $node->shareReply(
-                    $message->href,
-                    $message->status,
-                    $message->calendarUri,
-                    $message->inReplyTo,
-                    $message->summary
-                );
+				$url = $node->shareReply(
+					$message->href,
+					$message->status,
+					$message->calendarUri,
+					$message->inReplyTo,
+					$message->summary
+				);
 
-                $response->setStatus(200);
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $response->setHeader('X-Sabre-Status', 'everything-went-well');
+				$response->setStatus(200);
+				// Adding this because sending a response body may cause issues,
+				// and I wanted some type of indicator the response was handled.
+				$response->setHeader('X-Sabre-Status', 'everything-went-well');
 
-                if ($url) {
-                    $writer = $this->server->xml->getWriter($this->server->getBaseUri());
-                    $writer->openMemory();
-                    $writer->startDocument();
-                    $writer->startElement('{' . Plugin::NS_CALENDARSERVER . '}shared-as');
-                    $writer->write(new Href($url));
-                    $writer->endElement();
-                    $response->setHeader('Content-Type', 'application/xml');
-                    $response->setBody($writer->outputMemory());
+				if ($url) {
+					$writer = $this->server->xml->getWriter($this->server->getBaseUri());
+					$writer->openMemory();
+					$writer->startDocument();
+					$writer->startElement('{' . Plugin::NS_CALENDARSERVER . '}shared-as');
+					$writer->write(new Href($url));
+					$writer->endElement();
+					$response->setHeader('Content-Type', 'application/xml');
+					$response->setBody($writer->outputMemory());
 
-                }
+				}
 
-                // Breaking the event chain
-                return false;
+				// Breaking the event chain
+				return false;
 
-            case '{' . Plugin::NS_CALENDARSERVER . '}publish-calendar' :
+			case '{' . Plugin::NS_CALENDARSERVER . '}publish-calendar' :
 
-                // We can only deal with IShareableCalendar objects
-                if (!$node instanceof IShareableCalendar) {
-                    return;
-                }
-                $this->server->transactionType = 'post-publish-calendar';
+				// We can only deal with IShareableCalendar objects
+				if (!$node instanceof IShareableCalendar) {
+					return;
+				}
+				$this->server->transactionType = 'post-publish-calendar';
 
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
+				// Getting ACL info
+				$acl = $this->server->getPlugin('acl');
 
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($path, '{DAV:}write');
-                }
+				// If there's no ACL support, we allow everything
+				if ($acl) {
+					$acl->checkPrivileges($path, '{DAV:}write');
+				}
 
-                $node->setPublishStatus(true);
+				$node->setPublishStatus(true);
 
-                // iCloud sends back the 202, so we will too.
-                $response->setStatus(202);
+				// iCloud sends back the 202, so we will too.
+				$response->setStatus(202);
 
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $response->setHeader('X-Sabre-Status', 'everything-went-well');
+				// Adding this because sending a response body may cause issues,
+				// and I wanted some type of indicator the response was handled.
+				$response->setHeader('X-Sabre-Status', 'everything-went-well');
 
-                // Breaking the event chain
-                return false;
+				// Breaking the event chain
+				return false;
 
-            case '{' . Plugin::NS_CALENDARSERVER . '}unpublish-calendar' :
+			case '{' . Plugin::NS_CALENDARSERVER . '}unpublish-calendar' :
 
-                // We can only deal with IShareableCalendar objects
-                if (!$node instanceof IShareableCalendar) {
-                    return;
-                }
-                $this->server->transactionType = 'post-unpublish-calendar';
+				// We can only deal with IShareableCalendar objects
+				if (!$node instanceof IShareableCalendar) {
+					return;
+				}
+				$this->server->transactionType = 'post-unpublish-calendar';
 
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
+				// Getting ACL info
+				$acl = $this->server->getPlugin('acl');
 
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($path, '{DAV:}write');
-                }
+				// If there's no ACL support, we allow everything
+				if ($acl) {
+					$acl->checkPrivileges($path, '{DAV:}write');
+				}
 
-                $node->setPublishStatus(false);
+				$node->setPublishStatus(false);
 
-                $response->setStatus(200);
+				$response->setStatus(200);
 
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $response->setHeader('X-Sabre-Status', 'everything-went-well');
+				// Adding this because sending a response body may cause issues,
+				// and I wanted some type of indicator the response was handled.
+				$response->setHeader('X-Sabre-Status', 'everything-went-well');
 
-                // Breaking the event chain
-                return false;
+				// Breaking the event chain
+				return false;
 
-        }
+		}
 
 
 
-    }
+	}
 
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo() {
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo() {
 
-        return [
-            'name'        => $this->getPluginName(),
-            'description' => 'Adds support for caldav-sharing.',
-            'link'        => 'http://sabre.io/dav/caldav-sharing/',
-        ];
+		return [
+			'name'        => $this->getPluginName(),
+			'description' => 'Adds support for caldav-sharing.',
+			'link'        => 'http://sabre.io/dav/caldav-sharing/',
+		];
 
-    }
+	}
 }

Braces +9 added lines, -5 removed lines

@@ -211,11 +211,14 @@ 
     public function propPatch($path, DAV\PropPatch $propPatch) {
 
         $node = $this->server->tree->getNodeForPath($path);
-        if (!$node instanceof IShareableCalendar)
-            return;
+        if (!$node instanceof IShareableCalendar) {
+                    return;
+        }
 
         $propPatch->handle('{DAV:}resourcetype', function($value) use ($node) {
-            if ($value->is('{' . Plugin::NS_CALENDARSERVER . '}shared-owner')) return false;
+            if ($value->is('{' . Plugin::NS_CALENDARSERVER . '}shared-owner')) {
+            	return false;
+            }
             $shares = $node->getShares();
             $remove = [];
             foreach ($shares as $share) {
@@ -242,8 +245,9 @@ 
 
         // Only handling xml
         $contentType = $request->getHeader('Content-Type');
-        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false)
-            return;
+        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
+                    return;
+        }
 
         // Making sure the node exists
         try {