YetiForceCompany / YetiForceCRM

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

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/Property/Invite.php

Braces +3 added lines, -2 removed lines

@@ -192,8 +192,9 @@
 
         foreach ($reader->parseInnerTree() as $elem) {
 
-            if ($elem['name'] !== $cs . 'user')
-                continue;
+            if ($elem['name'] !== $cs . 'user') {
+                            continue;
+            }
 
             $user = [
                 'href'       => null,

Indentation +227 added lines, -227 removed lines

@@ -22,231 +22,231 @@
  */
 class Invite implements Element {
 
-    /**
-     * The list of users a calendar has been shared to.
-     *
-     * @var array
-     */
-    protected $users;
-
-    /**
-     * The organizer contains information about the person who shared the
-     * object.
-     *
-     * @var array
-     */
-    protected $organizer;
-
-    /**
-     * Creates the property.
-     *
-     * Users is an array. Each element of the array has the following
-     * properties:
-     *
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first and lastname for a user.
-     *   * status - One of the SharingPlugin::STATUS_* constants.
-     *   * readOnly - true or false
-     *   * summary - Optional, description of the share
-     *
-     * The organizer key is optional to specify. It's only useful when a
-     * 'sharee' requests the sharing information.
-     *
-     * The organizer may have the following properties:
-     *   * href - Often a mailto: address.
-     *   * commonName - Optional human-readable name.
-     *   * firstName - Optional first name.
-     *   * lastName - Optional last name.
-     *
-     * If you wonder why these two structures are so different, I guess a
-     * valid answer is that the current spec is still a draft.
-     *
-     * @param array $users
-     */
-    public function __construct(array $users, array $organizer = null) {
-
-        $this->users = $users;
-        $this->organizer = $organizer;
-
-    }
-
-    /**
-     * Returns the list of users, as it was passed to the constructor.
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->users;
-
-    }
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        $cs = '{' . Plugin::NS_CALENDARSERVER . '}';
-
-        if (!is_null($this->organizer)) {
-
-            $writer->startElement($cs . 'organizer');
-            $writer->writeElement('{DAV:}href', $this->organizer['href']);
-
-            if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
-                $writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
-            }
-            if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
-                $writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
-            }
-            if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
-                $writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
-            }
-            $writer->endElement(); // organizer
-
-        }
-
-        foreach ($this->users as $user) {
-
-            $writer->startElement($cs . 'user');
-            $writer->writeElement('{DAV:}href', $user['href']);
-            if (isset($user['commonName']) && $user['commonName']) {
-                $writer->writeElement($cs . 'common-name', $user['commonName']);
-            }
-            switch ($user['status']) {
-
-                case SharingPlugin::STATUS_ACCEPTED :
-                    $writer->writeElement($cs . 'invite-accepted');
-                    break;
-                case SharingPlugin::STATUS_DECLINED :
-                    $writer->writeElement($cs . 'invite-declined');
-                    break;
-                case SharingPlugin::STATUS_NORESPONSE :
-                    $writer->writeElement($cs . 'invite-noresponse');
-                    break;
-                case SharingPlugin::STATUS_INVALID :
-                    $writer->writeElement($cs . 'invite-invalid');
-                    break;
-            }
-
-            $writer->startElement($cs . 'access');
-            if ($user['readOnly']) {
-                $writer->writeElement($cs . 'read');
-            } else {
-                $writer->writeElement($cs . 'read-write');
-            }
-            $writer->endElement(); // access
-
-            if (isset($user['summary']) && $user['summary']) {
-                $writer->writeElement($cs . 'summary', $user['summary']);
-            }
-
-            $writer->endElement(); //user
-
-        }
-
-    }
-
-    /**
-     * 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) {
-
-        $cs = '{' . Plugin::NS_CALENDARSERVER . '}';
-
-        $users = [];
-
-        foreach ($reader->parseInnerTree() as $elem) {
-
-            if ($elem['name'] !== $cs . 'user')
-                continue;
-
-            $user = [
-                'href'       => null,
-                'commonName' => null,
-                'readOnly'   => null,
-                'summary'    => null,
-                'status'     => null,
-            ];
-
-            foreach ($elem['value'] as $userElem) {
-
-                switch ($userElem['name']) {
-                    case $cs . 'invite-accepted' :
-                        $user['status'] = SharingPlugin::STATUS_ACCEPTED;
-                        break;
-                    case $cs . 'invite-declined' :
-                        $user['status'] = SharingPlugin::STATUS_DECLINED;
-                        break;
-                    case $cs . 'invite-noresponse' :
-                        $user['status'] = SharingPlugin::STATUS_NORESPONSE;
-                        break;
-                    case $cs . 'invite-invalid' :
-                        $user['status'] = SharingPlugin::STATUS_INVALID;
-                        break;
-                    case '{DAV:}href' :
-                        $user['href'] = $userElem['value'];
-                        break;
-                    case $cs . 'common-name' :
-                        $user['commonName'] = $userElem['value'];
-                        break;
-                    case $cs . 'access' :
-                        foreach ($userElem['value'] as $accessHref) {
-                            if ($accessHref['name'] === $cs . 'read') {
-                                $user['readOnly'] = true;
-                            }
-                        }
-                        break;
-                    case $cs . 'summary' :
-                        $user['summary'] = $userElem['value'];
-                        break;
-
-                }
-
-            }
-            if (!$user['status']) {
-                throw new \InvalidArgumentException('Every user must have one of cs:invite-accepted, cs:invite-declined, cs:invite-noresponse or cs:invite-invalid');
-            }
-
-            $users[] = $user;
-
-        }
-
-        return new self($users);
-
-    }
+	/**
+	 * The list of users a calendar has been shared to.
+	 *
+	 * @var array
+	 */
+	protected $users;
+
+	/**
+	 * The organizer contains information about the person who shared the
+	 * object.
+	 *
+	 * @var array
+	 */
+	protected $organizer;
+
+	/**
+	 * Creates the property.
+	 *
+	 * Users is an array. Each element of the array has the following
+	 * properties:
+	 *
+	 *   * href - Often a mailto: address
+	 *   * commonName - Optional, for example a first and lastname for a user.
+	 *   * status - One of the SharingPlugin::STATUS_* constants.
+	 *   * readOnly - true or false
+	 *   * summary - Optional, description of the share
+	 *
+	 * The organizer key is optional to specify. It's only useful when a
+	 * 'sharee' requests the sharing information.
+	 *
+	 * The organizer may have the following properties:
+	 *   * href - Often a mailto: address.
+	 *   * commonName - Optional human-readable name.
+	 *   * firstName - Optional first name.
+	 *   * lastName - Optional last name.
+	 *
+	 * If you wonder why these two structures are so different, I guess a
+	 * valid answer is that the current spec is still a draft.
+	 *
+	 * @param array $users
+	 */
+	public function __construct(array $users, array $organizer = null) {
+
+		$this->users = $users;
+		$this->organizer = $organizer;
+
+	}
+
+	/**
+	 * Returns the list of users, as it was passed to the constructor.
+	 *
+	 * @return array
+	 */
+	public function getValue() {
+
+		return $this->users;
+
+	}
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		$cs = '{' . Plugin::NS_CALENDARSERVER . '}';
+
+		if (!is_null($this->organizer)) {
+
+			$writer->startElement($cs . 'organizer');
+			$writer->writeElement('{DAV:}href', $this->organizer['href']);
+
+			if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
+				$writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
+			}
+			if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
+				$writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
+			}
+			if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
+				$writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
+			}
+			$writer->endElement(); // organizer
+
+		}
+
+		foreach ($this->users as $user) {
+
+			$writer->startElement($cs . 'user');
+			$writer->writeElement('{DAV:}href', $user['href']);
+			if (isset($user['commonName']) && $user['commonName']) {
+				$writer->writeElement($cs . 'common-name', $user['commonName']);
+			}
+			switch ($user['status']) {
+
+				case SharingPlugin::STATUS_ACCEPTED :
+					$writer->writeElement($cs . 'invite-accepted');
+					break;
+				case SharingPlugin::STATUS_DECLINED :
+					$writer->writeElement($cs . 'invite-declined');
+					break;
+				case SharingPlugin::STATUS_NORESPONSE :
+					$writer->writeElement($cs . 'invite-noresponse');
+					break;
+				case SharingPlugin::STATUS_INVALID :
+					$writer->writeElement($cs . 'invite-invalid');
+					break;
+			}
+
+			$writer->startElement($cs . 'access');
+			if ($user['readOnly']) {
+				$writer->writeElement($cs . 'read');
+			} else {
+				$writer->writeElement($cs . 'read-write');
+			}
+			$writer->endElement(); // access
+
+			if (isset($user['summary']) && $user['summary']) {
+				$writer->writeElement($cs . 'summary', $user['summary']);
+			}
+
+			$writer->endElement(); //user
+
+		}
+
+	}
+
+	/**
+	 * 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) {
+
+		$cs = '{' . Plugin::NS_CALENDARSERVER . '}';
+
+		$users = [];
+
+		foreach ($reader->parseInnerTree() as $elem) {
+
+			if ($elem['name'] !== $cs . 'user')
+				continue;
+
+			$user = [
+				'href'       => null,
+				'commonName' => null,
+				'readOnly'   => null,
+				'summary'    => null,
+				'status'     => null,
+			];
+
+			foreach ($elem['value'] as $userElem) {
+
+				switch ($userElem['name']) {
+					case $cs . 'invite-accepted' :
+						$user['status'] = SharingPlugin::STATUS_ACCEPTED;
+						break;
+					case $cs . 'invite-declined' :
+						$user['status'] = SharingPlugin::STATUS_DECLINED;
+						break;
+					case $cs . 'invite-noresponse' :
+						$user['status'] = SharingPlugin::STATUS_NORESPONSE;
+						break;
+					case $cs . 'invite-invalid' :
+						$user['status'] = SharingPlugin::STATUS_INVALID;
+						break;
+					case '{DAV:}href' :
+						$user['href'] = $userElem['value'];
+						break;
+					case $cs . 'common-name' :
+						$user['commonName'] = $userElem['value'];
+						break;
+					case $cs . 'access' :
+						foreach ($userElem['value'] as $accessHref) {
+							if ($accessHref['name'] === $cs . 'read') {
+								$user['readOnly'] = true;
+							}
+						}
+						break;
+					case $cs . 'summary' :
+						$user['summary'] = $userElem['value'];
+						break;
+
+				}
+
+			}
+			if (!$user['status']) {
+				throw new \InvalidArgumentException('Every user must have one of cs:invite-accepted, cs:invite-declined, cs:invite-noresponse or cs:invite-invalid');
+			}
+
+			$users[] = $user;
+
+		}
+
+		return new self($users);
+
+	}
 }

libraries/SabreDAV/CalDAV/Xml/Property/SupportedCalendarComponentSet.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 
         $components = [];
 
-        foreach ((array)$elems as $elem) {
+        foreach ((array) $elems as $elem) {
             if ($elem['name'] === '{' . Plugin::NS_CALDAV . '}comp') {
                 $components[] = $elem['attributes']['name'];
             }

Indentation +102 added lines, -102 removed lines

@@ -23,107 +23,107 @@
  */
 class SupportedCalendarComponentSet implements Element {
 
-    /**
-     * List of supported components.
-     *
-     * This array will contain values such as VEVENT, VTODO and VJOURNAL.
-     *
-     * @var array
-     */
-    protected $components = [];
-
-    /**
-     * Creates the property.
-     *
-     * @param array $components
-     */
-    public function __construct(array $components) {
-
-        $this->components = $components;
-
-    }
-
-    /**
-     * Returns the list of supported components
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->components;
-
-    }
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        foreach ($this->components as $component) {
-
-            $writer->startElement('{' . Plugin::NS_CALDAV . '}comp');
-            $writer->writeAttributes(['name' => $component]);
-            $writer->endElement();
-
-        }
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $elems = $reader->parseInnerTree();
-
-        $components = [];
-
-        foreach ((array)$elems as $elem) {
-            if ($elem['name'] === '{' . Plugin::NS_CALDAV . '}comp') {
-                $components[] = $elem['attributes']['name'];
-            }
-        }
-
-        if (!$components) {
-            throw new ParseException('supported-calendar-component-set must have at least one CALDAV:comp element');
-        }
-
-        return new self($components);
-
-    }
+	/**
+	 * List of supported components.
+	 *
+	 * This array will contain values such as VEVENT, VTODO and VJOURNAL.
+	 *
+	 * @var array
+	 */
+	protected $components = [];
+
+	/**
+	 * Creates the property.
+	 *
+	 * @param array $components
+	 */
+	public function __construct(array $components) {
+
+		$this->components = $components;
+
+	}
+
+	/**
+	 * Returns the list of supported components
+	 *
+	 * @return array
+	 */
+	public function getValue() {
+
+		return $this->components;
+
+	}
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		foreach ($this->components as $component) {
+
+			$writer->startElement('{' . Plugin::NS_CALDAV . '}comp');
+			$writer->writeAttributes(['name' => $component]);
+			$writer->endElement();
+
+		}
+
+	}
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$elems = $reader->parseInnerTree();
+
+		$components = [];
+
+		foreach ((array)$elems as $elem) {
+			if ($elem['name'] === '{' . Plugin::NS_CALDAV . '}comp') {
+				$components[] = $elem['attributes']['name'];
+			}
+		}
+
+		if (!$components) {
+			throw new ParseException('supported-calendar-component-set must have at least one CALDAV:comp element');
+		}
+
+		return new self($components);
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Xml/Property/ScheduleCalendarTransp.php

Braces +3 added lines, -2 removed lines

@@ -130,8 +130,9 @@
                     break;
             }
         }
-        if (is_null($value))
-           return null;
+        if (is_null($value)) {
+                   return null;
+        }
 
         return new self($value);
 

Indentation +110 added lines, -110 removed lines

@@ -26,115 +26,115 @@
  */
 class ScheduleCalendarTransp implements Element {
 
-    const TRANSPARENT = 'transparent';
-    const OPAQUE = 'opaque';
-
-    /**
-     * value
-     *
-     * @var string
-     */
-    protected $value;
-
-    /**
-     * Creates the property
-     *
-     * @param string $value
-     */
-    public function __construct($value) {
-
-        if ($value !== self::TRANSPARENT && $value !== self::OPAQUE) {
-            throw new \InvalidArgumentException('The value must either be specified as "transparent" or "opaque"');
-        }
-        $this->value = $value;
-
-    }
-
-    /**
-     * Returns the current value
-     *
-     * @return string
-     */
-    public function getValue() {
-
-        return $this->value;
-
-    }
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        switch ($this->value) {
-            case self::TRANSPARENT :
-                $writer->writeElement('{' . Plugin::NS_CALDAV . '}transparent');
-                break;
-            case self::OPAQUE :
-                $writer->writeElement('{' . Plugin::NS_CALDAV . '}opaque');
-                break;
-        }
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $elems = Elements::xmlDeserialize($reader);
-
-        $value = null;
-
-        foreach ($elems as $elem) {
-            switch ($elem) {
-                case '{' . Plugin::NS_CALDAV . '}opaque' :
-                    $value = self::OPAQUE;
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}transparent' :
-                    $value = self::TRANSPARENT;
-                    break;
-            }
-        }
-        if (is_null($value))
-           return null;
-
-        return new self($value);
-
-    }
+	const TRANSPARENT = 'transparent';
+	const OPAQUE = 'opaque';
+
+	/**
+	 * value
+	 *
+	 * @var string
+	 */
+	protected $value;
+
+	/**
+	 * Creates the property
+	 *
+	 * @param string $value
+	 */
+	public function __construct($value) {
+
+		if ($value !== self::TRANSPARENT && $value !== self::OPAQUE) {
+			throw new \InvalidArgumentException('The value must either be specified as "transparent" or "opaque"');
+		}
+		$this->value = $value;
+
+	}
+
+	/**
+	 * Returns the current value
+	 *
+	 * @return string
+	 */
+	public function getValue() {
+
+		return $this->value;
+
+	}
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		switch ($this->value) {
+			case self::TRANSPARENT :
+				$writer->writeElement('{' . Plugin::NS_CALDAV . '}transparent');
+				break;
+			case self::OPAQUE :
+				$writer->writeElement('{' . Plugin::NS_CALDAV . '}opaque');
+				break;
+		}
+
+	}
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$elems = Elements::xmlDeserialize($reader);
+
+		$value = null;
+
+		foreach ($elems as $elem) {
+			switch ($elem) {
+				case '{' . Plugin::NS_CALDAV . '}opaque' :
+					$value = self::OPAQUE;
+					break;
+				case '{' . Plugin::NS_CALDAV . '}transparent' :
+					$value = self::TRANSPARENT;
+					break;
+			}
+		}
+		if (is_null($value))
+		   return null;
+
+		return new self($value);
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Schedule/IMipPlugin.php

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/HTTP/Auth/AWS.php

Braces +6 added lines, -4 removed lines

@@ -101,11 +101,13 @@
 
         }
 
-        if (!$requestDate = $this->request->getHeader('x-amz-date'))
-            $requestDate = $this->request->getHeader('Date');
+        if (!$requestDate = $this->request->getHeader('x-amz-date')) {
+                    $requestDate = $this->request->getHeader('Date');
+        }
 
-        if (!$this->validateRFC2616Date($requestDate))
-            return false;
+        if (!$this->validateRFC2616Date($requestDate)) {
+                    return false;
+        }
 
         $amzHeaders = $this->getAmzHeaders();
 

Indentation +215 added lines, -215 removed lines

@@ -15,220 +15,220 @@
  */
 class AWS extends AbstractAuth {
 
-    /**
-     * The signature supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $signature = null;
-
-    /**
-     * The accesskey supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $accessKey = null;
-
-    /**
-     * An error code, if any
-     *
-     * This value will be filled with one of the ERR_* constants
-     *
-     * @var int
-     */
-    public $errorCode = 0;
-
-    const ERR_NOAWSHEADER = 1;
-    const ERR_MD5CHECKSUMWRONG = 2;
-    const ERR_INVALIDDATEFORMAT = 3;
-    const ERR_REQUESTTIMESKEWED = 4;
-    const ERR_INVALIDSIGNATURE = 5;
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return bool
-     */
-    public function init() {
-
-        $authHeader = $this->request->getHeader('Authorization');
-        $authHeader = explode(' ', $authHeader);
-
-        if ($authHeader[0] != 'AWS' || !isset($authHeader[1])) {
-            $this->errorCode = self::ERR_NOAWSHEADER;
-             return false;
-        }
-
-        list($this->accessKey, $this->signature) = explode(':', $authHeader[1]);
-
-        return true;
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getAccessKey() {
-
-        return $this->accessKey;
-
-    }
-
-    /**
-     * Validates the signature based on the secretKey
-     *
-     * @param string $secretKey
-     * @return bool
-     */
-    public function validate($secretKey) {
-
-        $contentMD5 = $this->request->getHeader('Content-MD5');
-
-        if ($contentMD5) {
-            // We need to validate the integrity of the request
-            $body = $this->request->getBody();
-            $this->request->setBody($body);
-
-            if ($contentMD5 != base64_encode(md5($body, true))) {
-                // content-md5 header did not match md5 signature of body
-                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
-                return false;
-            }
-
-        }
-
-        if (!$requestDate = $this->request->getHeader('x-amz-date'))
-            $requestDate = $this->request->getHeader('Date');
-
-        if (!$this->validateRFC2616Date($requestDate))
-            return false;
-
-        $amzHeaders = $this->getAmzHeaders();
-
-        $signature = base64_encode(
-            $this->hmacsha1($secretKey,
-                $this->request->getMethod() . "\n" .
-                $contentMD5 . "\n" .
-                $this->request->getHeader('Content-type') . "\n" .
-                $requestDate . "\n" .
-                $amzHeaders .
-                $this->request->getUrl()
-            )
-        );
-
-        if ($this->signature != $signature) {
-
-            $this->errorCode = self::ERR_INVALIDSIGNATURE;
-            return false;
-
-        }
-
-        return true;
-
-    }
-
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->response->addHeader('WWW-Authenticate', 'AWS');
-        $this->response->setStatus(401);
-
-    }
-
-    /**
-     * Makes sure the supplied value is a valid RFC2616 date.
-     *
-     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
-     * user just supplied the word 'now' for the date header.
-     *
-     * This function also makes sure the Date header is within 15 minutes of the operating
-     * system date, to prevent replay attacks.
-     *
-     * @param string $dateHeader
-     * @return bool
-     */
-    protected function validateRFC2616Date($dateHeader) {
-
-        $date = Util::parseHTTPDate($dateHeader);
-
-        // Unknown format
-        if (!$date) {
-            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
-            return false;
-        }
-
-        $min = new \DateTime('-15 minutes');
-        $max = new \DateTime('+15 minutes');
-
-        // We allow 15 minutes around the current date/time
-        if ($date > $max || $date < $min) {
-            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
-            return false;
-        }
-
-        return $date;
-
-    }
-
-    /**
-     * Returns a list of AMZ headers
-     *
-     * @return string
-     */
-    protected function getAmzHeaders() {
-
-        $amzHeaders = [];
-        $headers = $this->request->getHeaders();
-        foreach ($headers as $headerName => $headerValue) {
-            if (strpos(strtolower($headerName), 'x-amz-') === 0) {
-                $amzHeaders[strtolower($headerName)] = str_replace(["\r\n"], [' '], $headerValue[0]) . "\n";
-            }
-        }
-        ksort($amzHeaders);
-
-        $headerStr = '';
-        foreach ($amzHeaders as $h => $v) {
-            $headerStr .= $h . ':' . $v;
-        }
-
-        return $headerStr;
-
-    }
-
-    /**
-     * Generates an HMAC-SHA1 signature
-     *
-     * @param string $key
-     * @param string $message
-     * @return string
-     */
-    private function hmacsha1($key, $message) {
-
-        if (function_exists('hash_hmac')) {
-            return hash_hmac('sha1', $message, $key, true);
-        }
-
-        $blocksize = 64;
-        if (strlen($key) > $blocksize) {
-            $key = pack('H*', sha1($key));
-        }
-        $key = str_pad($key, $blocksize, chr(0x00));
-        $ipad = str_repeat(chr(0x36), $blocksize);
-        $opad = str_repeat(chr(0x5c), $blocksize);
-        $hmac = pack('H*', sha1(($key ^ $opad) . pack('H*', sha1(($key ^ $ipad) . $message))));
-        return $hmac;
-
-    }
+	/**
+	 * The signature supplied by the HTTP client
+	 *
+	 * @var string
+	 */
+	private $signature = null;
+
+	/**
+	 * The accesskey supplied by the HTTP client
+	 *
+	 * @var string
+	 */
+	private $accessKey = null;
+
+	/**
+	 * An error code, if any
+	 *
+	 * This value will be filled with one of the ERR_* constants
+	 *
+	 * @var int
+	 */
+	public $errorCode = 0;
+
+	const ERR_NOAWSHEADER = 1;
+	const ERR_MD5CHECKSUMWRONG = 2;
+	const ERR_INVALIDDATEFORMAT = 3;
+	const ERR_REQUESTTIMESKEWED = 4;
+	const ERR_INVALIDSIGNATURE = 5;
+
+	/**
+	 * Gathers all information from the headers
+	 *
+	 * This method needs to be called prior to anything else.
+	 *
+	 * @return bool
+	 */
+	public function init() {
+
+		$authHeader = $this->request->getHeader('Authorization');
+		$authHeader = explode(' ', $authHeader);
+
+		if ($authHeader[0] != 'AWS' || !isset($authHeader[1])) {
+			$this->errorCode = self::ERR_NOAWSHEADER;
+			 return false;
+		}
+
+		list($this->accessKey, $this->signature) = explode(':', $authHeader[1]);
+
+		return true;
+
+	}
+
+	/**
+	 * Returns the username for the request
+	 *
+	 * @return string
+	 */
+	public function getAccessKey() {
+
+		return $this->accessKey;
+
+	}
+
+	/**
+	 * Validates the signature based on the secretKey
+	 *
+	 * @param string $secretKey
+	 * @return bool
+	 */
+	public function validate($secretKey) {
+
+		$contentMD5 = $this->request->getHeader('Content-MD5');
+
+		if ($contentMD5) {
+			// We need to validate the integrity of the request
+			$body = $this->request->getBody();
+			$this->request->setBody($body);
+
+			if ($contentMD5 != base64_encode(md5($body, true))) {
+				// content-md5 header did not match md5 signature of body
+				$this->errorCode = self::ERR_MD5CHECKSUMWRONG;
+				return false;
+			}
+
+		}
+
+		if (!$requestDate = $this->request->getHeader('x-amz-date'))
+			$requestDate = $this->request->getHeader('Date');
+
+		if (!$this->validateRFC2616Date($requestDate))
+			return false;
+
+		$amzHeaders = $this->getAmzHeaders();
+
+		$signature = base64_encode(
+			$this->hmacsha1($secretKey,
+				$this->request->getMethod() . "\n" .
+				$contentMD5 . "\n" .
+				$this->request->getHeader('Content-type') . "\n" .
+				$requestDate . "\n" .
+				$amzHeaders .
+				$this->request->getUrl()
+			)
+		);
+
+		if ($this->signature != $signature) {
+
+			$this->errorCode = self::ERR_INVALIDSIGNATURE;
+			return false;
+
+		}
+
+		return true;
+
+	}
+
+
+	/**
+	 * Returns an HTTP 401 header, forcing login
+	 *
+	 * This should be called when username and password are incorrect, or not supplied at all
+	 *
+	 * @return void
+	 */
+	public function requireLogin() {
+
+		$this->response->addHeader('WWW-Authenticate', 'AWS');
+		$this->response->setStatus(401);
+
+	}
+
+	/**
+	 * Makes sure the supplied value is a valid RFC2616 date.
+	 *
+	 * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
+	 * user just supplied the word 'now' for the date header.
+	 *
+	 * This function also makes sure the Date header is within 15 minutes of the operating
+	 * system date, to prevent replay attacks.
+	 *
+	 * @param string $dateHeader
+	 * @return bool
+	 */
+	protected function validateRFC2616Date($dateHeader) {
+
+		$date = Util::parseHTTPDate($dateHeader);
+
+		// Unknown format
+		if (!$date) {
+			$this->errorCode = self::ERR_INVALIDDATEFORMAT;
+			return false;
+		}
+
+		$min = new \DateTime('-15 minutes');
+		$max = new \DateTime('+15 minutes');
+
+		// We allow 15 minutes around the current date/time
+		if ($date > $max || $date < $min) {
+			$this->errorCode = self::ERR_REQUESTTIMESKEWED;
+			return false;
+		}
+
+		return $date;
+
+	}
+
+	/**
+	 * Returns a list of AMZ headers
+	 *
+	 * @return string
+	 */
+	protected function getAmzHeaders() {
+
+		$amzHeaders = [];
+		$headers = $this->request->getHeaders();
+		foreach ($headers as $headerName => $headerValue) {
+			if (strpos(strtolower($headerName), 'x-amz-') === 0) {
+				$amzHeaders[strtolower($headerName)] = str_replace(["\r\n"], [' '], $headerValue[0]) . "\n";
+			}
+		}
+		ksort($amzHeaders);
+
+		$headerStr = '';
+		foreach ($amzHeaders as $h => $v) {
+			$headerStr .= $h . ':' . $v;
+		}
+
+		return $headerStr;
+
+	}
+
+	/**
+	 * Generates an HMAC-SHA1 signature
+	 *
+	 * @param string $key
+	 * @param string $message
+	 * @return string
+	 */
+	private function hmacsha1($key, $message) {
+
+		if (function_exists('hash_hmac')) {
+			return hash_hmac('sha1', $message, $key, true);
+		}
+
+		$blocksize = 64;
+		if (strlen($key) > $blocksize) {
+			$key = pack('H*', sha1($key));
+		}
+		$key = str_pad($key, $blocksize, chr(0x00));
+		$ipad = str_repeat(chr(0x36), $blocksize);
+		$opad = str_repeat(chr(0x5c), $blocksize);
+		$hmac = pack('H*', sha1(($key ^ $opad) . pack('H*', sha1(($key ^ $ipad) . $message))));
+		return $hmac;
+
+	}
 
 }

libraries/SabreDAV/HTTP/Auth/Digest.php

Braces +6 added lines, -2 removed lines

@@ -139,7 +139,9 @@ 
 
         if ($this->digestParts['qop'] == 'auth-int') {
             // Making sure we support this qop value
-            if (!($this->qop & self::QOP_AUTHINT)) return false;
+            if (!($this->qop & self::QOP_AUTHINT)) {
+            	return false;
+            }
             // We need to add an md5 of the entire request body to the A2 part of the hash
             $body = $this->request->getBody($asString = true);
             $this->request->setBody($body);
@@ -147,7 +149,9 @@ 
         } else {
 
             // We need to make sure we support this qop value
-            if (!($this->qop & self::QOP_AUTH)) return false;
+            if (!($this->qop & self::QOP_AUTH)) {
+            	return false;
+            }
         }
 
         $A2 = md5($A2);

Indentation +193 added lines, -193 removed lines

@@ -29,203 +29,203 @@
  */
 class Digest extends AbstractAuth {
 
-    /**
-     * These constants are used in setQOP();
-     */
-    const QOP_AUTH = 1;
-    const QOP_AUTHINT = 2;
-
-    protected $nonce;
-    protected $opaque;
-    protected $digestParts;
-    protected $A1;
-    protected $qop = self::QOP_AUTH;
-
-    /**
-     * Initializes the object
-     */
-    public function __construct($realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response) {
-
-        $this->nonce = uniqid();
-        $this->opaque = md5($realm);
-        parent::__construct($realm, $request, $response);
-
-    }
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return void
-     */
-    public function init() {
-
-        $digest = $this->getDigest();
-        $this->digestParts = $this->parseDigest($digest);
-
-    }
-
-    /**
-     * Sets the quality of protection value.
-     *
-     * Possible values are:
-     *   Sabre\HTTP\DigestAuth::QOP_AUTH
-     *   Sabre\HTTP\DigestAuth::QOP_AUTHINT
-     *
-     * Multiple values can be specified using logical OR.
-     *
-     * QOP_AUTHINT ensures integrity of the request body, but this is not
-     * supported by most HTTP clients. QOP_AUTHINT also requires the entire
-     * request body to be md5'ed, which can put strains on CPU and memory.
-     *
-     * @param int $qop
-     * @return void
-     */
-    public function setQOP($qop) {
-
-        $this->qop = $qop;
-
-    }
-
-    /**
-     * Validates the user.
-     *
-     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
-     *
-     * @param string $A1
-     * @return bool
-     */
-    public function validateA1($A1) {
-
-        $this->A1 = $A1;
-        return $this->validate();
-
-    }
-
-    /**
-     * Validates authentication through a password. The actual password must be provided here.
-     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
-     *
-     * @param string $password
-     * @return bool
-     */
-    public function validatePassword($password) {
-
-        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
-        return $this->validate();
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getUsername() {
-
-        return $this->digestParts['username'];
-
-    }
-
-    /**
-     * Validates the digest challenge
-     *
-     * @return bool
-     */
-    protected function validate() {
-
-        $A2 = $this->request->getMethod() . ':' . $this->digestParts['uri'];
-
-        if ($this->digestParts['qop'] == 'auth-int') {
-            // Making sure we support this qop value
-            if (!($this->qop & self::QOP_AUTHINT)) return false;
-            // We need to add an md5 of the entire request body to the A2 part of the hash
-            $body = $this->request->getBody($asString = true);
-            $this->request->setBody($body);
-            $A2 .= ':' . md5($body);
-        } else {
-
-            // We need to make sure we support this qop value
-            if (!($this->qop & self::QOP_AUTH)) return false;
-        }
-
-        $A2 = md5($A2);
-
-        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
-
-        return $this->digestParts['response'] == $validResponse;
-
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $qop = '';
-        switch ($this->qop) {
-            case self::QOP_AUTH    :
-                $qop = 'auth';
-                break;
-            case self::QOP_AUTHINT :
-                $qop = 'auth-int';
-                break;
-            case self::QOP_AUTH | self::QOP_AUTHINT :
-                $qop = 'auth,auth-int';
-                break;
-        }
-
-        $this->response->addHeader('WWW-Authenticate', 'Digest realm="' . $this->realm . '",qop="' . $qop . '",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
-        $this->response->setStatus(401);
-
-    }
-
-
-    /**
-     * This method returns the full digest string.
-     *
-     * It should be compatibile with mod_php format and other webservers.
-     *
-     * If the header could not be found, null will be returned
-     *
-     * @return mixed
-     */
-    public function getDigest() {
+	/**
+	 * These constants are used in setQOP();
+	 */
+	const QOP_AUTH = 1;
+	const QOP_AUTHINT = 2;
+
+	protected $nonce;
+	protected $opaque;
+	protected $digestParts;
+	protected $A1;
+	protected $qop = self::QOP_AUTH;
+
+	/**
+	 * Initializes the object
+	 */
+	public function __construct($realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response) {
+
+		$this->nonce = uniqid();
+		$this->opaque = md5($realm);
+		parent::__construct($realm, $request, $response);
+
+	}
+
+	/**
+	 * Gathers all information from the headers
+	 *
+	 * This method needs to be called prior to anything else.
+	 *
+	 * @return void
+	 */
+	public function init() {
+
+		$digest = $this->getDigest();
+		$this->digestParts = $this->parseDigest($digest);
+
+	}
+
+	/**
+	 * Sets the quality of protection value.
+	 *
+	 * Possible values are:
+	 *   Sabre\HTTP\DigestAuth::QOP_AUTH
+	 *   Sabre\HTTP\DigestAuth::QOP_AUTHINT
+	 *
+	 * Multiple values can be specified using logical OR.
+	 *
+	 * QOP_AUTHINT ensures integrity of the request body, but this is not
+	 * supported by most HTTP clients. QOP_AUTHINT also requires the entire
+	 * request body to be md5'ed, which can put strains on CPU and memory.
+	 *
+	 * @param int $qop
+	 * @return void
+	 */
+	public function setQOP($qop) {
+
+		$this->qop = $qop;
+
+	}
+
+	/**
+	 * Validates the user.
+	 *
+	 * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
+	 *
+	 * @param string $A1
+	 * @return bool
+	 */
+	public function validateA1($A1) {
+
+		$this->A1 = $A1;
+		return $this->validate();
+
+	}
+
+	/**
+	 * Validates authentication through a password. The actual password must be provided here.
+	 * It is strongly recommended not store the password in plain-text and use validateA1 instead.
+	 *
+	 * @param string $password
+	 * @return bool
+	 */
+	public function validatePassword($password) {
+
+		$this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
+		return $this->validate();
+
+	}
+
+	/**
+	 * Returns the username for the request
+	 *
+	 * @return string
+	 */
+	public function getUsername() {
+
+		return $this->digestParts['username'];
+
+	}
+
+	/**
+	 * Validates the digest challenge
+	 *
+	 * @return bool
+	 */
+	protected function validate() {
+
+		$A2 = $this->request->getMethod() . ':' . $this->digestParts['uri'];
+
+		if ($this->digestParts['qop'] == 'auth-int') {
+			// Making sure we support this qop value
+			if (!($this->qop & self::QOP_AUTHINT)) return false;
+			// We need to add an md5 of the entire request body to the A2 part of the hash
+			$body = $this->request->getBody($asString = true);
+			$this->request->setBody($body);
+			$A2 .= ':' . md5($body);
+		} else {
+
+			// We need to make sure we support this qop value
+			if (!($this->qop & self::QOP_AUTH)) return false;
+		}
+
+		$A2 = md5($A2);
+
+		$validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
+
+		return $this->digestParts['response'] == $validResponse;
+
+
+	}
+
+	/**
+	 * Returns an HTTP 401 header, forcing login
+	 *
+	 * This should be called when username and password are incorrect, or not supplied at all
+	 *
+	 * @return void
+	 */
+	public function requireLogin() {
+
+		$qop = '';
+		switch ($this->qop) {
+			case self::QOP_AUTH    :
+				$qop = 'auth';
+				break;
+			case self::QOP_AUTHINT :
+				$qop = 'auth-int';
+				break;
+			case self::QOP_AUTH | self::QOP_AUTHINT :
+				$qop = 'auth,auth-int';
+				break;
+		}
+
+		$this->response->addHeader('WWW-Authenticate', 'Digest realm="' . $this->realm . '",qop="' . $qop . '",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
+		$this->response->setStatus(401);
+
+	}
+
+
+	/**
+	 * This method returns the full digest string.
+	 *
+	 * It should be compatibile with mod_php format and other webservers.
+	 *
+	 * If the header could not be found, null will be returned
+	 *
+	 * @return mixed
+	 */
+	public function getDigest() {
 
-        return $this->request->getHeader('Authorization');
-
-    }
-
-
-    /**
-     * Parses the different pieces of the digest string into an array.
-     *
-     * This method returns false if an incomplete digest was supplied
-     *
-     * @param string $digest
-     * @return mixed
-     */
-    protected function parseDigest($digest) {
+		return $this->request->getHeader('Authorization');
+
+	}
+
+
+	/**
+	 * Parses the different pieces of the digest string into an array.
+	 *
+	 * This method returns false if an incomplete digest was supplied
+	 *
+	 * @param string $digest
+	 * @return mixed
+	 */
+	protected function parseDigest($digest) {
 
-        // protect against missing data
-        $needed_parts = ['nonce' => 1, 'nc' => 1, 'cnonce' => 1, 'qop' => 1, 'username' => 1, 'uri' => 1, 'response' => 1];
-        $data = [];
+		// protect against missing data
+		$needed_parts = ['nonce' => 1, 'nc' => 1, 'cnonce' => 1, 'qop' => 1, 'username' => 1, 'uri' => 1, 'response' => 1];
+		$data = [];
 
-        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $m) {
-            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
-            unset($needed_parts[$m[1]]);
-        }
+		preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
+
+		foreach ($matches as $m) {
+			$data[$m[1]] = $m[2] ? $m[2] : $m[3];
+			unset($needed_parts[$m[1]]);
+		}
 
-        return $needed_parts ? false : $data;
+		return $needed_parts ? false : $data;
 
-    }
+	}
 
 }

libraries/SabreDAV/HTTP/Version.php

Indentation +4 added lines, -4 removed lines

@@ -11,9 +11,9 @@
  */
 class Version {
 
-    /**
-     * Full version number
-     */
-    const VERSION = '4.2.1';
+	/**
+	 * Full version number
+	 */
+	const VERSION = '4.2.1';
 
 }

libraries/SabreDAV/HTTP/Util.php

Indentation +47 added lines, -47 removed lines

@@ -13,62 +13,62 @@
  */
 class Util {
 
-    /**
-     * Content negotiation
-     *
-     * @deprecated Use \Sabre\HTTP\negotiateContentType
-     * @param string|null $acceptHeaderValue
-     * @param array $availableOptions
-     * @return string|null
-     */
-    static function negotiateContentType($acceptHeaderValue, array $availableOptions) {
+	/**
+	 * Content negotiation
+	 *
+	 * @deprecated Use \Sabre\HTTP\negotiateContentType
+	 * @param string|null $acceptHeaderValue
+	 * @param array $availableOptions
+	 * @return string|null
+	 */
+	static function negotiateContentType($acceptHeaderValue, array $availableOptions) {
 
-        return negotiateContentType($acceptHeaderValue, $availableOptions);
+		return negotiateContentType($acceptHeaderValue, $availableOptions);
 
-    }
+	}
 
-    /**
-     * Deprecated! Use negotiateContentType.
-     *
-     * @deprecated Use \Sabre\HTTP\NegotiateContentType
-     * @param string|null $acceptHeader
-     * @param array $availableOptions
-     * @return string|null
-     */
-    static function negotiate($acceptHeaderValue, array $availableOptions) {
+	/**
+	 * Deprecated! Use negotiateContentType.
+	 *
+	 * @deprecated Use \Sabre\HTTP\NegotiateContentType
+	 * @param string|null $acceptHeader
+	 * @param array $availableOptions
+	 * @return string|null
+	 */
+	static function negotiate($acceptHeaderValue, array $availableOptions) {
 
-        return negotiateContentType($acceptHeaderValue, $availableOptions);
+		return negotiateContentType($acceptHeaderValue, $availableOptions);
 
-    }
+	}
 
-    /**
-     * Parses a RFC2616-compatible date string
-     *
-     * This method returns false if the date is invalid
-     *
-     * @deprecated Use parseDate
-     * @param string $dateHeader
-     * @return bool|DateTime
-     */
-    static function parseHTTPDate($dateHeader) {
+	/**
+	 * Parses a RFC2616-compatible date string
+	 *
+	 * This method returns false if the date is invalid
+	 *
+	 * @deprecated Use parseDate
+	 * @param string $dateHeader
+	 * @return bool|DateTime
+	 */
+	static function parseHTTPDate($dateHeader) {
 
-        return parseDate($dateHeader);
+		return parseDate($dateHeader);
 
-    }
+	}
 
-    /**
-     * Transforms a DateTime object to HTTP's most common date format.
-     *
-     * We're serializing it as the RFC 1123 date, which, for HTTP must be
-     * specified as GMT.
-     *
-     * @deprecated Use toDate
-     * @param \DateTime $dateTime
-     * @return string
-     */
-    static function toHTTPDate(\DateTime $dateTime) {
+	/**
+	 * Transforms a DateTime object to HTTP's most common date format.
+	 *
+	 * We're serializing it as the RFC 1123 date, which, for HTTP must be
+	 * specified as GMT.
+	 *
+	 * @deprecated Use toDate
+	 * @param \DateTime $dateTime
+	 * @return string
+	 */
+	static function toHTTPDate(\DateTime $dateTime) {
 
-        return toDate($dateTime);
+		return toDate($dateTime);
 
-    }
+	}
 }