YetiForceCompany / YetiForceCRM

libraries/SabreDAV/CalDAV/Schedule/IMipPlugin.php

Doc Comments +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
      * @param string $to Recipient email address
      * @param string $subject Subject of the email
      * @param string $body iCalendar body
-     * @param array $headers List of headers
+     * @param string[] $headers List of headers
      * @return void
      */
     protected function mail($to, $subject, $body, array $headers) {

Braces +6 added lines, -4 removed lines

@@ -99,11 +99,13 @@
 
         $summary = $iTipMessage->message->VEVENT->SUMMARY;
 
-        if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto')
-            return;
+        if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') {
+                    return;
+        }
 
-        if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto')
-            return;
+        if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
+                    return;
+        }
 
         $sender = substr($iTipMessage->sender, 7);
         $recipient = substr($iTipMessage->recipient, 7);

Indentation +155 added lines, -155 removed lines

@@ -21,35 +21,35 @@ 
  */
 class IMipPlugin extends DAV\ServerPlugin {
 
-    /**
-     * Email address used in From: header.
-     *
-     * @var string
-     */
-    protected $senderEmail;
-
-    /**
-     * ITipMessage
-     *
-     * @var ITip\Message
-     */
-    protected $itipMessage;
-
-    /**
-     * Creates the email handler.
-     *
-     * @param string $senderEmail. The 'senderEmail' is the email that shows up
-     *                             in the 'From:' address. This should
-     *                             generally be some kind of no-reply email
-     *                             address you own.
-     */
-    public function __construct($senderEmail) {
-
-        $this->senderEmail = $senderEmail;
-
-    }
-
-    /*
+	/**
+	 * Email address used in From: header.
+	 *
+	 * @var string
+	 */
+	protected $senderEmail;
+
+	/**
+	 * ITipMessage
+	 *
+	 * @var ITip\Message
+	 */
+	protected $itipMessage;
+
+	/**
+	 * Creates the email handler.
+	 *
+	 * @param string $senderEmail. The 'senderEmail' is the email that shows up
+	 *                             in the 'From:' address. This should
+	 *                             generally be some kind of no-reply email
+	 *                             address you own.
+	 */
+	public function __construct($senderEmail) {
+
+		$this->senderEmail = $senderEmail;
+
+	}
+
+	/*
      * This initializes the plugin.
      *
      * This function is called by Sabre\DAV\Server, after
@@ -60,131 +60,131 @@ 
      * @param DAV\Server $server
      * @return void
      */
-    public function initialize(DAV\Server $server) {
-
-        $server->on('schedule', [$this, 'schedule'], 120);
-
-    }
-
-    /**
-     * 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 'imip';
-
-    }
-
-    /**
-     * Event handler for the 'schedule' event.
-     *
-     * @param ITip\Message $iTipMessage
-     * @return void
-     */
-    public function schedule(ITip\Message $iTipMessage) {
-
-        // Not sending any emails if the system considers the update
-        // insignificant.
-        if (!$iTipMessage->significantChange) {
-            if (!$iTipMessage->scheduleStatus) {
-                $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-            }
-            return;
-        }
-
-        $summary = $iTipMessage->message->VEVENT->SUMMARY;
-
-        if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto')
-            return;
-
-        if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto')
-            return;
-
-        $sender = substr($iTipMessage->sender, 7);
-        $recipient = substr($iTipMessage->recipient, 7);
-
-        if ($iTipMessage->senderName) {
-            $sender = $iTipMessage->senderName . ' <' . $sender . '>';
-        }
-        if ($iTipMessage->recipientName) {
-            $recipient = $iTipMessage->recipientName . ' <' . $recipient . '>';
-        }
-
-        $subject = 'SabreDAV iTIP message';
-        switch (strtoupper($iTipMessage->method)) {
-            case 'REPLY' :
-                $subject = 'Re: ' . $summary;
-                break;
-            case 'REQUEST' :
-                $subject = $summary;
-                break;
-            case 'CANCEL' :
-                $subject = 'Cancelled: ' . $summary;
-                break;
-        }
-
-        $headers = [
-            'Reply-To: ' . $sender,
-            'From: ' . $this->senderEmail,
-            'Content-Type: text/calendar; charset=UTF-8; method=' . $iTipMessage->method,
-        ];
-        if (DAV\Server::$exposeVersion) {
-            $headers[] = 'X-Sabre-Version: ' . DAV\Version::VERSION;
-        }
-        $this->mail(
-            $recipient,
-            $subject,
-            $iTipMessage->message->serialize(),
-            $headers
-        );
-        $iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
-
-    }
-
-    // @codeCoverageIgnoreStart
-    // This is deemed untestable in a reasonable manner
-
-    /**
-     * This function is responsible for sending the actual email.
-     *
-     * @param string $to Recipient email address
-     * @param string $subject Subject of the email
-     * @param string $body iCalendar body
-     * @param array $headers List of headers
-     * @return void
-     */
-    protected function mail($to, $subject, $body, array $headers) {
-
-        mail($to, $subject, $body, implode("\r\n", $headers));
-
-    }
-
-    // @codeCoverageIgnoreEnd
-
-    /**
-     * 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' => 'Email delivery (rfc6037) for CalDAV scheduling',
-            'link'        => 'http://sabre.io/dav/scheduling/',
-        ];
-
-    }
+	public function initialize(DAV\Server $server) {
+
+		$server->on('schedule', [$this, 'schedule'], 120);
+
+	}
+
+	/**
+	 * 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 'imip';
+
+	}
+
+	/**
+	 * Event handler for the 'schedule' event.
+	 *
+	 * @param ITip\Message $iTipMessage
+	 * @return void
+	 */
+	public function schedule(ITip\Message $iTipMessage) {
+
+		// Not sending any emails if the system considers the update
+		// insignificant.
+		if (!$iTipMessage->significantChange) {
+			if (!$iTipMessage->scheduleStatus) {
+				$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
+			}
+			return;
+		}
+
+		$summary = $iTipMessage->message->VEVENT->SUMMARY;
+
+		if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto')
+			return;
+
+		if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto')
+			return;
+
+		$sender = substr($iTipMessage->sender, 7);
+		$recipient = substr($iTipMessage->recipient, 7);
+
+		if ($iTipMessage->senderName) {
+			$sender = $iTipMessage->senderName . ' <' . $sender . '>';
+		}
+		if ($iTipMessage->recipientName) {
+			$recipient = $iTipMessage->recipientName . ' <' . $recipient . '>';
+		}
+
+		$subject = 'SabreDAV iTIP message';
+		switch (strtoupper($iTipMessage->method)) {
+			case 'REPLY' :
+				$subject = 'Re: ' . $summary;
+				break;
+			case 'REQUEST' :
+				$subject = $summary;
+				break;
+			case 'CANCEL' :
+				$subject = 'Cancelled: ' . $summary;
+				break;
+		}
+
+		$headers = [
+			'Reply-To: ' . $sender,
+			'From: ' . $this->senderEmail,
+			'Content-Type: text/calendar; charset=UTF-8; method=' . $iTipMessage->method,
+		];
+		if (DAV\Server::$exposeVersion) {
+			$headers[] = 'X-Sabre-Version: ' . DAV\Version::VERSION;
+		}
+		$this->mail(
+			$recipient,
+			$subject,
+			$iTipMessage->message->serialize(),
+			$headers
+		);
+		$iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
+
+	}
+
+	// @codeCoverageIgnoreStart
+	// This is deemed untestable in a reasonable manner
+
+	/**
+	 * This function is responsible for sending the actual email.
+	 *
+	 * @param string $to Recipient email address
+	 * @param string $subject Subject of the email
+	 * @param string $body iCalendar body
+	 * @param array $headers List of headers
+	 * @return void
+	 */
+	protected function mail($to, $subject, $body, array $headers) {
+
+		mail($to, $subject, $body, implode("\r\n", $headers));
+
+	}
+
+	// @codeCoverageIgnoreEnd
+
+	/**
+	 * 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' => 'Email delivery (rfc6037) for CalDAV scheduling',
+			'link'        => 'http://sabre.io/dav/scheduling/',
+		];
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Schedule/Inbox.php

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

@@ -2,10 +2,10 @@
 
 namespace Sabre\CalDAV\Schedule;
 
-use Sabre\DAV;
 use Sabre\CalDAV;
-use Sabre\DAVACL;
 use Sabre\CalDAV\Backend;
+use Sabre\DAV;
+use Sabre\DAVACL;
 use Sabre\VObject;
 
 /**

Indentation +239 added lines, -239 removed lines

@@ -17,244 +17,244 @@
  */
 class Inbox extends DAV\Collection implements IInbox {
 
-    /**
-     * CalDAV backend
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $caldavBackend;
-
-    /**
-     * The principal Uri
-     *
-     * @var string
-     */
-    protected $principalUri;
-
-    /**
-     * Constructor
-     *
-     * @param Backend\SchedulingSupport $caldavBackend
-     * @param string $principalUri
-     */
-    public function __construct(Backend\SchedulingSupport $caldavBackend, $principalUri) {
-
-        $this->caldavBackend = $caldavBackend;
-        $this->principalUri = $principalUri;
-
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'inbox';
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return \Sabre\DAV\INode[]
-     */
-    public function getChildren() {
-
-        $objs = $this->caldavBackend->getSchedulingObjects($this->principalUri);
-        $children = [];
-        foreach ($objs as $obj) {
-            $obj['principaluri'] = $this->principalUri;
-            $children[] = new SchedulingObject($this->caldavBackend, $obj);
-        }
-        return $children;
-
-    }
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        $this->caldavBackend->createSchedulingObject($this->principalUri, $name, $data);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns a 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' => '{DAV:}authenticated',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write-properties',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}unbind',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}unbind',
-                'principal' => $this->getOwner() . '/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-deliver-invite',
-                'principal' => '{DAV:}authenticated',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-deliver-reply',
-                'principal' => '{DAV:}authenticated',
-                '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('You\'re not allowed to update the ACL');
-
-    }
-
-    /**
-     * 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() {
-
-        $ns = '{' . CalDAV\Plugin::NS_CALDAV . '}';
-
-        $default = DAVACL\Plugin::getDefaultSupportedPrivilegeSet();
-        $default['aggregates'][] = [
-            'privilege'  => $ns . 'schedule-deliver',
-            'aggregates' => [
-               ['privilege' => $ns . 'schedule-deliver-invite'],
-               ['privilege' => $ns . 'schedule-deliver-reply'],
-            ],
-        ];
-        return $default;
-
-    }
-
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
-     *
-     * @param array $filters
-     * @return array
-     */
-    public function calendarQuery(array $filters) {
-
-        $result = [];
-        $validator = new CalDAV\CalendarQueryValidator();
-
-        $objects = $this->caldavBackend->getSchedulingObjects($this->principalUri);
-        foreach ($objects as $object) {
-            $vObject = VObject\Reader::read($object['calendardata']);
-            if ($validator->validate($vObject, $filters)) {
-                $result[] = $object['uri'];
-            }
-
-            // Destroy circular references to PHP will GC the object.
-            $vObject->destroy();
-        }
-        return $result;
-
-    }
+	/**
+	 * CalDAV backend
+	 *
+	 * @var Backend\BackendInterface
+	 */
+	protected $caldavBackend;
+
+	/**
+	 * The principal Uri
+	 *
+	 * @var string
+	 */
+	protected $principalUri;
+
+	/**
+	 * Constructor
+	 *
+	 * @param Backend\SchedulingSupport $caldavBackend
+	 * @param string $principalUri
+	 */
+	public function __construct(Backend\SchedulingSupport $caldavBackend, $principalUri) {
+
+		$this->caldavBackend = $caldavBackend;
+		$this->principalUri = $principalUri;
+
+	}
+
+	/**
+	 * Returns the name of the node.
+	 *
+	 * This is used to generate the url.
+	 *
+	 * @return string
+	 */
+	public function getName() {
+
+		return 'inbox';
+
+	}
+
+	/**
+	 * Returns an array with all the child nodes
+	 *
+	 * @return \Sabre\DAV\INode[]
+	 */
+	public function getChildren() {
+
+		$objs = $this->caldavBackend->getSchedulingObjects($this->principalUri);
+		$children = [];
+		foreach ($objs as $obj) {
+			$obj['principaluri'] = $this->principalUri;
+			$children[] = new SchedulingObject($this->caldavBackend, $obj);
+		}
+		return $children;
+
+	}
+
+	/**
+	 * Creates a new file in the directory
+	 *
+	 * Data will either be supplied as a stream resource, or in certain cases
+	 * as a string. Keep in mind that you may have to support either.
+	 *
+	 * After succesful creation of the file, you may choose to return the ETag
+	 * of the new file here.
+	 *
+	 * The returned ETag must be surrounded by double-quotes (The quotes should
+	 * be part of the actual string).
+	 *
+	 * If you cannot accurately determine the ETag, you should not return it.
+	 * If you don't store the file exactly as-is (you're transforming it
+	 * somehow) you should also not return an ETag.
+	 *
+	 * This means that if a subsequent GET to this new file does not exactly
+	 * return the same contents of what was submitted here, you are strongly
+	 * recommended to omit the ETag.
+	 *
+	 * @param string $name Name of the file
+	 * @param resource|string $data Initial payload
+	 * @return null|string
+	 */
+	public function createFile($name, $data = null) {
+
+		$this->caldavBackend->createSchedulingObject($this->principalUri, $name, $data);
+
+	}
+
+	/**
+	 * Returns the owner principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner() {
+
+		return $this->principalUri;
+
+	}
+
+	/**
+	 * Returns a 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' => '{DAV:}authenticated',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}write-properties',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}unbind',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}unbind',
+				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-deliver-invite',
+				'principal' => '{DAV:}authenticated',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-deliver-reply',
+				'principal' => '{DAV:}authenticated',
+				'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('You\'re not allowed to update the ACL');
+
+	}
+
+	/**
+	 * 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() {
+
+		$ns = '{' . CalDAV\Plugin::NS_CALDAV . '}';
+
+		$default = DAVACL\Plugin::getDefaultSupportedPrivilegeSet();
+		$default['aggregates'][] = [
+			'privilege'  => $ns . 'schedule-deliver',
+			'aggregates' => [
+			   ['privilege' => $ns . 'schedule-deliver-invite'],
+			   ['privilege' => $ns . 'schedule-deliver-reply'],
+			],
+		];
+		return $default;
+
+	}
+
+	/**
+	 * Performs a calendar-query on the contents of this calendar.
+	 *
+	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
+	 * calendar-query it is possible for a client to request a specific set of
+	 * object, based on contents of iCalendar properties, date-ranges and
+	 * iCalendar component types (VTODO, VEVENT).
+	 *
+	 * This method should just return a list of (relative) urls that match this
+	 * query.
+	 *
+	 * The list of filters are specified as an array. The exact array is
+	 * documented by \Sabre\CalDAV\CalendarQueryParser.
+	 *
+	 * @param array $filters
+	 * @return array
+	 */
+	public function calendarQuery(array $filters) {
+
+		$result = [];
+		$validator = new CalDAV\CalendarQueryValidator();
+
+		$objects = $this->caldavBackend->getSchedulingObjects($this->principalUri);
+		foreach ($objects as $object) {
+			$vObject = VObject\Reader::read($object['calendardata']);
+			if ($validator->validate($vObject, $filters)) {
+				$result[] = $object['uri'];
+			}
+
+			// Destroy circular references to PHP will GC the object.
+			$vObject->destroy();
+		}
+		return $result;
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Schedule/Outbox.php

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

@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Schedule;
 
-use Sabre\DAV;
 use Sabre\CalDAV;
+use Sabre\DAV;
 use Sabre\DAVACL;
 
 /**

Indentation +161 added lines, -161 removed lines

@@ -19,166 +19,166 @@
  */
 class Outbox extends DAV\Collection implements IOutbox {
 
-    /**
-     * The principal Uri
-     *
-     * @var string
-     */
-    protected $principalUri;
-
-    /**
-     * Constructor
-     *
-     * @param string $principalUri
-     */
-    public function __construct($principalUri) {
-
-        $this->principalUri = $principalUri;
-
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'outbox';
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return \Sabre\DAV\INode[]
-     */
-    public function getChildren() {
-
-        return [];
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns 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' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
-                'principal' => $this->getOwner() . '/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
-                'principal' => $this->getOwner() . '/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner() . '/calendar-proxy-read',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner() . '/calendar-proxy-write',
-                'protected' => true,
-            ],
-        ];
-
-    }
-
-    /**
-     * 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('You\'re not allowed to update the ACL');
-
-    }
-
-    /**
-     * 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() {
-
-        $default = DAVACL\Plugin::getDefaultSupportedPrivilegeSet();
-        $default['aggregates'][] = [
-            'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
-        ];
-        $default['aggregates'][] = [
-            'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
-        ];
-
-        return $default;
-
-    }
+	/**
+	 * The principal Uri
+	 *
+	 * @var string
+	 */
+	protected $principalUri;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $principalUri
+	 */
+	public function __construct($principalUri) {
+
+		$this->principalUri = $principalUri;
+
+	}
+
+	/**
+	 * Returns the name of the node.
+	 *
+	 * This is used to generate the url.
+	 *
+	 * @return string
+	 */
+	public function getName() {
+
+		return 'outbox';
+
+	}
+
+	/**
+	 * Returns an array with all the child nodes
+	 *
+	 * @return \Sabre\DAV\INode[]
+	 */
+	public function getChildren() {
+
+		return [];
+
+	}
+
+	/**
+	 * Returns the owner principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner() {
+
+		return $this->principalUri;
+
+	}
+
+	/**
+	 * Returns 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' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
+				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
+				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'protected' => true,
+			],
+		];
+
+	}
+
+	/**
+	 * 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('You\'re not allowed to update the ACL');
+
+	}
+
+	/**
+	 * 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() {
+
+		$default = DAVACL\Plugin::getDefaultSupportedPrivilegeSet();
+		$default['aggregates'][] = [
+			'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
+		];
+		$default['aggregates'][] = [
+			'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
+		];
+
+		return $default;
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Schedule/Plugin.php

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

@@ -3,27 +3,27 @@
 namespace Sabre\CalDAV\Schedule;
 
 use DateTimeZone;
-use Sabre\DAV\Server;
-use Sabre\DAV\ServerPlugin;
+use Sabre\CalDAV\ICalendar;
+use Sabre\CalDAV\ICalendarObject;
+use Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp;
+use Sabre\DAVACL;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\Exception\NotFound;
+use Sabre\DAV\Exception\NotImplemented;
+use Sabre\DAV\INode;
 use Sabre\DAV\PropFind;
 use Sabre\DAV\PropPatch;
-use Sabre\DAV\INode;
+use Sabre\DAV\Server;
+use Sabre\DAV\ServerPlugin;
 use Sabre\DAV\Xml\Property\Href;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 use Sabre\VObject;
-use Sabre\VObject\Reader;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\ITip;
 use Sabre\VObject\ITip\Message;
-use Sabre\DAVACL;
-use Sabre\CalDAV\ICalendar;
-use Sabre\CalDAV\ICalendarObject;
-use Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp;
-use Sabre\DAV\Exception\NotFound;
-use Sabre\DAV\Exception\Forbidden;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\DAV\Exception\NotImplemented;
+use Sabre\VObject\Reader;
 
 /**
  * CalDAV scheduling plugin.

Indentation +927 added lines, -927 removed lines

@@ -54,939 +54,939 @@
  */
 class Plugin extends ServerPlugin {
 
-    /**
-     * This is the official CalDAV namespace
-     */
-    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
-
-    /**
-     * Reference to main Server object.
-     *
-     * @var Server
-     */
-    protected $server;
-
-    /**
-     * Returns a list of features for the DAV: HTTP header.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return ['calendar-auto-schedule', 'calendar-availability'];
-
-    }
-
-    /**
-     * Returns the name of the plugin.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'caldav-schedule';
-
-    }
-
-    /**
-     * Initializes the plugin
-     *
-     * @param Server $server
-     * @return void
-     */
-    public function initialize(Server $server) {
-
-        $this->server = $server;
-        $server->on('method:POST',          [$this, 'httpPost']);
-        $server->on('propFind',             [$this, 'propFind']);
-        $server->on('propPatch',            [$this, 'propPatch']);
-        $server->on('calendarObjectChange', [$this, 'calendarObjectChange']);
-        $server->on('beforeUnbind',         [$this, 'beforeUnbind']);
-        $server->on('schedule',             [$this, 'scheduleLocalDelivery']);
-
-        $ns = '{' . self::NS_CALDAV . '}';
-
-        /**
-         * This information ensures that the {DAV:}resourcetype property has
-         * the correct values.
-         */
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Schedule\\IOutbox'] = $ns . 'schedule-outbox';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Schedule\\IInbox'] = $ns . 'schedule-inbox';
-
-        /**
-         * Properties we protect are made read-only by the server.
-         */
-        array_push($server->protectedProperties,
-            $ns . 'schedule-inbox-URL',
-            $ns . 'schedule-outbox-URL',
-            $ns . 'calendar-user-address-set',
-            $ns . 'calendar-user-type',
-            $ns . 'schedule-default-calendar-URL'
-        );
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        try {
-            $node = $this->server->tree->getNodeForPath($uri);
-        } catch (NotFound $e) {
-            return [];
-        }
-
-        if ($node instanceof IOutbox) {
-            return ['POST'];
-        }
-
-        return [];
-
-    }
-
-    /**
-     * This method handles POST request for the outbox.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpPost(RequestInterface $request, ResponseInterface $response) {
-
-        // Checking if this is a text/calendar content type
-        $contentType = $request->getHeader('Content-Type');
-        if (strpos($contentType, 'text/calendar') !== 0) {
-            return;
-        }
-
-        $path = $request->getPath();
-
-        // Checking if we're talking to an outbox
-        try {
-            $node = $this->server->tree->getNodeForPath($path);
-        } catch (NotFound $e) {
-            return;
-        }
-        if (!$node instanceof IOutbox)
-            return;
-
-        $this->server->transactionType = 'post-caldav-outbox';
-        $this->outboxRequest($node, $request, $response);
-
-        // Returning false breaks the event chain and tells the server we've
-        // handled the request.
-        return false;
-
-    }
-
-    /**
-     * This method handler is invoked during fetching of properties.
-     *
-     * We use this event to add calendar-auto-schedule-specific properties.
-     *
-     * @param PropFind $propFind
-     * @param INode $node
-     * @return void
-     */
-    public function propFind(PropFind $propFind, INode $node) {
-
-        if ($node instanceof DAVACL\IPrincipal) {
-
-            $caldavPlugin = $this->server->getPlugin('caldav');
-            $principalUrl = $node->getPrincipalUrl();
-
-            // schedule-outbox-URL property
-            $propFind->handle('{' . self::NS_CALDAV . '}schedule-outbox-URL', function() use ($principalUrl, $caldavPlugin) {
-
-                $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
-                if (!$calendarHomePath) {
-                    return null;
-                }
-                $outboxPath = $calendarHomePath . '/outbox/';
-
-                return new Href($outboxPath);
-
-            });
-            // schedule-inbox-URL property
-            $propFind->handle('{' . self::NS_CALDAV . '}schedule-inbox-URL', function() use ($principalUrl, $caldavPlugin) {
-
-                $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
-                if (!$calendarHomePath) {
-                    return null;
-                }
-                $inboxPath = $calendarHomePath . '/inbox/';
-
-                return new Href($inboxPath);
-
-            });
-
-            $propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($principalUrl, $caldavPlugin) {
-
-                // We don't support customizing this property yet, so in the
-                // meantime we just grab the first calendar in the home-set.
-                $calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
-
-                if (!$calendarHomePath) {
-                    return null;
-                }
-
-                $sccs = '{' . self::NS_CALDAV . '}supported-calendar-component-set';
-
-                $result = $this->server->getPropertiesForPath($calendarHomePath, [
-                    '{DAV:}resourcetype',
-                    $sccs,
-                ], 1);
-
-                foreach ($result as $child) {
-                    if (!isset($child[200]['{DAV:}resourcetype']) || !$child[200]['{DAV:}resourcetype']->is('{' . self::NS_CALDAV . '}calendar') || $child[200]['{DAV:}resourcetype']->is('{http://calendarserver.org/ns/}shared')) {
-                        // Node is either not a calendar or a shared instance.
-                        continue;
-                    }
-                    if (!isset($child[200][$sccs]) || in_array('VEVENT', $child[200][$sccs]->getValue())) {
-                        // Either there is no supported-calendar-component-set
-                        // (which is fine) or we found one that supports VEVENT.
-                        return new Href($child['href']);
-                    }
-                }
-
-            });
-
-            // The server currently reports every principal to be of type
-            // 'INDIVIDUAL'
-            $propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function() {
-
-                return 'INDIVIDUAL';
-
-            });
-
-        }
-
-        // Mapping the old property to the new property.
-        $propFind->handle('{http://calendarserver.org/ns/}calendar-availability', function() use ($propFind, $node) {
-
-             // In case it wasn't clear, the only difference is that we map the
-            // old property to a different namespace.
-             $availProp = '{' . self::NS_CALDAV . '}calendar-availability';
-             $subPropFind = new PropFind(
-                 $propFind->getPath(),
-                 [$availProp]
-             );
-
-             $this->server->getPropertiesByNode(
-                 $subPropFind,
-                 $node
-             );
-
-             $propFind->set(
-                 '{http://calendarserver.org/ns/}calendar-availability',
-                 $subPropFind->get($availProp),
-                 $subPropFind->getStatus($availProp)
-             );
-
-        });
-
-    }
-
-    /**
-     * This method is called during property updates.
-     *
-     * @param string $path
-     * @param PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch($path, PropPatch $propPatch) {
-
-        // Mapping the old property to the new property.
-        $propPatch->handle('{http://calendarserver.org/ns/}calendar-availability', function($value) use ($path) {
-
-            $availProp = '{' . self::NS_CALDAV . '}calendar-availability';
-            $subPropPatch = new PropPatch([$availProp => $value]);
-            $this->server->emit('propPatch', [$path, $subPropPatch]);
-            $subPropPatch->commit();
-
-            return $subPropPatch->getResult()[$availProp];
-
-        });
-
-    }
-
-    /**
-     * This method is triggered whenever there was a calendar object gets
-     * created or updated.
-     *
-     * @param RequestInterface $request HTTP request
-     * @param ResponseInterface $response HTTP Response
-     * @param VCalendar $vCal Parsed iCalendar object
-     * @param mixed $calendarPath Path to calendar collection
-     * @param mixed $modified The iCalendar object has been touched.
-     * @param mixed $isNew Whether this was a new item or we're updating one
-     * @return void
-     */
-    public function calendarObjectChange(RequestInterface $request, ResponseInterface $response, VCalendar $vCal, $calendarPath, &$modified, $isNew) {
-
-        if (!$this->scheduleReply($this->server->httpRequest)) {
-            return;
-        }
-
-        $calendarNode = $this->server->tree->getNodeForPath($calendarPath);
-
-        $addresses = $this->getAddressesForPrincipal(
-            $calendarNode->getOwner()
-        );
-
-        if (!$isNew) {
-            $node = $this->server->tree->getNodeForPath($request->getPath());
-            $oldObj = Reader::read($node->get());
-        } else {
-            $oldObj = null;
-        }
-
-        $this->processICalendarChange($oldObj, $vCal, $addresses, [], $modified);
-
-        if ($oldObj) {
-            // Destroy circular references so PHP will GC the object.
-            $oldObj->destroy();
-        }
-
-    }
-
-    /**
-     * This method is responsible for delivering the ITip message.
-     *
-     * @param ITip\Message $itipMessage
-     * @return void
-     */
-    public function deliver(ITip\Message $iTipMessage) {
-
-        $this->server->emit('schedule', [$iTipMessage]);
-        if (!$iTipMessage->scheduleStatus) {
-            $iTipMessage->scheduleStatus = '5.2;There was no system capable of delivering the scheduling message';
-        }
-        // In case the change was considered 'insignificant', we are going to
-        // remove any error statuses, if any. See ticket #525.
-        list($baseCode) = explode('.', $iTipMessage->scheduleStatus);
-        if (!$iTipMessage->significantChange && in_array($baseCode, ['3', '5'])) {
-            $iTipMessage->scheduleStatus = null;
-        }
-
-    }
-
-    /**
-     * This method is triggered before a file gets deleted.
-     *
-     * We use this event to make sure that when this happens, attendees get
-     * cancellations, and organizers get 'DECLINED' statuses.
-     *
-     * @param string $path
-     * @return void
-     */
-    public function beforeUnbind($path) {
-
-        if ($this->server->httpRequest->getMethod() === 'MOVE') return;
-
-        $node = $this->server->tree->getNodeForPath($path);
-
-        if (!$node instanceof ICalendarObject || $node instanceof ISchedulingObject) {
-            return;
-        }
-
-        if (!$this->scheduleReply($this->server->httpRequest)) {
-            return;
-        }
-
-        $addresses = $this->getAddressesForPrincipal(
-            $node->getOwner()
-        );
-
-        $broker = new ITip\Broker();
-        $messages = $broker->parseEvent(null, $addresses, $node->get());
-
-        foreach ($messages as $message) {
-            $this->deliver($message);
-        }
-
-    }
-
-    /**
-     * Event handler for the 'schedule' event.
-     *
-     * This handler attempts to look at local accounts to deliver the
-     * scheduling object.
-     *
-     * @param ITip\Message $iTipMessage
-     * @return void
-     */
-    public function scheduleLocalDelivery(ITip\Message $iTipMessage) {
-
-        $aclPlugin = $this->server->getPlugin('acl');
-
-        // Local delivery is not available if the ACL plugin is not loaded.
-        if (!$aclPlugin) {
-            return;
-        }
-
-        $caldavNS = '{' . self::NS_CALDAV . '}';
-
-        $principalUri = $aclPlugin->getPrincipalByUri($iTipMessage->recipient);
-        if (!$principalUri) {
-            $iTipMessage->scheduleStatus = '3.7;Could not find principal.';
-            return;
-        }
-
-        // We found a principal URL, now we need to find its inbox.
-        // Unfortunately we may not have sufficient privileges to find this, so
-        // we are temporarily turning off ACL to let this come through.
-        //
-        // Once we support PHP 5.5, this should be wrapped in a try..finally
-        // block so we can ensure that this privilege gets added again after.
-        $this->server->removeListener('propFind', [$aclPlugin, 'propFind']);
-
-        $result = $this->server->getProperties(
-            $principalUri,
-            [
-                '{DAV:}principal-URL',
-                 $caldavNS . 'calendar-home-set',
-                 $caldavNS . 'schedule-inbox-URL',
-                 $caldavNS . 'schedule-default-calendar-URL',
-                '{http://sabredav.org/ns}email-address',
-            ]
-        );
-
-        // Re-registering the ACL event
-        $this->server->on('propFind', [$aclPlugin, 'propFind'], 20);
-
-        if (!isset($result[$caldavNS . 'schedule-inbox-URL'])) {
-            $iTipMessage->scheduleStatus = '5.2;Could not find local inbox';
-            return;
-        }
-        if (!isset($result[$caldavNS . 'calendar-home-set'])) {
-            $iTipMessage->scheduleStatus = '5.2;Could not locate a calendar-home-set';
-            return;
-        }
-        if (!isset($result[$caldavNS . 'schedule-default-calendar-URL'])) {
-            $iTipMessage->scheduleStatus = '5.2;Could not find a schedule-default-calendar-URL property';
-            return;
-        }
-
-        $calendarPath = $result[$caldavNS . 'schedule-default-calendar-URL']->getHref();
-        $homePath = $result[$caldavNS . 'calendar-home-set']->getHref();
-        $inboxPath = $result[$caldavNS . 'schedule-inbox-URL']->getHref();
-
-        if ($iTipMessage->method === 'REPLY') {
-            $privilege = 'schedule-deliver-reply';
-        } else {
-            $privilege = 'schedule-deliver-invite';
-        }
-
-        if (!$aclPlugin->checkPrivileges($inboxPath, $caldavNS . $privilege, DAVACL\Plugin::R_PARENT, false)) {
-            $iTipMessage->scheduleStatus = '3.8;organizer did not have the ' . $privilege . ' privilege on the attendees inbox';
-            return;
-        }
-
-        // Next, we're going to find out if the item already exits in one of
-        // the users' calendars.
-        $uid = $iTipMessage->uid;
-
-        $newFileName = 'sabredav-' . \Sabre\DAV\UUIDUtil::getUUID() . '.ics';
-
-        $home = $this->server->tree->getNodeForPath($homePath);
-        $inbox = $this->server->tree->getNodeForPath($inboxPath);
-
-        $currentObject = null;
-        $objectNode = null;
-        $isNewNode = false;
-
-        $result = $home->getCalendarObjectByUID($uid);
-        if ($result) {
-            // There was an existing object, we need to update probably.
-            $objectPath = $homePath . '/' . $result;
-            $objectNode = $this->server->tree->getNodeForPath($objectPath);
-            $oldICalendarData = $objectNode->get();
-            $currentObject = Reader::read($oldICalendarData);
-        } else {
-            $isNewNode = true;
-        }
-
-        $broker = new ITip\Broker();
-        $newObject = $broker->processMessage($iTipMessage, $currentObject);
-
-        $inbox->createFile($newFileName, $iTipMessage->message->serialize());
-
-        if (!$newObject) {
-            // We received an iTip message referring to a UID that we don't
-            // have in any calendars yet, and processMessage did not give us a
-            // calendarobject back.
-            //
-            // The implication is that processMessage did not understand the
-            // iTip message.
-            $iTipMessage->scheduleStatus = '5.0;iTip message was not processed by the server, likely because we didn\'t understand it.';
-            return;
-        }
-
-        // Note that we are bypassing ACL on purpose by calling this directly.
-        // We may need to look a bit deeper into this later. Supporting ACL
-        // here would be nice.
-        if ($isNewNode) {
-            $calendar = $this->server->tree->getNodeForPath($calendarPath);
-            $calendar->createFile($newFileName, $newObject->serialize());
-        } else {
-            // If the message was a reply, we may have to inform other
-            // attendees of this attendees status. Therefore we're shooting off
-            // another itipMessage.
-            if ($iTipMessage->method === 'REPLY') {
-                $this->processICalendarChange(
-                    $oldICalendarData,
-                    $newObject,
-                    [$iTipMessage->recipient],
-                    [$iTipMessage->sender]
-                );
-            }
-            $objectNode->put($newObject->serialize());
-        }
-        $iTipMessage->scheduleStatus = '1.2;Message delivered locally';
-
-    }
-
-    /**
-     * This method looks at an old iCalendar object, a new iCalendar object and
-     * starts sending scheduling messages based on the changes.
-     *
-     * A list of addresses needs to be specified, so the system knows who made
-     * the update, because the behavior may be different based on if it's an
-     * attendee or an organizer.
-     *
-     * This method may update $newObject to add any status changes.
-     *
-     * @param VCalendar|string $oldObject
-     * @param VCalendar $newObject
-     * @param array $addresses
-     * @param array $ignore Any addresses to not send messages to.
-     * @param bool $modified A marker to indicate that the original object
-     *   modified by this process.
-     * @return void
-     */
-    protected function processICalendarChange($oldObject = null, VCalendar $newObject, array $addresses, array $ignore = [], &$modified = false) {
-
-        $broker = new ITip\Broker();
-        $messages = $broker->parseEvent($newObject, $addresses, $oldObject);
-
-        if ($messages) $modified = true;
-
-        foreach ($messages as $message) {
-
-            if (in_array($message->recipient, $ignore)) {
-                continue;
-            }
-
-            $this->deliver($message);
-
-            if (isset($newObject->VEVENT->ORGANIZER) && ($newObject->VEVENT->ORGANIZER->getNormalizedValue() === $message->recipient)) {
-                if ($message->scheduleStatus) {
-                    $newObject->VEVENT->ORGANIZER['SCHEDULE-STATUS'] = $message->getScheduleStatus();
-                }
-                unset($newObject->VEVENT->ORGANIZER['SCHEDULE-FORCE-SEND']);
-
-            } else {
-
-                if (isset($newObject->VEVENT->ATTENDEE)) foreach ($newObject->VEVENT->ATTENDEE as $attendee) {
-
-                    if ($attendee->getNormalizedValue() === $message->recipient) {
-                        if ($message->scheduleStatus) {
-                            $attendee['SCHEDULE-STATUS'] = $message->getScheduleStatus();
-                        }
-                        unset($attendee['SCHEDULE-FORCE-SEND']);
-                        break;
-                    }
-
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Returns a list of addresses that are associated with a principal.
-     *
-     * @param string $principal
-     * @return array
-     */
-    protected function getAddressesForPrincipal($principal) {
-
-        $CUAS = '{' . self::NS_CALDAV . '}calendar-user-address-set';
-
-        $properties = $this->server->getProperties(
-            $principal,
-            [$CUAS]
-        );
-
-        // If we can't find this information, we'll stop processing
-        if (!isset($properties[$CUAS])) {
-            return;
-        }
-
-        $addresses = $properties[$CUAS]->getHrefs();
-        return $addresses;
-
-    }
-
-    /**
-     * This method handles POST requests to the schedule-outbox.
-     *
-     * Currently, two types of requests are support:
-     *   * FREEBUSY requests from RFC 6638
-     *   * Simple iTIP messages from draft-desruisseaux-caldav-sched-04
-     *
-     * The latter is from an expired early draft of the CalDAV scheduling
-     * extensions, but iCal depends on a feature from that spec, so we
-     * implement it.
-     *
-     * @param IOutbox $outboxNode
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function outboxRequest(IOutbox $outboxNode, RequestInterface $request, ResponseInterface $response) {
-
-        $outboxPath = $request->getPath();
-
-        // Parsing the request body
-        try {
-            $vObject = VObject\Reader::read($request->getBody());
-        } catch (VObject\ParseException $e) {
-            throw new BadRequest('The request body must be a valid iCalendar object. Parse error: ' . $e->getMessage());
-        }
-
-        // The incoming iCalendar object must have a METHOD property, and a
-        // component. The combination of both determines what type of request
-        // this is.
-        $componentType = null;
-        foreach ($vObject->getComponents() as $component) {
-            if ($component->name !== 'VTIMEZONE') {
-                $componentType = $component->name;
-                break;
-            }
-        }
-        if (is_null($componentType)) {
-            throw new BadRequest('We expected at least one VTODO, VJOURNAL, VFREEBUSY or VEVENT component');
-        }
+	/**
+	 * This is the official CalDAV namespace
+	 */
+	const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
+
+	/**
+	 * Reference to main Server object.
+	 *
+	 * @var Server
+	 */
+	protected $server;
+
+	/**
+	 * Returns a list of features for the DAV: HTTP header.
+	 *
+	 * @return array
+	 */
+	public function getFeatures() {
+
+		return ['calendar-auto-schedule', 'calendar-availability'];
+
+	}
+
+	/**
+	 * Returns the name of the plugin.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'caldav-schedule';
+
+	}
+
+	/**
+	 * Initializes the plugin
+	 *
+	 * @param Server $server
+	 * @return void
+	 */
+	public function initialize(Server $server) {
+
+		$this->server = $server;
+		$server->on('method:POST',          [$this, 'httpPost']);
+		$server->on('propFind',             [$this, 'propFind']);
+		$server->on('propPatch',            [$this, 'propPatch']);
+		$server->on('calendarObjectChange', [$this, 'calendarObjectChange']);
+		$server->on('beforeUnbind',         [$this, 'beforeUnbind']);
+		$server->on('schedule',             [$this, 'scheduleLocalDelivery']);
+
+		$ns = '{' . self::NS_CALDAV . '}';
+
+		/**
+		 * This information ensures that the {DAV:}resourcetype property has
+		 * the correct values.
+		 */
+		$server->resourceTypeMapping['\\Sabre\\CalDAV\\Schedule\\IOutbox'] = $ns . 'schedule-outbox';
+		$server->resourceTypeMapping['\\Sabre\\CalDAV\\Schedule\\IInbox'] = $ns . 'schedule-inbox';
+
+		/**
+		 * Properties we protect are made read-only by the server.
+		 */
+		array_push($server->protectedProperties,
+			$ns . 'schedule-inbox-URL',
+			$ns . 'schedule-outbox-URL',
+			$ns . 'calendar-user-address-set',
+			$ns . 'calendar-user-type',
+			$ns . 'schedule-default-calendar-URL'
+		);
+
+	}
+
+	/**
+	 * Use this method to tell the server this plugin defines additional
+	 * HTTP methods.
+	 *
+	 * This method is passed a uri. It should only return HTTP methods that are
+	 * available for the specified uri.
+	 *
+	 * @param string $uri
+	 * @return array
+	 */
+	public function getHTTPMethods($uri) {
+
+		try {
+			$node = $this->server->tree->getNodeForPath($uri);
+		} catch (NotFound $e) {
+			return [];
+		}
+
+		if ($node instanceof IOutbox) {
+			return ['POST'];
+		}
+
+		return [];
+
+	}
+
+	/**
+	 * This method handles POST request for the outbox.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpPost(RequestInterface $request, ResponseInterface $response) {
+
+		// Checking if this is a text/calendar content type
+		$contentType = $request->getHeader('Content-Type');
+		if (strpos($contentType, 'text/calendar') !== 0) {
+			return;
+		}
+
+		$path = $request->getPath();
+
+		// Checking if we're talking to an outbox
+		try {
+			$node = $this->server->tree->getNodeForPath($path);
+		} catch (NotFound $e) {
+			return;
+		}
+		if (!$node instanceof IOutbox)
+			return;
+
+		$this->server->transactionType = 'post-caldav-outbox';
+		$this->outboxRequest($node, $request, $response);
+
+		// Returning false breaks the event chain and tells the server we've
+		// handled the request.
+		return false;
+
+	}
+
+	/**
+	 * This method handler is invoked during fetching of properties.
+	 *
+	 * We use this event to add calendar-auto-schedule-specific properties.
+	 *
+	 * @param PropFind $propFind
+	 * @param INode $node
+	 * @return void
+	 */
+	public function propFind(PropFind $propFind, INode $node) {
+
+		if ($node instanceof DAVACL\IPrincipal) {
+
+			$caldavPlugin = $this->server->getPlugin('caldav');
+			$principalUrl = $node->getPrincipalUrl();
+
+			// schedule-outbox-URL property
+			$propFind->handle('{' . self::NS_CALDAV . '}schedule-outbox-URL', function() use ($principalUrl, $caldavPlugin) {
+
+				$calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+				if (!$calendarHomePath) {
+					return null;
+				}
+				$outboxPath = $calendarHomePath . '/outbox/';
+
+				return new Href($outboxPath);
+
+			});
+			// schedule-inbox-URL property
+			$propFind->handle('{' . self::NS_CALDAV . '}schedule-inbox-URL', function() use ($principalUrl, $caldavPlugin) {
+
+				$calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+				if (!$calendarHomePath) {
+					return null;
+				}
+				$inboxPath = $calendarHomePath . '/inbox/';
+
+				return new Href($inboxPath);
+
+			});
+
+			$propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($principalUrl, $caldavPlugin) {
+
+				// We don't support customizing this property yet, so in the
+				// meantime we just grab the first calendar in the home-set.
+				$calendarHomePath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl);
+
+				if (!$calendarHomePath) {
+					return null;
+				}
+
+				$sccs = '{' . self::NS_CALDAV . '}supported-calendar-component-set';
+
+				$result = $this->server->getPropertiesForPath($calendarHomePath, [
+					'{DAV:}resourcetype',
+					$sccs,
+				], 1);
+
+				foreach ($result as $child) {
+					if (!isset($child[200]['{DAV:}resourcetype']) || !$child[200]['{DAV:}resourcetype']->is('{' . self::NS_CALDAV . '}calendar') || $child[200]['{DAV:}resourcetype']->is('{http://calendarserver.org/ns/}shared')) {
+						// Node is either not a calendar or a shared instance.
+						continue;
+					}
+					if (!isset($child[200][$sccs]) || in_array('VEVENT', $child[200][$sccs]->getValue())) {
+						// Either there is no supported-calendar-component-set
+						// (which is fine) or we found one that supports VEVENT.
+						return new Href($child['href']);
+					}
+				}
+
+			});
+
+			// The server currently reports every principal to be of type
+			// 'INDIVIDUAL'
+			$propFind->handle('{' . self::NS_CALDAV . '}calendar-user-type', function() {
+
+				return 'INDIVIDUAL';
+
+			});
+
+		}
+
+		// Mapping the old property to the new property.
+		$propFind->handle('{http://calendarserver.org/ns/}calendar-availability', function() use ($propFind, $node) {
+
+			 // In case it wasn't clear, the only difference is that we map the
+			// old property to a different namespace.
+			 $availProp = '{' . self::NS_CALDAV . '}calendar-availability';
+			 $subPropFind = new PropFind(
+				 $propFind->getPath(),
+				 [$availProp]
+			 );
+
+			 $this->server->getPropertiesByNode(
+				 $subPropFind,
+				 $node
+			 );
+
+			 $propFind->set(
+				 '{http://calendarserver.org/ns/}calendar-availability',
+				 $subPropFind->get($availProp),
+				 $subPropFind->getStatus($availProp)
+			 );
+
+		});
+
+	}
+
+	/**
+	 * This method is called during property updates.
+	 *
+	 * @param string $path
+	 * @param PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch($path, PropPatch $propPatch) {
+
+		// Mapping the old property to the new property.
+		$propPatch->handle('{http://calendarserver.org/ns/}calendar-availability', function($value) use ($path) {
+
+			$availProp = '{' . self::NS_CALDAV . '}calendar-availability';
+			$subPropPatch = new PropPatch([$availProp => $value]);
+			$this->server->emit('propPatch', [$path, $subPropPatch]);
+			$subPropPatch->commit();
+
+			return $subPropPatch->getResult()[$availProp];
+
+		});
+
+	}
+
+	/**
+	 * This method is triggered whenever there was a calendar object gets
+	 * created or updated.
+	 *
+	 * @param RequestInterface $request HTTP request
+	 * @param ResponseInterface $response HTTP Response
+	 * @param VCalendar $vCal Parsed iCalendar object
+	 * @param mixed $calendarPath Path to calendar collection
+	 * @param mixed $modified The iCalendar object has been touched.
+	 * @param mixed $isNew Whether this was a new item or we're updating one
+	 * @return void
+	 */
+	public function calendarObjectChange(RequestInterface $request, ResponseInterface $response, VCalendar $vCal, $calendarPath, &$modified, $isNew) {
+
+		if (!$this->scheduleReply($this->server->httpRequest)) {
+			return;
+		}
+
+		$calendarNode = $this->server->tree->getNodeForPath($calendarPath);
+
+		$addresses = $this->getAddressesForPrincipal(
+			$calendarNode->getOwner()
+		);
+
+		if (!$isNew) {
+			$node = $this->server->tree->getNodeForPath($request->getPath());
+			$oldObj = Reader::read($node->get());
+		} else {
+			$oldObj = null;
+		}
+
+		$this->processICalendarChange($oldObj, $vCal, $addresses, [], $modified);
+
+		if ($oldObj) {
+			// Destroy circular references so PHP will GC the object.
+			$oldObj->destroy();
+		}
+
+	}
+
+	/**
+	 * This method is responsible for delivering the ITip message.
+	 *
+	 * @param ITip\Message $itipMessage
+	 * @return void
+	 */
+	public function deliver(ITip\Message $iTipMessage) {
+
+		$this->server->emit('schedule', [$iTipMessage]);
+		if (!$iTipMessage->scheduleStatus) {
+			$iTipMessage->scheduleStatus = '5.2;There was no system capable of delivering the scheduling message';
+		}
+		// In case the change was considered 'insignificant', we are going to
+		// remove any error statuses, if any. See ticket #525.
+		list($baseCode) = explode('.', $iTipMessage->scheduleStatus);
+		if (!$iTipMessage->significantChange && in_array($baseCode, ['3', '5'])) {
+			$iTipMessage->scheduleStatus = null;
+		}
+
+	}
+
+	/**
+	 * This method is triggered before a file gets deleted.
+	 *
+	 * We use this event to make sure that when this happens, attendees get
+	 * cancellations, and organizers get 'DECLINED' statuses.
+	 *
+	 * @param string $path
+	 * @return void
+	 */
+	public function beforeUnbind($path) {
+
+		if ($this->server->httpRequest->getMethod() === 'MOVE') return;
+
+		$node = $this->server->tree->getNodeForPath($path);
+
+		if (!$node instanceof ICalendarObject || $node instanceof ISchedulingObject) {
+			return;
+		}
+
+		if (!$this->scheduleReply($this->server->httpRequest)) {
+			return;
+		}
+
+		$addresses = $this->getAddressesForPrincipal(
+			$node->getOwner()
+		);
+
+		$broker = new ITip\Broker();
+		$messages = $broker->parseEvent(null, $addresses, $node->get());
+
+		foreach ($messages as $message) {
+			$this->deliver($message);
+		}
+
+	}
+
+	/**
+	 * Event handler for the 'schedule' event.
+	 *
+	 * This handler attempts to look at local accounts to deliver the
+	 * scheduling object.
+	 *
+	 * @param ITip\Message $iTipMessage
+	 * @return void
+	 */
+	public function scheduleLocalDelivery(ITip\Message $iTipMessage) {
+
+		$aclPlugin = $this->server->getPlugin('acl');
+
+		// Local delivery is not available if the ACL plugin is not loaded.
+		if (!$aclPlugin) {
+			return;
+		}
+
+		$caldavNS = '{' . self::NS_CALDAV . '}';
+
+		$principalUri = $aclPlugin->getPrincipalByUri($iTipMessage->recipient);
+		if (!$principalUri) {
+			$iTipMessage->scheduleStatus = '3.7;Could not find principal.';
+			return;
+		}
+
+		// We found a principal URL, now we need to find its inbox.
+		// Unfortunately we may not have sufficient privileges to find this, so
+		// we are temporarily turning off ACL to let this come through.
+		//
+		// Once we support PHP 5.5, this should be wrapped in a try..finally
+		// block so we can ensure that this privilege gets added again after.
+		$this->server->removeListener('propFind', [$aclPlugin, 'propFind']);
+
+		$result = $this->server->getProperties(
+			$principalUri,
+			[
+				'{DAV:}principal-URL',
+				 $caldavNS . 'calendar-home-set',
+				 $caldavNS . 'schedule-inbox-URL',
+				 $caldavNS . 'schedule-default-calendar-URL',
+				'{http://sabredav.org/ns}email-address',
+			]
+		);
+
+		// Re-registering the ACL event
+		$this->server->on('propFind', [$aclPlugin, 'propFind'], 20);
+
+		if (!isset($result[$caldavNS . 'schedule-inbox-URL'])) {
+			$iTipMessage->scheduleStatus = '5.2;Could not find local inbox';
+			return;
+		}
+		if (!isset($result[$caldavNS . 'calendar-home-set'])) {
+			$iTipMessage->scheduleStatus = '5.2;Could not locate a calendar-home-set';
+			return;
+		}
+		if (!isset($result[$caldavNS . 'schedule-default-calendar-URL'])) {
+			$iTipMessage->scheduleStatus = '5.2;Could not find a schedule-default-calendar-URL property';
+			return;
+		}
+
+		$calendarPath = $result[$caldavNS . 'schedule-default-calendar-URL']->getHref();
+		$homePath = $result[$caldavNS . 'calendar-home-set']->getHref();
+		$inboxPath = $result[$caldavNS . 'schedule-inbox-URL']->getHref();
+
+		if ($iTipMessage->method === 'REPLY') {
+			$privilege = 'schedule-deliver-reply';
+		} else {
+			$privilege = 'schedule-deliver-invite';
+		}
+
+		if (!$aclPlugin->checkPrivileges($inboxPath, $caldavNS . $privilege, DAVACL\Plugin::R_PARENT, false)) {
+			$iTipMessage->scheduleStatus = '3.8;organizer did not have the ' . $privilege . ' privilege on the attendees inbox';
+			return;
+		}
+
+		// Next, we're going to find out if the item already exits in one of
+		// the users' calendars.
+		$uid = $iTipMessage->uid;
+
+		$newFileName = 'sabredav-' . \Sabre\DAV\UUIDUtil::getUUID() . '.ics';
+
+		$home = $this->server->tree->getNodeForPath($homePath);
+		$inbox = $this->server->tree->getNodeForPath($inboxPath);
+
+		$currentObject = null;
+		$objectNode = null;
+		$isNewNode = false;
+
+		$result = $home->getCalendarObjectByUID($uid);
+		if ($result) {
+			// There was an existing object, we need to update probably.
+			$objectPath = $homePath . '/' . $result;
+			$objectNode = $this->server->tree->getNodeForPath($objectPath);
+			$oldICalendarData = $objectNode->get();
+			$currentObject = Reader::read($oldICalendarData);
+		} else {
+			$isNewNode = true;
+		}
+
+		$broker = new ITip\Broker();
+		$newObject = $broker->processMessage($iTipMessage, $currentObject);
+
+		$inbox->createFile($newFileName, $iTipMessage->message->serialize());
+
+		if (!$newObject) {
+			// We received an iTip message referring to a UID that we don't
+			// have in any calendars yet, and processMessage did not give us a
+			// calendarobject back.
+			//
+			// The implication is that processMessage did not understand the
+			// iTip message.
+			$iTipMessage->scheduleStatus = '5.0;iTip message was not processed by the server, likely because we didn\'t understand it.';
+			return;
+		}
+
+		// Note that we are bypassing ACL on purpose by calling this directly.
+		// We may need to look a bit deeper into this later. Supporting ACL
+		// here would be nice.
+		if ($isNewNode) {
+			$calendar = $this->server->tree->getNodeForPath($calendarPath);
+			$calendar->createFile($newFileName, $newObject->serialize());
+		} else {
+			// If the message was a reply, we may have to inform other
+			// attendees of this attendees status. Therefore we're shooting off
+			// another itipMessage.
+			if ($iTipMessage->method === 'REPLY') {
+				$this->processICalendarChange(
+					$oldICalendarData,
+					$newObject,
+					[$iTipMessage->recipient],
+					[$iTipMessage->sender]
+				);
+			}
+			$objectNode->put($newObject->serialize());
+		}
+		$iTipMessage->scheduleStatus = '1.2;Message delivered locally';
+
+	}
+
+	/**
+	 * This method looks at an old iCalendar object, a new iCalendar object and
+	 * starts sending scheduling messages based on the changes.
+	 *
+	 * A list of addresses needs to be specified, so the system knows who made
+	 * the update, because the behavior may be different based on if it's an
+	 * attendee or an organizer.
+	 *
+	 * This method may update $newObject to add any status changes.
+	 *
+	 * @param VCalendar|string $oldObject
+	 * @param VCalendar $newObject
+	 * @param array $addresses
+	 * @param array $ignore Any addresses to not send messages to.
+	 * @param bool $modified A marker to indicate that the original object
+	 *   modified by this process.
+	 * @return void
+	 */
+	protected function processICalendarChange($oldObject = null, VCalendar $newObject, array $addresses, array $ignore = [], &$modified = false) {
+
+		$broker = new ITip\Broker();
+		$messages = $broker->parseEvent($newObject, $addresses, $oldObject);
+
+		if ($messages) $modified = true;
+
+		foreach ($messages as $message) {
+
+			if (in_array($message->recipient, $ignore)) {
+				continue;
+			}
+
+			$this->deliver($message);
+
+			if (isset($newObject->VEVENT->ORGANIZER) && ($newObject->VEVENT->ORGANIZER->getNormalizedValue() === $message->recipient)) {
+				if ($message->scheduleStatus) {
+					$newObject->VEVENT->ORGANIZER['SCHEDULE-STATUS'] = $message->getScheduleStatus();
+				}
+				unset($newObject->VEVENT->ORGANIZER['SCHEDULE-FORCE-SEND']);
+
+			} else {
+
+				if (isset($newObject->VEVENT->ATTENDEE)) foreach ($newObject->VEVENT->ATTENDEE as $attendee) {
+
+					if ($attendee->getNormalizedValue() === $message->recipient) {
+						if ($message->scheduleStatus) {
+							$attendee['SCHEDULE-STATUS'] = $message->getScheduleStatus();
+						}
+						unset($attendee['SCHEDULE-FORCE-SEND']);
+						break;
+					}
+
+				}
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * Returns a list of addresses that are associated with a principal.
+	 *
+	 * @param string $principal
+	 * @return array
+	 */
+	protected function getAddressesForPrincipal($principal) {
+
+		$CUAS = '{' . self::NS_CALDAV . '}calendar-user-address-set';
+
+		$properties = $this->server->getProperties(
+			$principal,
+			[$CUAS]
+		);
+
+		// If we can't find this information, we'll stop processing
+		if (!isset($properties[$CUAS])) {
+			return;
+		}
+
+		$addresses = $properties[$CUAS]->getHrefs();
+		return $addresses;
+
+	}
+
+	/**
+	 * This method handles POST requests to the schedule-outbox.
+	 *
+	 * Currently, two types of requests are support:
+	 *   * FREEBUSY requests from RFC 6638
+	 *   * Simple iTIP messages from draft-desruisseaux-caldav-sched-04
+	 *
+	 * The latter is from an expired early draft of the CalDAV scheduling
+	 * extensions, but iCal depends on a feature from that spec, so we
+	 * implement it.
+	 *
+	 * @param IOutbox $outboxNode
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	public function outboxRequest(IOutbox $outboxNode, RequestInterface $request, ResponseInterface $response) {
+
+		$outboxPath = $request->getPath();
+
+		// Parsing the request body
+		try {
+			$vObject = VObject\Reader::read($request->getBody());
+		} catch (VObject\ParseException $e) {
+			throw new BadRequest('The request body must be a valid iCalendar object. Parse error: ' . $e->getMessage());
+		}
+
+		// The incoming iCalendar object must have a METHOD property, and a
+		// component. The combination of both determines what type of request
+		// this is.
+		$componentType = null;
+		foreach ($vObject->getComponents() as $component) {
+			if ($component->name !== 'VTIMEZONE') {
+				$componentType = $component->name;
+				break;
+			}
+		}
+		if (is_null($componentType)) {
+			throw new BadRequest('We expected at least one VTODO, VJOURNAL, VFREEBUSY or VEVENT component');
+		}
 
-        // Validating the METHOD
-        $method = strtoupper((string)$vObject->METHOD);
-        if (!$method) {
-            throw new BadRequest('A METHOD property must be specified in iTIP messages');
-        }
+		// Validating the METHOD
+		$method = strtoupper((string)$vObject->METHOD);
+		if (!$method) {
+			throw new BadRequest('A METHOD property must be specified in iTIP messages');
+		}
 
-        // So we support one type of request:
-        //
-        // REQUEST with a VFREEBUSY component
+		// So we support one type of request:
+		//
+		// REQUEST with a VFREEBUSY component
 
-        $acl = $this->server->getPlugin('acl');
+		$acl = $this->server->getPlugin('acl');
 
-        if ($componentType === 'VFREEBUSY' && $method === 'REQUEST') {
+		if ($componentType === 'VFREEBUSY' && $method === 'REQUEST') {
 
-            $acl && $acl->checkPrivileges($outboxPath, '{' . self::NS_CALDAV . '}schedule-query-freebusy');
-            $this->handleFreeBusyRequest($outboxNode, $vObject, $request, $response);
-
-            // Destroy circular references so PHP can GC the object.
-            $vObject->destroy();
-            unset($vObject);
+			$acl && $acl->checkPrivileges($outboxPath, '{' . self::NS_CALDAV . '}schedule-query-freebusy');
+			$this->handleFreeBusyRequest($outboxNode, $vObject, $request, $response);
+
+			// Destroy circular references so PHP can GC the object.
+			$vObject->destroy();
+			unset($vObject);
 
-        } else {
+		} else {
 
-            throw new NotImplemented('We only support VFREEBUSY (REQUEST) on this endpoint');
+			throw new NotImplemented('We only support VFREEBUSY (REQUEST) on this endpoint');
 
-        }
-
-    }
-
-    /**
-     * This method is responsible for parsing a free-busy query request and
-     * returning it's result.
-     *
-     * @param IOutbox $outbox
-     * @param VObject\Component $vObject
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return string
-     */
-    protected function handleFreeBusyRequest(IOutbox $outbox, VObject\Component $vObject, RequestInterface $request, ResponseInterface $response) {
-
-        $vFreeBusy = $vObject->VFREEBUSY;
-        $organizer = $vFreeBusy->organizer;
-
-        $organizer = (string)$organizer;
-
-        // Validating if the organizer matches the owner of the inbox.
-        $owner = $outbox->getOwner();
-
-        $caldavNS = '{' . self::NS_CALDAV . '}';
-
-        $uas = $caldavNS . 'calendar-user-address-set';
-        $props = $this->server->getProperties($owner, [$uas]);
-
-        if (empty($props[$uas]) || !in_array($organizer, $props[$uas]->getHrefs())) {
-            throw new Forbidden('The organizer in the request did not match any of the addresses for the owner of this inbox');
-        }
-
-        if (!isset($vFreeBusy->ATTENDEE)) {
-            throw new BadRequest('You must at least specify 1 attendee');
-        }
-
-        $attendees = [];
-        foreach ($vFreeBusy->ATTENDEE as $attendee) {
-            $attendees[] = (string)$attendee;
-        }
-
-
-        if (!isset($vFreeBusy->DTSTART) || !isset($vFreeBusy->DTEND)) {
-            throw new BadRequest('DTSTART and DTEND must both be specified');
-        }
-
-        $startRange = $vFreeBusy->DTSTART->getDateTime();
-        $endRange = $vFreeBusy->DTEND->getDateTime();
-
-        $results = [];
-        foreach ($attendees as $attendee) {
-            $results[] = $this->getFreeBusyForEmail($attendee, $startRange, $endRange, $vObject);
-        }
-
-        $dom = new \DOMDocument('1.0', 'utf-8');
-        $dom->formatOutput = true;
-        $scheduleResponse = $dom->createElement('cal:schedule-response');
-        foreach ($this->server->xml->namespaceMap as $namespace => $prefix) {
-
-            $scheduleResponse->setAttribute('xmlns:' . $prefix, $namespace);
-
-        }
-        $dom->appendChild($scheduleResponse);
-
-        foreach ($results as $result) {
-            $xresponse = $dom->createElement('cal:response');
-
-            $recipient = $dom->createElement('cal:recipient');
-            $recipientHref = $dom->createElement('d:href');
-
-            $recipientHref->appendChild($dom->createTextNode($result['href']));
-            $recipient->appendChild($recipientHref);
-            $xresponse->appendChild($recipient);
-
-            $reqStatus = $dom->createElement('cal:request-status');
-            $reqStatus->appendChild($dom->createTextNode($result['request-status']));
-            $xresponse->appendChild($reqStatus);
-
-            if (isset($result['calendar-data'])) {
-
-                $calendardata = $dom->createElement('cal:calendar-data');
-                $calendardata->appendChild($dom->createTextNode(str_replace("\r\n", "\n", $result['calendar-data']->serialize())));
-                $xresponse->appendChild($calendardata);
-
-            }
-            $scheduleResponse->appendChild($xresponse);
-        }
-
-        $response->setStatus(200);
-        $response->setHeader('Content-Type', 'application/xml');
-        $response->setBody($dom->saveXML());
-
-    }
-
-    /**
-     * Returns free-busy information for a specific address. The returned
-     * data is an array containing the following properties:
-     *
-     * calendar-data : A VFREEBUSY VObject
-     * request-status : an iTip status code.
-     * href: The principal's email address, as requested
-     *
-     * The following request status codes may be returned:
-     *   * 2.0;description
-     *   * 3.7;description
-     *
-     * @param string $email address
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     * @param VObject\Component $request
-     * @return array
-     */
-    protected function getFreeBusyForEmail($email, \DateTimeInterface $start, \DateTimeInterface $end, VObject\Component $request) {
-
-        $caldavNS = '{' . self::NS_CALDAV . '}';
-
-        $aclPlugin = $this->server->getPlugin('acl');
-        if (substr($email, 0, 7) === 'mailto:') $email = substr($email, 7);
-
-        $result = $aclPlugin->principalSearch(
-            ['{http://sabredav.org/ns}email-address' => $email],
-            [
-                '{DAV:}principal-URL',
-                $caldavNS . 'calendar-home-set',
-                $caldavNS . 'schedule-inbox-URL',
-                '{http://sabredav.org/ns}email-address',
-
-            ]
-        );
-
-        if (!count($result)) {
-            return [
-                'request-status' => '3.7;Could not find principal',
-                'href'           => 'mailto:' . $email,
-            ];
-        }
-
-        if (!isset($result[0][200][$caldavNS . 'calendar-home-set'])) {
-            return [
-                'request-status' => '3.7;No calendar-home-set property found',
-                'href'           => 'mailto:' . $email,
-            ];
-        }
-        if (!isset($result[0][200][$caldavNS . 'schedule-inbox-URL'])) {
-            return [
-                'request-status' => '3.7;No schedule-inbox-URL property found',
-                'href'           => 'mailto:' . $email,
-            ];
-        }
-        $homeSet = $result[0][200][$caldavNS . 'calendar-home-set']->getHref();
-        $inboxUrl = $result[0][200][$caldavNS . 'schedule-inbox-URL']->getHref();
-
-        // Grabbing the calendar list
-        $objects = [];
-        $calendarTimeZone = new DateTimeZone('UTC');
-
-        foreach ($this->server->tree->getNodeForPath($homeSet)->getChildren() as $node) {
-            if (!$node instanceof ICalendar) {
-                continue;
-            }
-
-            $sct = $caldavNS . 'schedule-calendar-transp';
-            $ctz = $caldavNS . 'calendar-timezone';
-            $props = $node->getProperties([$sct, $ctz]);
-
-            if (isset($props[$sct]) && $props[$sct]->getValue() == ScheduleCalendarTransp::TRANSPARENT) {
-                // If a calendar is marked as 'transparent', it means we must
-                // ignore it for free-busy purposes.
-                continue;
-            }
-
-            $aclPlugin->checkPrivileges($homeSet . $node->getName(), $caldavNS . 'read-free-busy');
-
-            if (isset($props[$ctz])) {
-                $vtimezoneObj = VObject\Reader::read($props[$ctz]);
-                $calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
-
-                // Destroy circular references so PHP can garbage collect the object.
-                $vtimezoneObj->destroy();
-
-            }
-
-            // Getting the list of object uris within the time-range
-            $urls = $node->calendarQuery([
-                'name'         => 'VCALENDAR',
-                'comp-filters' => [
-                    [
-                        'name'           => 'VEVENT',
-                        'comp-filters'   => [],
-                        'prop-filters'   => [],
-                        'is-not-defined' => false,
-                        'time-range'     => [
-                            'start' => $start,
-                            'end'   => $end,
-                        ],
-                    ],
-                ],
-                'prop-filters'   => [],
-                'is-not-defined' => false,
-                'time-range'     => null,
-            ]);
-
-            $calObjects = array_map(function($url) use ($node) {
-                $obj = $node->getChild($url)->get();
-                return $obj;
-            }, $urls);
-
-            $objects = array_merge($objects, $calObjects);
-
-        }
-
-        $inboxProps = $this->server->getProperties(
-            $inboxUrl,
-            $caldavNS . 'calendar-availability'
-        );
-
-        $vcalendar = new VObject\Component\VCalendar();
-        $vcalendar->METHOD = 'REPLY';
-
-        $generator = new VObject\FreeBusyGenerator();
-        $generator->setObjects($objects);
-        $generator->setTimeRange($start, $end);
-        $generator->setBaseObject($vcalendar);
-        $generator->setTimeZone($calendarTimeZone);
-
-        if ($inboxProps) {
-            $generator->setVAvailability(
-                VObject\Reader::read(
-                    $inboxProps[$caldavNS . 'calendar-availability']
-                )
-            );
-        }
-
-        $result = $generator->getResult();
-
-        $vcalendar->VFREEBUSY->ATTENDEE = 'mailto:' . $email;
-        $vcalendar->VFREEBUSY->UID = (string)$request->VFREEBUSY->UID;
-        $vcalendar->VFREEBUSY->ORGANIZER = clone $request->VFREEBUSY->ORGANIZER;
-
-        return [
-            'calendar-data'  => $result,
-            'request-status' => '2.0;Success',
-            'href'           => 'mailto:' . $email,
-        ];
-    }
-
-    /**
-     * This method checks the 'Schedule-Reply' header
-     * and returns false if it's 'F', otherwise true.
-     *
-     * @param RequestInterface $request
-     * @return bool
-     */
-    private function scheduleReply(RequestInterface $request) {
-
-        $scheduleReply = $request->getHeader('Schedule-Reply');
-        return $scheduleReply !== 'F';
-
-    }
-
-    /**
-     * 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 calendar-auto-schedule, as defined in rf6868',
-            'link'        => 'http://sabre.io/dav/scheduling/',
-        ];
-
-    }
+		}
+
+	}
+
+	/**
+	 * This method is responsible for parsing a free-busy query request and
+	 * returning it's result.
+	 *
+	 * @param IOutbox $outbox
+	 * @param VObject\Component $vObject
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return string
+	 */
+	protected function handleFreeBusyRequest(IOutbox $outbox, VObject\Component $vObject, RequestInterface $request, ResponseInterface $response) {
+
+		$vFreeBusy = $vObject->VFREEBUSY;
+		$organizer = $vFreeBusy->organizer;
+
+		$organizer = (string)$organizer;
+
+		// Validating if the organizer matches the owner of the inbox.
+		$owner = $outbox->getOwner();
+
+		$caldavNS = '{' . self::NS_CALDAV . '}';
+
+		$uas = $caldavNS . 'calendar-user-address-set';
+		$props = $this->server->getProperties($owner, [$uas]);
+
+		if (empty($props[$uas]) || !in_array($organizer, $props[$uas]->getHrefs())) {
+			throw new Forbidden('The organizer in the request did not match any of the addresses for the owner of this inbox');
+		}
+
+		if (!isset($vFreeBusy->ATTENDEE)) {
+			throw new BadRequest('You must at least specify 1 attendee');
+		}
+
+		$attendees = [];
+		foreach ($vFreeBusy->ATTENDEE as $attendee) {
+			$attendees[] = (string)$attendee;
+		}
+
+
+		if (!isset($vFreeBusy->DTSTART) || !isset($vFreeBusy->DTEND)) {
+			throw new BadRequest('DTSTART and DTEND must both be specified');
+		}
+
+		$startRange = $vFreeBusy->DTSTART->getDateTime();
+		$endRange = $vFreeBusy->DTEND->getDateTime();
+
+		$results = [];
+		foreach ($attendees as $attendee) {
+			$results[] = $this->getFreeBusyForEmail($attendee, $startRange, $endRange, $vObject);
+		}
+
+		$dom = new \DOMDocument('1.0', 'utf-8');
+		$dom->formatOutput = true;
+		$scheduleResponse = $dom->createElement('cal:schedule-response');
+		foreach ($this->server->xml->namespaceMap as $namespace => $prefix) {
+
+			$scheduleResponse->setAttribute('xmlns:' . $prefix, $namespace);
+
+		}
+		$dom->appendChild($scheduleResponse);
+
+		foreach ($results as $result) {
+			$xresponse = $dom->createElement('cal:response');
+
+			$recipient = $dom->createElement('cal:recipient');
+			$recipientHref = $dom->createElement('d:href');
+
+			$recipientHref->appendChild($dom->createTextNode($result['href']));
+			$recipient->appendChild($recipientHref);
+			$xresponse->appendChild($recipient);
+
+			$reqStatus = $dom->createElement('cal:request-status');
+			$reqStatus->appendChild($dom->createTextNode($result['request-status']));
+			$xresponse->appendChild($reqStatus);
+
+			if (isset($result['calendar-data'])) {
+
+				$calendardata = $dom->createElement('cal:calendar-data');
+				$calendardata->appendChild($dom->createTextNode(str_replace("\r\n", "\n", $result['calendar-data']->serialize())));
+				$xresponse->appendChild($calendardata);
+
+			}
+			$scheduleResponse->appendChild($xresponse);
+		}
+
+		$response->setStatus(200);
+		$response->setHeader('Content-Type', 'application/xml');
+		$response->setBody($dom->saveXML());
+
+	}
+
+	/**
+	 * Returns free-busy information for a specific address. The returned
+	 * data is an array containing the following properties:
+	 *
+	 * calendar-data : A VFREEBUSY VObject
+	 * request-status : an iTip status code.
+	 * href: The principal's email address, as requested
+	 *
+	 * The following request status codes may be returned:
+	 *   * 2.0;description
+	 *   * 3.7;description
+	 *
+	 * @param string $email address
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 * @param VObject\Component $request
+	 * @return array
+	 */
+	protected function getFreeBusyForEmail($email, \DateTimeInterface $start, \DateTimeInterface $end, VObject\Component $request) {
+
+		$caldavNS = '{' . self::NS_CALDAV . '}';
+
+		$aclPlugin = $this->server->getPlugin('acl');
+		if (substr($email, 0, 7) === 'mailto:') $email = substr($email, 7);
+
+		$result = $aclPlugin->principalSearch(
+			['{http://sabredav.org/ns}email-address' => $email],
+			[
+				'{DAV:}principal-URL',
+				$caldavNS . 'calendar-home-set',
+				$caldavNS . 'schedule-inbox-URL',
+				'{http://sabredav.org/ns}email-address',
+
+			]
+		);
+
+		if (!count($result)) {
+			return [
+				'request-status' => '3.7;Could not find principal',
+				'href'           => 'mailto:' . $email,
+			];
+		}
+
+		if (!isset($result[0][200][$caldavNS . 'calendar-home-set'])) {
+			return [
+				'request-status' => '3.7;No calendar-home-set property found',
+				'href'           => 'mailto:' . $email,
+			];
+		}
+		if (!isset($result[0][200][$caldavNS . 'schedule-inbox-URL'])) {
+			return [
+				'request-status' => '3.7;No schedule-inbox-URL property found',
+				'href'           => 'mailto:' . $email,
+			];
+		}
+		$homeSet = $result[0][200][$caldavNS . 'calendar-home-set']->getHref();
+		$inboxUrl = $result[0][200][$caldavNS . 'schedule-inbox-URL']->getHref();
+
+		// Grabbing the calendar list
+		$objects = [];
+		$calendarTimeZone = new DateTimeZone('UTC');
+
+		foreach ($this->server->tree->getNodeForPath($homeSet)->getChildren() as $node) {
+			if (!$node instanceof ICalendar) {
+				continue;
+			}
+
+			$sct = $caldavNS . 'schedule-calendar-transp';
+			$ctz = $caldavNS . 'calendar-timezone';
+			$props = $node->getProperties([$sct, $ctz]);
+
+			if (isset($props[$sct]) && $props[$sct]->getValue() == ScheduleCalendarTransp::TRANSPARENT) {
+				// If a calendar is marked as 'transparent', it means we must
+				// ignore it for free-busy purposes.
+				continue;
+			}
+
+			$aclPlugin->checkPrivileges($homeSet . $node->getName(), $caldavNS . 'read-free-busy');
+
+			if (isset($props[$ctz])) {
+				$vtimezoneObj = VObject\Reader::read($props[$ctz]);
+				$calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
+
+				// Destroy circular references so PHP can garbage collect the object.
+				$vtimezoneObj->destroy();
+
+			}
+
+			// Getting the list of object uris within the time-range
+			$urls = $node->calendarQuery([
+				'name'         => 'VCALENDAR',
+				'comp-filters' => [
+					[
+						'name'           => 'VEVENT',
+						'comp-filters'   => [],
+						'prop-filters'   => [],
+						'is-not-defined' => false,
+						'time-range'     => [
+							'start' => $start,
+							'end'   => $end,
+						],
+					],
+				],
+				'prop-filters'   => [],
+				'is-not-defined' => false,
+				'time-range'     => null,
+			]);
+
+			$calObjects = array_map(function($url) use ($node) {
+				$obj = $node->getChild($url)->get();
+				return $obj;
+			}, $urls);
+
+			$objects = array_merge($objects, $calObjects);
+
+		}
+
+		$inboxProps = $this->server->getProperties(
+			$inboxUrl,
+			$caldavNS . 'calendar-availability'
+		);
+
+		$vcalendar = new VObject\Component\VCalendar();
+		$vcalendar->METHOD = 'REPLY';
+
+		$generator = new VObject\FreeBusyGenerator();
+		$generator->setObjects($objects);
+		$generator->setTimeRange($start, $end);
+		$generator->setBaseObject($vcalendar);
+		$generator->setTimeZone($calendarTimeZone);
+
+		if ($inboxProps) {
+			$generator->setVAvailability(
+				VObject\Reader::read(
+					$inboxProps[$caldavNS . 'calendar-availability']
+				)
+			);
+		}
+
+		$result = $generator->getResult();
+
+		$vcalendar->VFREEBUSY->ATTENDEE = 'mailto:' . $email;
+		$vcalendar->VFREEBUSY->UID = (string)$request->VFREEBUSY->UID;
+		$vcalendar->VFREEBUSY->ORGANIZER = clone $request->VFREEBUSY->ORGANIZER;
+
+		return [
+			'calendar-data'  => $result,
+			'request-status' => '2.0;Success',
+			'href'           => 'mailto:' . $email,
+		];
+	}
+
+	/**
+	 * This method checks the 'Schedule-Reply' header
+	 * and returns false if it's 'F', otherwise true.
+	 *
+	 * @param RequestInterface $request
+	 * @return bool
+	 */
+	private function scheduleReply(RequestInterface $request) {
+
+		$scheduleReply = $request->getHeader('Schedule-Reply');
+		return $scheduleReply !== 'F';
+
+	}
+
+	/**
+	 * 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 calendar-auto-schedule, as defined in rf6868',
+			'link'        => 'http://sabre.io/dav/scheduling/',
+		];
+
+	}
 }

Doc Comments +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
     /**
      * Returns a list of features for the DAV: HTTP header.
      *
-     * @return array
+     * @return string[]
      */
     public function getFeatures() {
 
@@ -160,7 +160,7 @@ 
      *
      * @param RequestInterface $request
      * @param ResponseInterface $response
-     * @return bool
+     * @return null|false
      */
     public function httpPost(RequestInterface $request, ResponseInterface $response) {
 
@@ -364,7 +364,7 @@ 
     /**
      * This method is responsible for delivering the ITip message.
      *
-     * @param ITip\Message $itipMessage
+     * @param ITip\Message $iTipMessage
      * @return void
      */
     public function deliver(ITip\Message $iTipMessage) {
@@ -816,8 +816,8 @@ 
      *   * 3.7;description
      *
      * @param string $email address
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
+     * @param \DateTimeInterface $start
+     * @param \DateTimeInterface $end
      * @param VObject\Component $request
      * @return array
      */

Spacing +9 added lines, -9 removed lines

@@ -100,12 +100,12 @@ 
     public function initialize(Server $server) {
 
         $this->server = $server;
-        $server->on('method:POST',          [$this, 'httpPost']);
-        $server->on('propFind',             [$this, 'propFind']);
-        $server->on('propPatch',            [$this, 'propPatch']);
+        $server->on('method:POST', [$this, 'httpPost']);
+        $server->on('propFind', [$this, 'propFind']);
+        $server->on('propPatch', [$this, 'propPatch']);
         $server->on('calendarObjectChange', [$this, 'calendarObjectChange']);
-        $server->on('beforeUnbind',         [$this, 'beforeUnbind']);
-        $server->on('schedule',             [$this, 'scheduleLocalDelivery']);
+        $server->on('beforeUnbind', [$this, 'beforeUnbind']);
+        $server->on('schedule', [$this, 'scheduleLocalDelivery']);
 
         $ns = '{' . self::NS_CALDAV . '}';
 
@@ -684,7 +684,7 @@ 
         }
 
         // Validating the METHOD
-        $method = strtoupper((string)$vObject->METHOD);
+        $method = strtoupper((string) $vObject->METHOD);
         if (!$method) {
             throw new BadRequest('A METHOD property must be specified in iTIP messages');
         }
@@ -727,7 +727,7 @@ 
         $vFreeBusy = $vObject->VFREEBUSY;
         $organizer = $vFreeBusy->organizer;
 
-        $organizer = (string)$organizer;
+        $organizer = (string) $organizer;
 
         // Validating if the organizer matches the owner of the inbox.
         $owner = $outbox->getOwner();
@@ -747,7 +747,7 @@ 
 
         $attendees = [];
         foreach ($vFreeBusy->ATTENDEE as $attendee) {
-            $attendees[] = (string)$attendee;
+            $attendees[] = (string) $attendee;
         }
 
 
@@ -945,7 +945,7 @@ 
         $result = $generator->getResult();
 
         $vcalendar->VFREEBUSY->ATTENDEE = 'mailto:' . $email;
-        $vcalendar->VFREEBUSY->UID = (string)$request->VFREEBUSY->UID;
+        $vcalendar->VFREEBUSY->UID = (string) $request->VFREEBUSY->UID;
         $vcalendar->VFREEBUSY->ORGANIZER = clone $request->VFREEBUSY->ORGANIZER;
 
         return [

Braces +15 added lines, -6 removed lines

@@ -178,8 +178,9 @@ 
         } catch (NotFound $e) {
             return;
         }
-        if (!$node instanceof IOutbox)
-            return;
+        if (!$node instanceof IOutbox) {
+                    return;
+        }
 
         $this->server->transactionType = 'post-caldav-outbox';
         $this->outboxRequest($node, $request, $response);
@@ -393,7 +394,9 @@ 
      */
     public function beforeUnbind($path) {
 
-        if ($this->server->httpRequest->getMethod() === 'MOVE') return;
+        if ($this->server->httpRequest->getMethod() === 'MOVE') {
+        	return;
+        }
 
         $node = $this->server->tree->getNodeForPath($path);
 
@@ -581,7 +584,9 @@ 
         $broker = new ITip\Broker();
         $messages = $broker->parseEvent($newObject, $addresses, $oldObject);
 
-        if ($messages) $modified = true;
+        if ($messages) {
+        	$modified = true;
+        }
 
         foreach ($messages as $message) {
 
@@ -599,11 +604,13 @@ 
 
             } else {
 
-                if (isset($newObject->VEVENT->ATTENDEE)) foreach ($newObject->VEVENT->ATTENDEE as $attendee) {
+                if (isset($newObject->VEVENT->ATTENDEE)) {
+                	foreach ($newObject->VEVENT->ATTENDEE as $attendee) {
 
                     if ($attendee->getNormalizedValue() === $message->recipient) {
                         if ($message->scheduleStatus) {
                             $attendee['SCHEDULE-STATUS'] = $message->getScheduleStatus();
+                }
                         }
                         unset($attendee['SCHEDULE-FORCE-SEND']);
                         break;
@@ -826,7 +833,9 @@ 
         $caldavNS = '{' . self::NS_CALDAV . '}';
 
         $aclPlugin = $this->server->getPlugin('acl');
-        if (substr($email, 0, 7) === 'mailto:') $email = substr($email, 7);
+        if (substr($email, 0, 7) === 'mailto:') {
+        	$email = substr($email, 7);
+        }
 
         $result = $aclPlugin->principalSearch(
             ['{http://sabredav.org/ns}email-address' => $email],

libraries/SabreDAV/CalDAV/Subscriptions/Plugin.php

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

@@ -4,8 +4,8 @@
 
 use Sabre\DAV\INode;
 use Sabre\DAV\PropFind;
-use Sabre\DAV\ServerPlugin;
 use Sabre\DAV\Server;
+use Sabre\DAV\ServerPlugin;
 
 /**
  * This plugin adds calendar-subscription support to your CalDAV server.

Indentation +98 added lines, -98 removed lines

@@ -19,102 +19,102 @@
  */
 class Plugin extends ServerPlugin {
 
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre\DAV\Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the required event subscriptions.
-     *
-     * @param Server $server
-     * @return void
-     */
-    public function initialize(Server $server) {
-
-        $server->resourceTypeMapping['Sabre\\CalDAV\\Subscriptions\\ISubscription'] =
-            '{http://calendarserver.org/ns/}subscribed';
-
-        $server->xml->elementMap['{http://calendarserver.org/ns/}source'] =
-            'Sabre\\DAV\\Xml\\Property\\Href';
-
-        $server->on('propFind', [$this, 'propFind'], 150);
-
-    }
-
-    /**
-     * 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-subscribed'];
-
-    }
-
-    /**
-     * Triggered after properties have been fetched.
-     *
-     * @param PropFind $propFind
-     * @param INode $node
-     * @return void
-     */
-    public function propFind(PropFind $propFind, INode $node) {
-
-        // There's a bunch of properties that must appear as a self-closing
-        // xml-element. This event handler ensures that this will be the case.
-        $props = [
-            '{http://calendarserver.org/ns/}subscribed-strip-alarms',
-            '{http://calendarserver.org/ns/}subscribed-strip-attachments',
-            '{http://calendarserver.org/ns/}subscribed-strip-todos',
-        ];
-
-        foreach ($props as $prop) {
-
-            if ($propFind->getStatus($prop) === 200) {
-                $propFind->set($prop, '', 200);
-            }
-
-        }
-
-    }
-
-    /**
-     * 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 'subscriptions';
-
-    }
-
-    /**
-     * 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' => 'This plugin allows users to store iCalendar subscriptions in their calendar-home.',
-            'link'        => null,
-        ];
-
-    }
+	/**
+	 * This initializes the plugin.
+	 *
+	 * This function is called by Sabre\DAV\Server, after
+	 * addPlugin is called.
+	 *
+	 * This method should set up the required event subscriptions.
+	 *
+	 * @param Server $server
+	 * @return void
+	 */
+	public function initialize(Server $server) {
+
+		$server->resourceTypeMapping['Sabre\\CalDAV\\Subscriptions\\ISubscription'] =
+			'{http://calendarserver.org/ns/}subscribed';
+
+		$server->xml->elementMap['{http://calendarserver.org/ns/}source'] =
+			'Sabre\\DAV\\Xml\\Property\\Href';
+
+		$server->on('propFind', [$this, 'propFind'], 150);
+
+	}
+
+	/**
+	 * 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-subscribed'];
+
+	}
+
+	/**
+	 * Triggered after properties have been fetched.
+	 *
+	 * @param PropFind $propFind
+	 * @param INode $node
+	 * @return void
+	 */
+	public function propFind(PropFind $propFind, INode $node) {
+
+		// There's a bunch of properties that must appear as a self-closing
+		// xml-element. This event handler ensures that this will be the case.
+		$props = [
+			'{http://calendarserver.org/ns/}subscribed-strip-alarms',
+			'{http://calendarserver.org/ns/}subscribed-strip-attachments',
+			'{http://calendarserver.org/ns/}subscribed-strip-todos',
+		];
+
+		foreach ($props as $prop) {
+
+			if ($propFind->getStatus($prop) === 200) {
+				$propFind->set($prop, '', 200);
+			}
+
+		}
+
+	}
+
+	/**
+	 * 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 'subscriptions';
+
+	}
+
+	/**
+	 * 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' => 'This plugin allows users to store iCalendar subscriptions in their calendar-home.',
+			'link'        => null,
+		];
+
+	}
 }

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
      * This is for example 'versioning' and is added to the DAV: header
      * in an OPTIONS response.
      *
-     * @return array
+     * @return string[]
      */
     public function getFeatures() {
 

libraries/SabreDAV/CalDAV/Subscriptions/Subscription.php

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

@@ -2,12 +2,12 @@
 
 namespace Sabre\CalDAV\Subscriptions;
 
+use Sabre\CalDAV\Backend\SubscriptionSupport;
+use Sabre\DAVACL\IACL;
 use Sabre\DAV\Collection;
-use Sabre\DAV\Xml\Property\Href;
-use Sabre\DAV\PropPatch;
 use Sabre\DAV\Exception\MethodNotAllowed;
-use Sabre\DAVACL\IACL;
-use Sabre\CalDAV\Backend\SubscriptionSupport;
+use Sabre\DAV\PropPatch;
+use Sabre\DAV\Xml\Property\Href;
 
 /**
  * Subscription Node

Indentation +250 added lines, -250 removed lines

@@ -20,255 +20,255 @@
  */
 class Subscription extends Collection implements ISubscription, IACL {
 
-    /**
-     * caldavBackend
-     *
-     * @var SupportsSubscriptions
-     */
-    protected $caldavBackend;
-
-    /**
-     * subscriptionInfo
-     *
-     * @var array
-     */
-    protected $subscriptionInfo;
-
-    /**
-     * Constructor
-     *
-     * @param SubscriptionSupport $caldavBackend
-     * @param array $calendarInfo
-     */
-    public function __construct(SubscriptionSupport $caldavBackend, array $subscriptionInfo) {
-
-        $this->caldavBackend = $caldavBackend;
-        $this->subscriptionInfo = $subscriptionInfo;
-
-        $required = [
-            'id',
-            'uri',
-            'principaluri',
-            'source',
-            ];
-
-        foreach ($required as $r) {
-            if (!isset($subscriptionInfo[$r])) {
-                throw new \InvalidArgumentException('The ' . $r . ' field is required when creating a subscription node');
-            }
-        }
-
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->subscriptionInfo['uri'];
-
-    }
-
-    /**
-     * Returns the last modification time
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        if (isset($this->subscriptionInfo['lastmodified'])) {
-            return $this->subscriptionInfo['lastmodified'];
-        }
-
-    }
-
-    /**
-     * Deletes the current node
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->caldavBackend->deleteSubscription(
-            $this->subscriptionInfo['id']
-        );
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return DAV\INode[]
-     */
-    public function getChildren() {
-
-        return [];
-
-    }
-
-    /**
-     * Updates properties on this node.
-     *
-     * This method received a PropPatch object, which contains all the
-     * information about the update.
-     *
-     * To update specific properties, call the 'handle' method on this object.
-     * Read the PropPatch documentation for more information.
-     *
-     * @param PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch(PropPatch $propPatch) {
-
-        return $this->caldavBackend->updateSubscription(
-            $this->subscriptionInfo['id'],
-            $propPatch
-        );
-
-    }
-
-    /**
-     * Returns a list of properties for this nodes.
-     *
-     * The properties list is a list of propertynames the client requested,
-     * encoded in clark-notation {xmlnamespace}tagname.
-     *
-     * If the array is empty, it means 'all properties' were requested.
-     *
-     * Note that it's fine to liberally give properties back, instead of
-     * conforming to the list of requested properties.
-     * The Server class will filter out the extra.
-     *
-     * @param array $properties
-     * @return void
-     */
-    public function getProperties($properties) {
-
-        $r = [];
-
-        foreach ($properties as $prop) {
-
-            switch ($prop) {
-                case '{http://calendarserver.org/ns/}source' :
-                    $r[$prop] = new Href($this->subscriptionInfo['source'], false);
-                    break;
-                default :
-                    if (array_key_exists($prop, $this->subscriptionInfo)) {
-                        $r[$prop] = $this->subscriptionInfo[$prop];
-                    }
-                    break;
-            }
-
-        }
-
-        return $r;
-
-    }
-
-    /**
-     * 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->subscriptionInfo['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->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner() . '/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->getOwner() . '/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner() . '/calendar-proxy-read',
-                '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 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;
-
-    }
+	/**
+	 * caldavBackend
+	 *
+	 * @var SupportsSubscriptions
+	 */
+	protected $caldavBackend;
+
+	/**
+	 * subscriptionInfo
+	 *
+	 * @var array
+	 */
+	protected $subscriptionInfo;
+
+	/**
+	 * Constructor
+	 *
+	 * @param SubscriptionSupport $caldavBackend
+	 * @param array $calendarInfo
+	 */
+	public function __construct(SubscriptionSupport $caldavBackend, array $subscriptionInfo) {
+
+		$this->caldavBackend = $caldavBackend;
+		$this->subscriptionInfo = $subscriptionInfo;
+
+		$required = [
+			'id',
+			'uri',
+			'principaluri',
+			'source',
+			];
+
+		foreach ($required as $r) {
+			if (!isset($subscriptionInfo[$r])) {
+				throw new \InvalidArgumentException('The ' . $r . ' field is required when creating a subscription node');
+			}
+		}
+
+	}
+
+	/**
+	 * Returns the name of the node.
+	 *
+	 * This is used to generate the url.
+	 *
+	 * @return string
+	 */
+	public function getName() {
+
+		return $this->subscriptionInfo['uri'];
+
+	}
+
+	/**
+	 * Returns the last modification time
+	 *
+	 * @return int
+	 */
+	public function getLastModified() {
+
+		if (isset($this->subscriptionInfo['lastmodified'])) {
+			return $this->subscriptionInfo['lastmodified'];
+		}
+
+	}
+
+	/**
+	 * Deletes the current node
+	 *
+	 * @return void
+	 */
+	public function delete() {
+
+		$this->caldavBackend->deleteSubscription(
+			$this->subscriptionInfo['id']
+		);
+
+	}
+
+	/**
+	 * Returns an array with all the child nodes
+	 *
+	 * @return DAV\INode[]
+	 */
+	public function getChildren() {
+
+		return [];
+
+	}
+
+	/**
+	 * Updates properties on this node.
+	 *
+	 * This method received a PropPatch object, which contains all the
+	 * information about the update.
+	 *
+	 * To update specific properties, call the 'handle' method on this object.
+	 * Read the PropPatch documentation for more information.
+	 *
+	 * @param PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch(PropPatch $propPatch) {
+
+		return $this->caldavBackend->updateSubscription(
+			$this->subscriptionInfo['id'],
+			$propPatch
+		);
+
+	}
+
+	/**
+	 * Returns a list of properties for this nodes.
+	 *
+	 * The properties list is a list of propertynames the client requested,
+	 * encoded in clark-notation {xmlnamespace}tagname.
+	 *
+	 * If the array is empty, it means 'all properties' were requested.
+	 *
+	 * Note that it's fine to liberally give properties back, instead of
+	 * conforming to the list of requested properties.
+	 * The Server class will filter out the extra.
+	 *
+	 * @param array $properties
+	 * @return void
+	 */
+	public function getProperties($properties) {
+
+		$r = [];
+
+		foreach ($properties as $prop) {
+
+			switch ($prop) {
+				case '{http://calendarserver.org/ns/}source' :
+					$r[$prop] = new Href($this->subscriptionInfo['source'], false);
+					break;
+				default :
+					if (array_key_exists($prop, $this->subscriptionInfo)) {
+						$r[$prop] = $this->subscriptionInfo[$prop];
+					}
+					break;
+			}
+
+		}
+
+		return $r;
+
+	}
+
+	/**
+	 * 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->subscriptionInfo['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->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}write',
+				'principal' => $this->getOwner(),
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}write',
+				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'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 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;
+
+	}
 
 }

Doc Comments -1 removed lines

@@ -38,7 +38,6 @@
      * Constructor
      *
      * @param SubscriptionSupport $caldavBackend
-     * @param array $calendarInfo
      */
     public function __construct(SubscriptionSupport $caldavBackend, array $subscriptionInfo) {
 

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

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

@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Filter;
 
-use Sabre\Xml\Reader;
-use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
 use Sabre\CalDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\VObject\DateTimeParser;
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * CalendarData parser.

Indentation +45 added lines, -45 removed lines

@@ -27,58 +27,58 @@
  */
 class CalendarData implements XmlDeserializable {
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
 
-        $result = [
-            'contentType' => $reader->getAttribute('content-type') ?: 'text/calendar',
-            'version'     => $reader->getAttribute('version') ?: '2.0',
-        ];
+		$result = [
+			'contentType' => $reader->getAttribute('content-type') ?: 'text/calendar',
+			'version'     => $reader->getAttribute('version') ?: '2.0',
+		];
 
-        $elems = (array)$reader->parseInnerTree();
-        foreach ($elems as $elem) {
+		$elems = (array)$reader->parseInnerTree();
+		foreach ($elems as $elem) {
 
-            switch ($elem['name']) {
-                case '{' . Plugin::NS_CALDAV . '}expand' :
+			switch ($elem['name']) {
+				case '{' . Plugin::NS_CALDAV . '}expand' :
 
-                    $result['expand'] = [
-                        'start' => isset($elem['attributes']['start']) ? DateTimeParser::parseDateTime($elem['attributes']['start']) : null,
-                        'end'   => isset($elem['attributes']['end']) ? DateTimeParser::parseDateTime($elem['attributes']['end']) : null,
-                    ];
+					$result['expand'] = [
+						'start' => isset($elem['attributes']['start']) ? DateTimeParser::parseDateTime($elem['attributes']['start']) : null,
+						'end'   => isset($elem['attributes']['end']) ? DateTimeParser::parseDateTime($elem['attributes']['end']) : null,
+					];
 
-                    if (!$result['expand']['start'] || !$result['expand']['end']) {
-                        throw new BadRequest('The "start" and "end" attributes are required when expanding calendar-data');
-                    }
-                    if ($result['expand']['end'] <= $result['expand']['start']) {
-                        throw new BadRequest('The end-date must be larger than the start-date when expanding calendar-data');
-                    }
-                    break;
-            }
+					if (!$result['expand']['start'] || !$result['expand']['end']) {
+						throw new BadRequest('The "start" and "end" attributes are required when expanding calendar-data');
+					}
+					if ($result['expand']['end'] <= $result['expand']['start']) {
+						throw new BadRequest('The end-date must be larger than the start-date when expanding calendar-data');
+					}
+					break;
+			}
 
-        }
+		}
 
-        return $result;
+		return $result;
 
-    }
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
             'version'     => $reader->getAttribute('version') ?: '2.0',
         ];
 
-        $elems = (array)$reader->parseInnerTree();
+        $elems = (array) $reader->parseInnerTree();
         foreach ($elems as $elem) {
 
             switch ($elem['name']) {

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

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

@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Filter;
 
-use Sabre\Xml\Reader;
-use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
 use Sabre\CalDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\VObject\DateTimeParser;
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * CompFilter parser.

Indentation +59 added lines, -59 removed lines

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

Braces +3 added lines, -1 removed lines

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

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

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

@@ -2,9 +2,9 @@
 
 namespace Sabre\CalDAV\Xml\Filter;
 
+use Sabre\CalDAV\Plugin;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\CalDAV\Plugin;
 
 /**
  * PropFilter parser.

Indentation +46 added lines, -46 removed lines

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

Braces +3 added lines, -1 removed lines

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