Dolibarr / dolibarr

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Xml/Property/EmailAddressSet.php

Indentation +44 added lines, -44 removed lines

@@ -21,51 +21,51 @@
  */
 class EmailAddressSet implements XmlSerializable
 {
-    /**
-     * emails.
-     *
-     * @var array
-     */
-    private $emails;
+	/**
+	 * emails.
+	 *
+	 * @var array
+	 */
+	private $emails;
 
-    /**
-     * __construct.
-     */
-    public function __construct(array $emails)
-    {
-        $this->emails = $emails;
-    }
+	/**
+	 * __construct.
+	 */
+	public function __construct(array $emails)
+	{
+		$this->emails = $emails;
+	}
 
-    /**
-     * Returns the email addresses.
-     *
-     * @return array
-     */
-    public function getValue()
-    {
-        return $this->emails;
-    }
+	/**
+	 * Returns the email addresses.
+	 *
+	 * @return array
+	 */
+	public function getValue()
+	{
+		return $this->emails;
+	}
 
-    /**
-     * The xmlSerialize method 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 XmlSerializable 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.
-     */
-    public function xmlSerialize(Writer $writer)
-    {
-        foreach ($this->emails as $email) {
-            $writer->writeElement('{http://calendarserver.org/ns/}email-address', $email);
-        }
-    }
+	/**
+	 * The xmlSerialize method 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 XmlSerializable 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.
+	 */
+	public function xmlSerialize(Writer $writer)
+	{
+		foreach ($this->emails as $email) {
+			$writer->writeElement('{http://calendarserver.org/ns/}email-address', $email);
+		}
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php

Indentation +86 added lines, -86 removed lines

@@ -28,97 +28,97 @@
  */
 class ScheduleCalendarTransp implements Element
 {
-    const TRANSPARENT = 'transparent';
-    const OPAQUE = 'opaque';
+	const TRANSPARENT = 'transparent';
+	const OPAQUE = 'opaque';
 
-    /**
-     * value.
-     *
-     * @var string
-     */
-    protected $value;
+	/**
+	 * value.
+	 *
+	 * @var string
+	 */
+	protected $value;
 
-    /**
-     * Creates the property.
-     *
-     * @param string $value
-     */
-    public function __construct($value)
-    {
-        if (self::TRANSPARENT !== $value && self::OPAQUE !== $value) {
-            throw new \InvalidArgumentException('The value must either be specified as "transparent" or "opaque"');
-        }
-        $this->value = $value;
-    }
+	/**
+	 * Creates the property.
+	 *
+	 * @param string $value
+	 */
+	public function __construct($value)
+	{
+		if (self::TRANSPARENT !== $value && self::OPAQUE !== $value) {
+			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;
-    }
+	/**
+	 * Returns the current value.
+	 *
+	 * @return string
+	 */
+	public function getValue()
+	{
+		return $this->value;
+	}
 
-    /**
-     * The xmlSerialize method 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 XmlSerializable 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.
-     */
-    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 xmlSerialize method 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 XmlSerializable 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.
+	 */
+	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 statically, 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.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Reader $reader)
-    {
-        $elems = Deserializer\enum($reader, Plugin::NS_CALDAV);
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statically, 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.
+	 *
+	 * @return mixed
+	 */
+	public static function xmlDeserialize(Reader $reader)
+	{
+		$elems = Deserializer\enum($reader, Plugin::NS_CALDAV);
 
-        if (in_array('transparent', $elems)) {
-            $value = self::TRANSPARENT;
-        } else {
-            $value = self::OPAQUE;
-        }
+		if (in_array('transparent', $elems)) {
+			$value = self::TRANSPARENT;
+		} else {
+			$value = self::OPAQUE;
+		}
 
-        return new self($value);
-    }
+		return new self($value);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Xml/Property/SupportedCollationSet.php

Indentation +27 added lines, -27 removed lines

@@ -23,32 +23,32 @@
  */
 class SupportedCollationSet implements XmlSerializable
 {
-    /**
-     * The xmlSerialize method 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 XmlSerializable 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.
-     */
-    public function xmlSerialize(Writer $writer)
-    {
-        $collations = [
-            'i;ascii-casemap',
-            'i;octet',
-            'i;unicode-casemap',
-        ];
+	/**
+	 * The xmlSerialize method 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 XmlSerializable 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.
+	 */
+	public function xmlSerialize(Writer $writer)
+	{
+		$collations = [
+			'i;ascii-casemap',
+			'i;octet',
+			'i;unicode-casemap',
+		];
 
-        foreach ($collations as $collation) {
-            $writer->writeElement('{'.Plugin::NS_CALDAV.'}supported-collation', $collation);
-        }
-    }
+		foreach ($collations as $collation) {
+			$writer->writeElement('{'.Plugin::NS_CALDAV.'}supported-collation', $collation);
+		}
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarData.php

Indentation +30 added lines, -30 removed lines

@@ -24,34 +24,34 @@
  */
 class SupportedCalendarData implements XmlSerializable
 {
-    /**
-     * The xmlSerialize method 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 XmlSerializable 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.
-     */
-    public function xmlSerialize(Writer $writer)
-    {
-        $writer->startElement('{'.Plugin::NS_CALDAV.'}calendar-data');
-        $writer->writeAttributes([
-            'content-type' => 'text/calendar',
-            'version' => '2.0',
-        ]);
-        $writer->endElement(); // calendar-data
-        $writer->startElement('{'.Plugin::NS_CALDAV.'}calendar-data');
-        $writer->writeAttributes([
-            'content-type' => 'application/calendar+json',
-        ]);
-        $writer->endElement(); // calendar-data
-    }
+	/**
+	 * The xmlSerialize method 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 XmlSerializable 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.
+	 */
+	public function xmlSerialize(Writer $writer)
+	{
+		$writer->startElement('{'.Plugin::NS_CALDAV.'}calendar-data');
+		$writer->writeAttributes([
+			'content-type' => 'text/calendar',
+			'version' => '2.0',
+		]);
+		$writer->endElement(); // calendar-data
+		$writer->startElement('{'.Plugin::NS_CALDAV.'}calendar-data');
+		$writer->writeAttributes([
+			'content-type' => 'application/calendar+json',
+		]);
+		$writer->endElement(); // calendar-data
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarComponentSet.php

Indentation +82 added lines, -82 removed lines

@@ -25,94 +25,94 @@
  */
 class SupportedCalendarComponentSet implements Element
 {
-    /**
-     * List of supported components.
-     *
-     * This array will contain values such as VEVENT, VTODO and VJOURNAL.
-     *
-     * @var array
-     */
-    protected $components = [];
+	/**
+	 * List of supported components.
+	 *
+	 * This array will contain values such as VEVENT, VTODO and VJOURNAL.
+	 *
+	 * @var array
+	 */
+	protected $components = [];
 
-    /**
-     * Creates the property.
-     */
-    public function __construct(array $components)
-    {
-        $this->components = $components;
-    }
+	/**
+	 * Creates the property.
+	 */
+	public function __construct(array $components)
+	{
+		$this->components = $components;
+	}
 
-    /**
-     * Returns the list of supported components.
-     *
-     * @return array
-     */
-    public function getValue()
-    {
-        return $this->components;
-    }
+	/**
+	 * Returns the list of supported components.
+	 *
+	 * @return array
+	 */
+	public function getValue()
+	{
+		return $this->components;
+	}
 
-    /**
-     * The xmlSerialize method 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 XmlSerializable 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.
-     */
-    public function xmlSerialize(Writer $writer)
-    {
-        foreach ($this->components as $component) {
-            $writer->startElement('{'.Plugin::NS_CALDAV.'}comp');
-            $writer->writeAttributes(['name' => $component]);
-            $writer->endElement();
-        }
-    }
+	/**
+	 * The xmlSerialize method 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 XmlSerializable 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.
+	 */
+	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 statically, 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.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Reader $reader)
-    {
-        $elems = $reader->parseInnerTree();
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statically, 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.
+	 *
+	 * @return mixed
+	 */
+	public static function xmlDeserialize(Reader $reader)
+	{
+		$elems = $reader->parseInnerTree();
 
-        $components = [];
+		$components = [];
 
-        foreach ((array) $elems as $elem) {
-            if ($elem['name'] === '{'.Plugin::NS_CALDAV.'}comp') {
-                $components[] = $elem['attributes']['name'];
-            }
-        }
+		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');
-        }
+		if (!$components) {
+			throw new ParseException('supported-calendar-component-set must have at least one CALDAV:comp element');
+		}
 
-        return new self($components);
-    }
+		return new self($components);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Xml/Property/AllowedSharingModes.php

Indentation +48 added lines, -48 removed lines

@@ -27,55 +27,55 @@
  */
 class AllowedSharingModes implements XmlSerializable
 {
-    /**
-     * Whether or not a calendar can be shared with another user.
-     *
-     * @var bool
-     */
-    protected $canBeShared;
+	/**
+	 * Whether or not a calendar can be shared with another user.
+	 *
+	 * @var bool
+	 */
+	protected $canBeShared;
 
-    /**
-     * Whether or not the calendar can be placed on a public url.
-     *
-     * @var bool
-     */
-    protected $canBePublished;
+	/**
+	 * Whether or not the calendar can be placed on a public url.
+	 *
+	 * @var bool
+	 */
+	protected $canBePublished;
 
-    /**
-     * Constructor.
-     *
-     * @param bool $canBeShared
-     * @param bool $canBePublished
-     */
-    public function __construct($canBeShared, $canBePublished)
-    {
-        $this->canBeShared = $canBeShared;
-        $this->canBePublished = $canBePublished;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $canBeShared
+	 * @param bool $canBePublished
+	 */
+	public function __construct($canBeShared, $canBePublished)
+	{
+		$this->canBeShared = $canBeShared;
+		$this->canBePublished = $canBePublished;
+	}
 
-    /**
-     * The xmlSerialize method 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 XmlSerializable 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.
-     */
-    public function xmlSerialize(Writer $writer)
-    {
-        if ($this->canBeShared) {
-            $writer->writeElement('{'.Plugin::NS_CALENDARSERVER.'}can-be-shared');
-        }
-        if ($this->canBePublished) {
-            $writer->writeElement('{'.Plugin::NS_CALENDARSERVER.'}can-be-published');
-        }
-    }
+	/**
+	 * The xmlSerialize method 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 XmlSerializable 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.
+	 */
+	public function xmlSerialize(Writer $writer)
+	{
+		if ($this->canBeShared) {
+			$writer->writeElement('{'.Plugin::NS_CALENDARSERVER.'}can-be-shared');
+		}
+		if ($this->canBePublished) {
+			$writer->writeElement('{'.Plugin::NS_CALENDARSERVER.'}can-be-published');
+		}
+	}
 }

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

Indentation +191 added lines, -191 removed lines

@@ -15,205 +15,205 @@
  */
 class SharedCalendar extends Calendar implements ISharedCalendar
 {
-    /**
-     * Returns the 'access level' for the instance of this shared resource.
-     *
-     * The value should be one of the Sabre\DAV\Sharing\Plugin::ACCESS_
-     * constants.
-     *
-     * @return int
-     */
-    public function getShareAccess()
-    {
-        return isset($this->calendarInfo['share-access']) ? $this->calendarInfo['share-access'] : SPlugin::ACCESS_NOTSHARED;
-    }
+	/**
+	 * Returns the 'access level' for the instance of this shared resource.
+	 *
+	 * The value should be one of the Sabre\DAV\Sharing\Plugin::ACCESS_
+	 * constants.
+	 *
+	 * @return int
+	 */
+	public function getShareAccess()
+	{
+		return isset($this->calendarInfo['share-access']) ? $this->calendarInfo['share-access'] : SPlugin::ACCESS_NOTSHARED;
+	}
 
-    /**
-     * This function must return a URI that uniquely identifies the shared
-     * resource. This URI should be identical across instances, and is
-     * also used in several other XML bodies to connect invites to
-     * resources.
-     *
-     * This may simply be a relative reference to the original shared instance,
-     * but it could also be a urn. As long as it's a valid URI and unique.
-     *
-     * @return string
-     */
-    public function getShareResourceUri()
-    {
-        return $this->calendarInfo['share-resource-uri'];
-    }
+	/**
+	 * This function must return a URI that uniquely identifies the shared
+	 * resource. This URI should be identical across instances, and is
+	 * also used in several other XML bodies to connect invites to
+	 * resources.
+	 *
+	 * This may simply be a relative reference to the original shared instance,
+	 * but it could also be a urn. As long as it's a valid URI and unique.
+	 *
+	 * @return string
+	 */
+	public function getShareResourceUri()
+	{
+		return $this->calendarInfo['share-resource-uri'];
+	}
 
-    /**
-     * Updates the list of sharees.
-     *
-     * Every item must be a Sharee object.
-     *
-     * @param \Sabre\DAV\Xml\Element\Sharee[] $sharees
-     */
-    public function updateInvites(array $sharees)
-    {
-        $this->caldavBackend->updateInvites($this->calendarInfo['id'], $sharees);
-    }
+	/**
+	 * Updates the list of sharees.
+	 *
+	 * Every item must be a Sharee object.
+	 *
+	 * @param \Sabre\DAV\Xml\Element\Sharee[] $sharees
+	 */
+	public function updateInvites(array $sharees)
+	{
+		$this->caldavBackend->updateInvites($this->calendarInfo['id'], $sharees);
+	}
 
-    /**
-     * Returns the list of people whom this resource is shared with.
-     *
-     * Every item in the returned array must be a Sharee object with
-     * at least the following properties set:
-     *
-     * * $href
-     * * $shareAccess
-     * * $inviteStatus
-     *
-     * and optionally:
-     *
-     * * $properties
-     *
-     * @return \Sabre\DAV\Xml\Element\Sharee[]
-     */
-    public function getInvites()
-    {
-        return $this->caldavBackend->getInvites($this->calendarInfo['id']);
-    }
+	/**
+	 * Returns the list of people whom this resource is shared with.
+	 *
+	 * Every item in the returned array must be a Sharee object with
+	 * at least the following properties set:
+	 *
+	 * * $href
+	 * * $shareAccess
+	 * * $inviteStatus
+	 *
+	 * and optionally:
+	 *
+	 * * $properties
+	 *
+	 * @return \Sabre\DAV\Xml\Element\Sharee[]
+	 */
+	public function getInvites()
+	{
+		return $this->caldavBackend->getInvites($this->calendarInfo['id']);
+	}
 
-    /**
-     * Marks this calendar as published.
-     *
-     * Publishing a calendar should automatically create a read-only, public,
-     * subscribable calendar.
-     *
-     * @param bool $value
-     */
-    public function setPublishStatus($value)
-    {
-        $this->caldavBackend->setPublishStatus($this->calendarInfo['id'], $value);
-    }
+	/**
+	 * Marks this calendar as published.
+	 *
+	 * Publishing a calendar should automatically create a read-only, public,
+	 * subscribable calendar.
+	 *
+	 * @param bool $value
+	 */
+	public function setPublishStatus($value)
+	{
+		$this->caldavBackend->setPublishStatus($this->calendarInfo['id'], $value);
+	}
 
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL()
-    {
-        $acl = [];
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL()
+	{
+		$acl = [];
 
-        switch ($this->getShareAccess()) {
-            case SPlugin::ACCESS_NOTSHARED:
-            case SPlugin::ACCESS_SHAREDOWNER:
-                $acl[] = [
-                    'privilege' => '{DAV:}share',
-                    'principal' => $this->calendarInfo['principaluri'],
-                    'protected' => true,
-                ];
-                $acl[] = [
-                    'privilege' => '{DAV:}share',
-                    'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
-                    'protected' => true,
-                ];
-                // no break intentional!
-            case SPlugin::ACCESS_READWRITE:
-                $acl[] = [
-                    'privilege' => '{DAV:}write',
-                    'principal' => $this->calendarInfo['principaluri'],
-                    'protected' => true,
-                ];
-                $acl[] = [
-                    'privilege' => '{DAV:}write',
-                    'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
-                    'protected' => true,
-                ];
-                // no break intentional!
-            case SPlugin::ACCESS_READ:
-                $acl[] = [
-                    'privilege' => '{DAV:}write-properties',
-                    'principal' => $this->calendarInfo['principaluri'],
-                    'protected' => true,
-                ];
-                $acl[] = [
-                    'privilege' => '{DAV:}write-properties',
-                    'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
-                    'protected' => true,
-                ];
-                $acl[] = [
-                    'privilege' => '{DAV:}read',
-                    'principal' => $this->calendarInfo['principaluri'],
-                    'protected' => true,
-                ];
-                $acl[] = [
-                    'privilege' => '{DAV:}read',
-                    'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-read',
-                    'protected' => true,
-                ];
-                $acl[] = [
-                    'privilege' => '{DAV:}read',
-                    'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
-                    'protected' => true,
-                ];
-                $acl[] = [
-                    'privilege' => '{'.Plugin::NS_CALDAV.'}read-free-busy',
-                    'principal' => '{DAV:}authenticated',
-                    'protected' => true,
-                ];
-                break;
-        }
+		switch ($this->getShareAccess()) {
+			case SPlugin::ACCESS_NOTSHARED:
+			case SPlugin::ACCESS_SHAREDOWNER:
+				$acl[] = [
+					'privilege' => '{DAV:}share',
+					'principal' => $this->calendarInfo['principaluri'],
+					'protected' => true,
+				];
+				$acl[] = [
+					'privilege' => '{DAV:}share',
+					'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
+					'protected' => true,
+				];
+				// no break intentional!
+			case SPlugin::ACCESS_READWRITE:
+				$acl[] = [
+					'privilege' => '{DAV:}write',
+					'principal' => $this->calendarInfo['principaluri'],
+					'protected' => true,
+				];
+				$acl[] = [
+					'privilege' => '{DAV:}write',
+					'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
+					'protected' => true,
+				];
+				// no break intentional!
+			case SPlugin::ACCESS_READ:
+				$acl[] = [
+					'privilege' => '{DAV:}write-properties',
+					'principal' => $this->calendarInfo['principaluri'],
+					'protected' => true,
+				];
+				$acl[] = [
+					'privilege' => '{DAV:}write-properties',
+					'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
+					'protected' => true,
+				];
+				$acl[] = [
+					'privilege' => '{DAV:}read',
+					'principal' => $this->calendarInfo['principaluri'],
+					'protected' => true,
+				];
+				$acl[] = [
+					'privilege' => '{DAV:}read',
+					'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-read',
+					'protected' => true,
+				];
+				$acl[] = [
+					'privilege' => '{DAV:}read',
+					'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
+					'protected' => true,
+				];
+				$acl[] = [
+					'privilege' => '{'.Plugin::NS_CALDAV.'}read-free-busy',
+					'principal' => '{DAV:}authenticated',
+					'protected' => true,
+				];
+				break;
+		}
 
-        return $acl;
-    }
+		return $acl;
+	}
 
-    /**
-     * This method returns the ACL's for calendar objects in this calendar.
-     * The result of this method automatically gets passed to the
-     * calendar-object nodes in the calendar.
-     *
-     * @return array
-     */
-    public function getChildACL()
-    {
-        $acl = [];
+	/**
+	 * This method returns the ACL's for calendar objects in this calendar.
+	 * The result of this method automatically gets passed to the
+	 * calendar-object nodes in the calendar.
+	 *
+	 * @return array
+	 */
+	public function getChildACL()
+	{
+		$acl = [];
 
-        switch ($this->getShareAccess()) {
-            case SPlugin::ACCESS_NOTSHARED:
-            case SPlugin::ACCESS_SHAREDOWNER:
-            case SPlugin::ACCESS_READWRITE:
-                $acl[] = [
-                    'privilege' => '{DAV:}write',
-                    'principal' => $this->calendarInfo['principaluri'],
-                    'protected' => true,
-                ];
-                $acl[] = [
-                    'privilege' => '{DAV:}write',
-                    'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
-                    'protected' => true,
-                ];
-                // no break intentional
-            case SPlugin::ACCESS_READ:
-                $acl[] = [
-                    'privilege' => '{DAV:}read',
-                    'principal' => $this->calendarInfo['principaluri'],
-                    'protected' => true,
-                ];
-                $acl[] = [
-                    'privilege' => '{DAV:}read',
-                    'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
-                    'protected' => true,
-                ];
-                $acl[] = [
-                    'privilege' => '{DAV:}read',
-                    'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-read',
-                    'protected' => true,
-                ];
-                break;
-        }
+		switch ($this->getShareAccess()) {
+			case SPlugin::ACCESS_NOTSHARED:
+			case SPlugin::ACCESS_SHAREDOWNER:
+			case SPlugin::ACCESS_READWRITE:
+				$acl[] = [
+					'privilege' => '{DAV:}write',
+					'principal' => $this->calendarInfo['principaluri'],
+					'protected' => true,
+				];
+				$acl[] = [
+					'privilege' => '{DAV:}write',
+					'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
+					'protected' => true,
+				];
+				// no break intentional
+			case SPlugin::ACCESS_READ:
+				$acl[] = [
+					'privilege' => '{DAV:}read',
+					'principal' => $this->calendarInfo['principaluri'],
+					'protected' => true,
+				];
+				$acl[] = [
+					'privilege' => '{DAV:}read',
+					'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
+					'protected' => true,
+				];
+				$acl[] = [
+					'privilege' => '{DAV:}read',
+					'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-read',
+					'protected' => true,
+				];
+				break;
+		}
 
-        return $acl;
-    }
+		return $acl;
+	}
 }

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

Indentation +329 added lines, -329 removed lines

@@ -22,333 +22,333 @@
  */
 class CalendarQueryValidator
 {
-    /**
-     * Verify if a list of filters applies to the calendar data object.
-     *
-     * The list of filters must be formatted as parsed by \Sabre\CalDAV\CalendarQueryParser
-     *
-     * @return bool
-     */
-    public function validate(VObject\Component\VCalendar $vObject, array $filters)
-    {
-        // The top level object is always a component filter.
-        // We'll parse it manually, as it's pretty simple.
-        if ($vObject->name !== $filters['name']) {
-            return false;
-        }
-
-        return
-            $this->validateCompFilters($vObject, $filters['comp-filters']) &&
-            $this->validatePropFilters($vObject, $filters['prop-filters']);
-    }
-
-    /**
-     * This method checks the validity of comp-filters.
-     *
-     * A list of comp-filters needs to be specified. Also the parent of the
-     * component we're checking should be specified, not the component to check
-     * itself.
-     *
-     * @return bool
-     */
-    protected function validateCompFilters(VObject\Component $parent, array $filters)
-    {
-        foreach ($filters as $filter) {
-            $isDefined = isset($parent->{$filter['name']});
-
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if (array_key_exists('time-range', $filter) && $filter['time-range']) {
-                foreach ($parent->{$filter['name']} as $subComponent) {
-                    $start = null;
-                    $end = null;
-                    if (array_key_exists('start', $filter['time-range'])) {
-                        $start = $filter['time-range']['start'];
-                    }
-                    if (array_key_exists('end', $filter['time-range'])) {
-                        $end = $filter['time-range']['end'];
-                    }
-                    if ($this->validateTimeRange($subComponent, $start, $end)) {
-                        continue 2;
-                    }
-                }
-
-                return false;
-            }
-
-            if (!$filter['comp-filters'] && !$filter['prop-filters']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one component
-            // for which the subfilters hold true.
-            foreach ($parent->{$filter['name']} as $subComponent) {
-                if (
-                    $this->validateCompFilters($subComponent, $filter['comp-filters']) &&
-                    $this->validatePropFilters($subComponent, $filter['prop-filters'])) {
-                    // We had a match, so this comp-filter succeeds
-                    continue 2;
-                }
-            }
-
-            // If we got here it means there were sub-comp-filters or
-            // sub-prop-filters and there was no match. This means this filter
-            // needs to return false.
-            return false;
-        }
-
-        // If we got here it means we got through all comp-filters alive so the
-        // filters were all true.
-        return true;
-    }
-
-    /**
-     * This method checks the validity of prop-filters.
-     *
-     * A list of prop-filters needs to be specified. Also the parent of the
-     * property we're checking should be specified, not the property to check
-     * itself.
-     *
-     * @return bool
-     */
-    protected function validatePropFilters(VObject\Component $parent, array $filters)
-    {
-        foreach ($filters as $filter) {
-            $isDefined = isset($parent->{$filter['name']});
-
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if (array_key_exists('time-range', $filter) && $filter['time-range']) {
-                foreach ($parent->{$filter['name']} as $subComponent) {
-                    $start = null;
-                    $end = null;
-                    if (array_key_exists('start', $filter['time-range'])) {
-                        $start = $filter['time-range']['start'];
-                    }
-                    if (array_key_exists('end', $filter['time-range'])) {
-                        $end = $filter['time-range']['end'];
-                    }
-                    if ($this->validateTimeRange($subComponent, $start, $end)) {
-                        continue 2;
-                    }
-                }
-
-                return false;
-            }
-
-            if (!$filter['param-filters'] && !$filter['text-match']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one property
-            // for which the subfilters hold true.
-            foreach ($parent->{$filter['name']} as $subComponent) {
-                if (
-                    $this->validateParamFilters($subComponent, $filter['param-filters']) &&
-                    (!$filter['text-match'] || $this->validateTextMatch($subComponent, $filter['text-match']))
-                ) {
-                    // We had a match, so this prop-filter succeeds
-                    continue 2;
-                }
-            }
-
-            // If we got here it means there were sub-param-filters or
-            // text-match filters and there was no match. This means the
-            // filter needs to return false.
-            return false;
-        }
-
-        // If we got here it means we got through all prop-filters alive so the
-        // filters were all true.
-        return true;
-    }
-
-    /**
-     * This method checks the validity of param-filters.
-     *
-     * A list of param-filters needs to be specified. Also the parent of the
-     * parameter we're checking should be specified, not the parameter to check
-     * itself.
-     *
-     * @return bool
-     */
-    protected function validateParamFilters(VObject\Property $parent, array $filters)
-    {
-        foreach ($filters as $filter) {
-            $isDefined = isset($parent[$filter['name']]);
-
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if (!$filter['text-match']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one parameter
-            // for which the subfilters hold true.
-            foreach ($parent[$filter['name']]->getParts() as $paramPart) {
-                if ($this->validateTextMatch($paramPart, $filter['text-match'])) {
-                    // We had a match, so this param-filter succeeds
-                    continue 2;
-                }
-            }
-
-            // If we got here it means there was a text-match filter and there
-            // were no matches. This means the filter needs to return false.
-            return false;
-        }
-
-        // If we got here it means we got through all param-filters alive so the
-        // filters were all true.
-        return true;
-    }
-
-    /**
-     * This method checks the validity of a text-match.
-     *
-     * A single text-match should be specified as well as the specific property
-     * or parameter we need to validate.
-     *
-     * @param VObject\Node|string $check value to check against
-     *
-     * @return bool
-     */
-    protected function validateTextMatch($check, array $textMatch)
-    {
-        if ($check instanceof VObject\Node) {
-            $check = $check->getValue();
-        }
-
-        $isMatching = \Sabre\DAV\StringUtil::textMatch($check, $textMatch['value'], $textMatch['collation']);
-
-        return $textMatch['negate-condition'] xor $isMatching;
-    }
-
-    /**
-     * Validates if a component matches the given time range.
-     *
-     * This is all based on the rules specified in rfc4791, which are quite
-     * complex.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     *
-     * @return bool
-     */
-    protected function validateTimeRange(VObject\Node $component, $start, $end)
-    {
-        if (is_null($start)) {
-            $start = new DateTime('1900-01-01');
-        }
-        if (is_null($end)) {
-            $end = new DateTime('3000-01-01');
-        }
-
-        switch ($component->name) {
-            case 'VEVENT':
-            case 'VTODO':
-            case 'VJOURNAL':
-                return $component->isInTimeRange($start, $end);
-
-            case 'VALARM':
-                // If the valarm is wrapped in a recurring event, we need to
-                // expand the recursions, and validate each.
-                //
-                // Our datamodel doesn't easily allow us to do this straight
-                // in the VALARM component code, so this is a hack, and an
-                // expensive one too.
-                if ('VEVENT' === $component->parent->name && $component->parent->RRULE) {
-                    // Fire up the iterator!
-                    $it = new VObject\Recur\EventIterator($component->parent->parent, (string) $component->parent->UID);
-                    while ($it->valid()) {
-                        $expandedEvent = $it->getEventObject();
-
-                        // We need to check from these expanded alarms, which
-                        // one is the first to trigger. Based on this, we can
-                        // determine if we can 'give up' expanding events.
-                        $firstAlarm = null;
-                        if (null !== $expandedEvent->VALARM) {
-                            foreach ($expandedEvent->VALARM as $expandedAlarm) {
-                                $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
-                                if ($expandedAlarm->isInTimeRange($start, $end)) {
-                                    return true;
-                                }
-
-                                if ('DATE-TIME' === (string) $expandedAlarm->TRIGGER['VALUE']) {
-                                    // This is an alarm with a non-relative trigger
-                                    // time, likely created by a buggy client. The
-                                    // implication is that every alarm in this
-                                    // recurring event trigger at the exact same
-                                    // time. It doesn't make sense to traverse
-                                    // further.
-                                } else {
-                                    // We store the first alarm as a means to
-                                    // figure out when we can stop traversing.
-                                    if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
-                                        $firstAlarm = $effectiveTrigger;
-                                    }
-                                }
-                            }
-                        }
-                        if (is_null($firstAlarm)) {
-                            // No alarm was found.
-                            //
-                            // Or technically: No alarm that will change for
-                            // every instance of the recurrence was found,
-                            // which means we can assume there was no match.
-                            return false;
-                        }
-                        if ($firstAlarm > $end) {
-                            return false;
-                        }
-                        $it->next();
-                    }
-
-                    return false;
-                } else {
-                    return $component->isInTimeRange($start, $end);
-                }
-
-                // no break
-            case 'VFREEBUSY':
-                throw new \Sabre\DAV\Exception\NotImplemented('time-range filters are currently not supported on '.$component->name.' components');
-            case 'COMPLETED':
-            case 'CREATED':
-            case 'DTEND':
-            case 'DTSTAMP':
-            case 'DTSTART':
-            case 'DUE':
-            case 'LAST-MODIFIED':
-                return $start <= $component->getDateTime() && $end >= $component->getDateTime();
-
-            default:
-                throw new \Sabre\DAV\Exception\BadRequest('You cannot create a time-range filter on a '.$component->name.' component');
-        }
-    }
+	/**
+	 * Verify if a list of filters applies to the calendar data object.
+	 *
+	 * The list of filters must be formatted as parsed by \Sabre\CalDAV\CalendarQueryParser
+	 *
+	 * @return bool
+	 */
+	public function validate(VObject\Component\VCalendar $vObject, array $filters)
+	{
+		// The top level object is always a component filter.
+		// We'll parse it manually, as it's pretty simple.
+		if ($vObject->name !== $filters['name']) {
+			return false;
+		}
+
+		return
+			$this->validateCompFilters($vObject, $filters['comp-filters']) &&
+			$this->validatePropFilters($vObject, $filters['prop-filters']);
+	}
+
+	/**
+	 * This method checks the validity of comp-filters.
+	 *
+	 * A list of comp-filters needs to be specified. Also the parent of the
+	 * component we're checking should be specified, not the component to check
+	 * itself.
+	 *
+	 * @return bool
+	 */
+	protected function validateCompFilters(VObject\Component $parent, array $filters)
+	{
+		foreach ($filters as $filter) {
+			$isDefined = isset($parent->{$filter['name']});
+
+			if ($filter['is-not-defined']) {
+				if ($isDefined) {
+					return false;
+				} else {
+					continue;
+				}
+			}
+			if (!$isDefined) {
+				return false;
+			}
+
+			if (array_key_exists('time-range', $filter) && $filter['time-range']) {
+				foreach ($parent->{$filter['name']} as $subComponent) {
+					$start = null;
+					$end = null;
+					if (array_key_exists('start', $filter['time-range'])) {
+						$start = $filter['time-range']['start'];
+					}
+					if (array_key_exists('end', $filter['time-range'])) {
+						$end = $filter['time-range']['end'];
+					}
+					if ($this->validateTimeRange($subComponent, $start, $end)) {
+						continue 2;
+					}
+				}
+
+				return false;
+			}
+
+			if (!$filter['comp-filters'] && !$filter['prop-filters']) {
+				continue;
+			}
+
+			// If there are sub-filters, we need to find at least one component
+			// for which the subfilters hold true.
+			foreach ($parent->{$filter['name']} as $subComponent) {
+				if (
+					$this->validateCompFilters($subComponent, $filter['comp-filters']) &&
+					$this->validatePropFilters($subComponent, $filter['prop-filters'])) {
+					// We had a match, so this comp-filter succeeds
+					continue 2;
+				}
+			}
+
+			// If we got here it means there were sub-comp-filters or
+			// sub-prop-filters and there was no match. This means this filter
+			// needs to return false.
+			return false;
+		}
+
+		// If we got here it means we got through all comp-filters alive so the
+		// filters were all true.
+		return true;
+	}
+
+	/**
+	 * This method checks the validity of prop-filters.
+	 *
+	 * A list of prop-filters needs to be specified. Also the parent of the
+	 * property we're checking should be specified, not the property to check
+	 * itself.
+	 *
+	 * @return bool
+	 */
+	protected function validatePropFilters(VObject\Component $parent, array $filters)
+	{
+		foreach ($filters as $filter) {
+			$isDefined = isset($parent->{$filter['name']});
+
+			if ($filter['is-not-defined']) {
+				if ($isDefined) {
+					return false;
+				} else {
+					continue;
+				}
+			}
+			if (!$isDefined) {
+				return false;
+			}
+
+			if (array_key_exists('time-range', $filter) && $filter['time-range']) {
+				foreach ($parent->{$filter['name']} as $subComponent) {
+					$start = null;
+					$end = null;
+					if (array_key_exists('start', $filter['time-range'])) {
+						$start = $filter['time-range']['start'];
+					}
+					if (array_key_exists('end', $filter['time-range'])) {
+						$end = $filter['time-range']['end'];
+					}
+					if ($this->validateTimeRange($subComponent, $start, $end)) {
+						continue 2;
+					}
+				}
+
+				return false;
+			}
+
+			if (!$filter['param-filters'] && !$filter['text-match']) {
+				continue;
+			}
+
+			// If there are sub-filters, we need to find at least one property
+			// for which the subfilters hold true.
+			foreach ($parent->{$filter['name']} as $subComponent) {
+				if (
+					$this->validateParamFilters($subComponent, $filter['param-filters']) &&
+					(!$filter['text-match'] || $this->validateTextMatch($subComponent, $filter['text-match']))
+				) {
+					// We had a match, so this prop-filter succeeds
+					continue 2;
+				}
+			}
+
+			// If we got here it means there were sub-param-filters or
+			// text-match filters and there was no match. This means the
+			// filter needs to return false.
+			return false;
+		}
+
+		// If we got here it means we got through all prop-filters alive so the
+		// filters were all true.
+		return true;
+	}
+
+	/**
+	 * This method checks the validity of param-filters.
+	 *
+	 * A list of param-filters needs to be specified. Also the parent of the
+	 * parameter we're checking should be specified, not the parameter to check
+	 * itself.
+	 *
+	 * @return bool
+	 */
+	protected function validateParamFilters(VObject\Property $parent, array $filters)
+	{
+		foreach ($filters as $filter) {
+			$isDefined = isset($parent[$filter['name']]);
+
+			if ($filter['is-not-defined']) {
+				if ($isDefined) {
+					return false;
+				} else {
+					continue;
+				}
+			}
+			if (!$isDefined) {
+				return false;
+			}
+
+			if (!$filter['text-match']) {
+				continue;
+			}
+
+			// If there are sub-filters, we need to find at least one parameter
+			// for which the subfilters hold true.
+			foreach ($parent[$filter['name']]->getParts() as $paramPart) {
+				if ($this->validateTextMatch($paramPart, $filter['text-match'])) {
+					// We had a match, so this param-filter succeeds
+					continue 2;
+				}
+			}
+
+			// If we got here it means there was a text-match filter and there
+			// were no matches. This means the filter needs to return false.
+			return false;
+		}
+
+		// If we got here it means we got through all param-filters alive so the
+		// filters were all true.
+		return true;
+	}
+
+	/**
+	 * This method checks the validity of a text-match.
+	 *
+	 * A single text-match should be specified as well as the specific property
+	 * or parameter we need to validate.
+	 *
+	 * @param VObject\Node|string $check value to check against
+	 *
+	 * @return bool
+	 */
+	protected function validateTextMatch($check, array $textMatch)
+	{
+		if ($check instanceof VObject\Node) {
+			$check = $check->getValue();
+		}
+
+		$isMatching = \Sabre\DAV\StringUtil::textMatch($check, $textMatch['value'], $textMatch['collation']);
+
+		return $textMatch['negate-condition'] xor $isMatching;
+	}
+
+	/**
+	 * Validates if a component matches the given time range.
+	 *
+	 * This is all based on the rules specified in rfc4791, which are quite
+	 * complex.
+	 *
+	 * @param DateTime $start
+	 * @param DateTime $end
+	 *
+	 * @return bool
+	 */
+	protected function validateTimeRange(VObject\Node $component, $start, $end)
+	{
+		if (is_null($start)) {
+			$start = new DateTime('1900-01-01');
+		}
+		if (is_null($end)) {
+			$end = new DateTime('3000-01-01');
+		}
+
+		switch ($component->name) {
+			case 'VEVENT':
+			case 'VTODO':
+			case 'VJOURNAL':
+				return $component->isInTimeRange($start, $end);
+
+			case 'VALARM':
+				// If the valarm is wrapped in a recurring event, we need to
+				// expand the recursions, and validate each.
+				//
+				// Our datamodel doesn't easily allow us to do this straight
+				// in the VALARM component code, so this is a hack, and an
+				// expensive one too.
+				if ('VEVENT' === $component->parent->name && $component->parent->RRULE) {
+					// Fire up the iterator!
+					$it = new VObject\Recur\EventIterator($component->parent->parent, (string) $component->parent->UID);
+					while ($it->valid()) {
+						$expandedEvent = $it->getEventObject();
+
+						// We need to check from these expanded alarms, which
+						// one is the first to trigger. Based on this, we can
+						// determine if we can 'give up' expanding events.
+						$firstAlarm = null;
+						if (null !== $expandedEvent->VALARM) {
+							foreach ($expandedEvent->VALARM as $expandedAlarm) {
+								$effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
+								if ($expandedAlarm->isInTimeRange($start, $end)) {
+									return true;
+								}
+
+								if ('DATE-TIME' === (string) $expandedAlarm->TRIGGER['VALUE']) {
+									// This is an alarm with a non-relative trigger
+									// time, likely created by a buggy client. The
+									// implication is that every alarm in this
+									// recurring event trigger at the exact same
+									// time. It doesn't make sense to traverse
+									// further.
+								} else {
+									// We store the first alarm as a means to
+									// figure out when we can stop traversing.
+									if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
+										$firstAlarm = $effectiveTrigger;
+									}
+								}
+							}
+						}
+						if (is_null($firstAlarm)) {
+							// No alarm was found.
+							//
+							// Or technically: No alarm that will change for
+							// every instance of the recurrence was found,
+							// which means we can assume there was no match.
+							return false;
+						}
+						if ($firstAlarm > $end) {
+							return false;
+						}
+						$it->next();
+					}
+
+					return false;
+				} else {
+					return $component->isInTimeRange($start, $end);
+				}
+
+				// no break
+			case 'VFREEBUSY':
+				throw new \Sabre\DAV\Exception\NotImplemented('time-range filters are currently not supported on '.$component->name.' components');
+			case 'COMPLETED':
+			case 'CREATED':
+			case 'DTEND':
+			case 'DTSTAMP':
+			case 'DTSTART':
+			case 'DUE':
+			case 'LAST-MODIFIED':
+				return $start <= $component->getDateTime() && $end >= $component->getDateTime();
+
+			default:
+				throw new \Sabre\DAV\Exception\BadRequest('You cannot create a time-range filter on a '.$component->name.' component');
+		}
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Exception/InvalidComponentType.php

Indentation +11 added lines, -11 removed lines

@@ -16,16 +16,16 @@
  */
 class InvalidComponentType extends DAV\Exception\Forbidden
 {
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {CALDAV:}supported-calendar-component as defined in rfc4791
-     */
-    public function serialize(DAV\Server $server, \DOMElement $errorNode)
-    {
-        $doc = $errorNode->ownerDocument;
+	/**
+	 * Adds in extra information in the xml response.
+	 *
+	 * This method adds the {CALDAV:}supported-calendar-component as defined in rfc4791
+	 */
+	public function serialize(DAV\Server $server, \DOMElement $errorNode)
+	{
+		$doc = $errorNode->ownerDocument;
 
-        $np = $doc->createElementNS(CalDAV\Plugin::NS_CALDAV, 'cal:supported-calendar-component');
-        $errorNode->appendChild($np);
-    }
+		$np = $doc->createElementNS(CalDAV\Plugin::NS_CALDAV, 'cal:supported-calendar-component');
+		$errorNode->appendChild($np);
+	}
 }