Dolibarr / dolibarr

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);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Notifications/Plugin.php

Indentation +130 added lines, -130 removed lines

@@ -28,134 +28,134 @@
  */
 class Plugin extends ServerPlugin
 {
-    /**
-     * This is the namespace for the proprietary calendarserver extensions.
-     */
-    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-    /**
-     * Reference to the main server object.
-     *
-     * @var Server
-     */
-    protected $server;
-
-    /**
-     * 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 'notifications';
-    }
-
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre\DAV\Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the required event subscriptions.
-     */
-    public function initialize(Server $server)
-    {
-        $this->server = $server;
-        $server->on('method:GET', [$this, 'httpGet'], 90);
-        $server->on('propFind', [$this, 'propFind']);
-
-        $server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Notifications\\ICollection'] = '{'.self::NS_CALENDARSERVER.'}notification';
-
-        array_push($server->protectedProperties,
-            '{'.self::NS_CALENDARSERVER.'}notification-URL',
-            '{'.self::NS_CALENDARSERVER.'}notificationtype'
-        );
-    }
-
-    /**
-     * PropFind.
-     */
-    public function propFind(PropFind $propFind, BaseINode $node)
-    {
-        $caldavPlugin = $this->server->getPlugin('caldav');
-
-        if ($node instanceof DAVACL\IPrincipal) {
-            $principalUrl = $node->getPrincipalUrl();
-
-            // notification-URL property
-            $propFind->handle('{'.self::NS_CALENDARSERVER.'}notification-URL', function () use ($principalUrl, $caldavPlugin) {
-                $notificationPath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl).'/notifications/';
-
-                return new DAV\Xml\Property\Href($notificationPath);
-            });
-        }
-
-        if ($node instanceof INode) {
-            $propFind->handle(
-                '{'.self::NS_CALENDARSERVER.'}notificationtype',
-                [$node, 'getNotificationType']
-            );
-        }
-    }
-
-    /**
-     * This event is triggered before the usual GET request handler.
-     *
-     * We use this to intercept GET calls to notification nodes, and return the
-     * proper response.
-     */
-    public function httpGet(RequestInterface $request, ResponseInterface $response)
-    {
-        $path = $request->getPath();
-
-        try {
-            $node = $this->server->tree->getNodeForPath($path);
-        } catch (DAV\Exception\NotFound $e) {
-            return;
-        }
-
-        if (!$node instanceof INode) {
-            return;
-        }
-
-        $writer = $this->server->xml->getWriter();
-        $writer->contextUri = $this->server->getBaseUri();
-        $writer->openMemory();
-        $writer->startDocument('1.0', 'UTF-8');
-        $writer->startElement('{http://calendarserver.org/ns/}notification');
-        $node->getNotificationType()->xmlSerializeFull($writer);
-        $writer->endElement();
-
-        $response->setHeader('Content-Type', 'application/xml');
-        $response->setHeader('ETag', $node->getETag());
-        $response->setStatus(200);
-        $response->setBody($writer->outputMemory());
-
-        // Return false to break the event chain.
-        return false;
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo()
-    {
-        return [
-            'name' => $this->getPluginName(),
-            'description' => 'Adds support for caldav-notifications, which is required to enable caldav-sharing.',
-            'link' => 'http://sabre.io/dav/caldav-sharing/',
-        ];
-    }
+	/**
+	 * This is the namespace for the proprietary calendarserver extensions.
+	 */
+	const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+	/**
+	 * Reference to the main server object.
+	 *
+	 * @var Server
+	 */
+	protected $server;
+
+	/**
+	 * 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 'notifications';
+	}
+
+	/**
+	 * This initializes the plugin.
+	 *
+	 * This function is called by Sabre\DAV\Server, after
+	 * addPlugin is called.
+	 *
+	 * This method should set up the required event subscriptions.
+	 */
+	public function initialize(Server $server)
+	{
+		$this->server = $server;
+		$server->on('method:GET', [$this, 'httpGet'], 90);
+		$server->on('propFind', [$this, 'propFind']);
+
+		$server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
+		$server->resourceTypeMapping['\\Sabre\\CalDAV\\Notifications\\ICollection'] = '{'.self::NS_CALENDARSERVER.'}notification';
+
+		array_push($server->protectedProperties,
+			'{'.self::NS_CALENDARSERVER.'}notification-URL',
+			'{'.self::NS_CALENDARSERVER.'}notificationtype'
+		);
+	}
+
+	/**
+	 * PropFind.
+	 */
+	public function propFind(PropFind $propFind, BaseINode $node)
+	{
+		$caldavPlugin = $this->server->getPlugin('caldav');
+
+		if ($node instanceof DAVACL\IPrincipal) {
+			$principalUrl = $node->getPrincipalUrl();
+
+			// notification-URL property
+			$propFind->handle('{'.self::NS_CALENDARSERVER.'}notification-URL', function () use ($principalUrl, $caldavPlugin) {
+				$notificationPath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl).'/notifications/';
+
+				return new DAV\Xml\Property\Href($notificationPath);
+			});
+		}
+
+		if ($node instanceof INode) {
+			$propFind->handle(
+				'{'.self::NS_CALENDARSERVER.'}notificationtype',
+				[$node, 'getNotificationType']
+			);
+		}
+	}
+
+	/**
+	 * This event is triggered before the usual GET request handler.
+	 *
+	 * We use this to intercept GET calls to notification nodes, and return the
+	 * proper response.
+	 */
+	public function httpGet(RequestInterface $request, ResponseInterface $response)
+	{
+		$path = $request->getPath();
+
+		try {
+			$node = $this->server->tree->getNodeForPath($path);
+		} catch (DAV\Exception\NotFound $e) {
+			return;
+		}
+
+		if (!$node instanceof INode) {
+			return;
+		}
+
+		$writer = $this->server->xml->getWriter();
+		$writer->contextUri = $this->server->getBaseUri();
+		$writer->openMemory();
+		$writer->startDocument('1.0', 'UTF-8');
+		$writer->startElement('{http://calendarserver.org/ns/}notification');
+		$node->getNotificationType()->xmlSerializeFull($writer);
+		$writer->endElement();
+
+		$response->setHeader('Content-Type', 'application/xml');
+		$response->setHeader('ETag', $node->getETag());
+		$response->setStatus(200);
+		$response->setBody($writer->outputMemory());
+
+		// Return false to break the event chain.
+		return false;
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo()
+	{
+		return [
+			'name' => $this->getPluginName(),
+			'description' => 'Adds support for caldav-notifications, which is required to enable caldav-sharing.',
+			'link' => 'http://sabre.io/dav/caldav-sharing/',
+		];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
             $principalUrl = $node->getPrincipalUrl();
 
             // notification-URL property
-            $propFind->handle('{'.self::NS_CALENDARSERVER.'}notification-URL', function () use ($principalUrl, $caldavPlugin) {
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}notification-URL', function() use ($principalUrl, $caldavPlugin) {
                 $notificationPath = $caldavPlugin->getCalendarHomeForPrincipal($principalUrl).'/notifications/';
 
                 return new DAV\Xml\Property\Href($notificationPath);

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Notifications/Collection.php

Indentation +61 added lines, -61 removed lines

@@ -24,73 +24,73 @@
  */
 class Collection extends DAV\Collection implements ICollection, DAVACL\IACL
 {
-    use DAVACL\ACLTrait;
+	use DAVACL\ACLTrait;
 
-    /**
-     * The notification backend.
-     *
-     * @var CalDAV\Backend\NotificationSupport
-     */
-    protected $caldavBackend;
+	/**
+	 * The notification backend.
+	 *
+	 * @var CalDAV\Backend\NotificationSupport
+	 */
+	protected $caldavBackend;
 
-    /**
-     * Principal uri.
-     *
-     * @var string
-     */
-    protected $principalUri;
+	/**
+	 * Principal uri.
+	 *
+	 * @var string
+	 */
+	protected $principalUri;
 
-    /**
-     * Constructor.
-     *
-     * @param string $principalUri
-     */
-    public function __construct(CalDAV\Backend\NotificationSupport $caldavBackend, $principalUri)
-    {
-        $this->caldavBackend = $caldavBackend;
-        $this->principalUri = $principalUri;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $principalUri
+	 */
+	public function __construct(CalDAV\Backend\NotificationSupport $caldavBackend, $principalUri)
+	{
+		$this->caldavBackend = $caldavBackend;
+		$this->principalUri = $principalUri;
+	}
 
-    /**
-     * Returns all notifications for a principal.
-     *
-     * @return array
-     */
-    public function getChildren()
-    {
-        $children = [];
-        $notifications = $this->caldavBackend->getNotificationsForPrincipal($this->principalUri);
+	/**
+	 * Returns all notifications for a principal.
+	 *
+	 * @return array
+	 */
+	public function getChildren()
+	{
+		$children = [];
+		$notifications = $this->caldavBackend->getNotificationsForPrincipal($this->principalUri);
 
-        foreach ($notifications as $notification) {
-            $children[] = new Node(
-                $this->caldavBackend,
-                $this->principalUri,
-                $notification
-            );
-        }
+		foreach ($notifications as $notification) {
+			$children[] = new Node(
+				$this->caldavBackend,
+				$this->principalUri,
+				$notification
+			);
+		}
 
-        return $children;
-    }
+		return $children;
+	}
 
-    /**
-     * Returns the name of this object.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'notifications';
-    }
+	/**
+	 * Returns the name of this object.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return 'notifications';
+	}
 
-    /**
-     * Returns the owner principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner()
-    {
-        return $this->principalUri;
-    }
+	/**
+	 * Returns the owner principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner()
+	{
+		return $this->principalUri;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Notifications/Node.php

Indentation +78 added lines, -78 removed lines

@@ -22,91 +22,91 @@
  */
 class Node extends DAV\File implements INode, DAVACL\IACL
 {
-    use DAVACL\ACLTrait;
+	use DAVACL\ACLTrait;
 
-    /**
-     * The notification backend.
-     *
-     * @var CalDAV\Backend\NotificationSupport
-     */
-    protected $caldavBackend;
+	/**
+	 * The notification backend.
+	 *
+	 * @var CalDAV\Backend\NotificationSupport
+	 */
+	protected $caldavBackend;
 
-    /**
-     * The actual notification.
-     *
-     * @var NotificationInterface
-     */
-    protected $notification;
+	/**
+	 * The actual notification.
+	 *
+	 * @var NotificationInterface
+	 */
+	protected $notification;
 
-    /**
-     * Owner principal of the notification.
-     *
-     * @var string
-     */
-    protected $principalUri;
+	/**
+	 * Owner principal of the notification.
+	 *
+	 * @var string
+	 */
+	protected $principalUri;
 
-    /**
-     * Constructor.
-     *
-     * @param string $principalUri
-     */
-    public function __construct(CalDAV\Backend\NotificationSupport $caldavBackend, $principalUri, NotificationInterface $notification)
-    {
-        $this->caldavBackend = $caldavBackend;
-        $this->principalUri = $principalUri;
-        $this->notification = $notification;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $principalUri
+	 */
+	public function __construct(CalDAV\Backend\NotificationSupport $caldavBackend, $principalUri, NotificationInterface $notification)
+	{
+		$this->caldavBackend = $caldavBackend;
+		$this->principalUri = $principalUri;
+		$this->notification = $notification;
+	}
 
-    /**
-     * Returns the path name for this notification.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->notification->getId().'.xml';
-    }
+	/**
+	 * Returns the path name for this notification.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->notification->getId().'.xml';
+	}
 
-    /**
-     * Returns the etag for the notification.
-     *
-     * The etag must be surrounded by litteral double-quotes.
-     *
-     * @return string
-     */
-    public function getETag()
-    {
-        return $this->notification->getETag();
-    }
+	/**
+	 * Returns the etag for the notification.
+	 *
+	 * The etag must be surrounded by litteral double-quotes.
+	 *
+	 * @return string
+	 */
+	public function getETag()
+	{
+		return $this->notification->getETag();
+	}
 
-    /**
-     * This method must return an xml element, using the
-     * Sabre\CalDAV\Xml\Notification\NotificationInterface classes.
-     *
-     * @return NotificationInterface
-     */
-    public function getNotificationType()
-    {
-        return $this->notification;
-    }
+	/**
+	 * This method must return an xml element, using the
+	 * Sabre\CalDAV\Xml\Notification\NotificationInterface classes.
+	 *
+	 * @return NotificationInterface
+	 */
+	public function getNotificationType()
+	{
+		return $this->notification;
+	}
 
-    /**
-     * Deletes this notification.
-     */
-    public function delete()
-    {
-        $this->caldavBackend->deleteNotification($this->getOwner(), $this->notification);
-    }
+	/**
+	 * Deletes this notification.
+	 */
+	public function delete()
+	{
+		$this->caldavBackend->deleteNotification($this->getOwner(), $this->notification);
+	}
 
-    /**
-     * Returns the owner principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner()
-    {
-        return $this->principalUri;
-    }
+	/**
+	 * Returns the owner principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner()
+	{
+		return $this->principalUri;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Notifications/INode.php

Indentation +15 added lines, -15 removed lines

@@ -22,20 +22,20 @@
  */
 interface INode
 {
-    /**
-     * This method must return an xml element, using the
-     * Sabre\CalDAV\Xml\Notification\NotificationInterface classes.
-     *
-     * @return NotificationInterface
-     */
-    public function getNotificationType();
+	/**
+	 * This method must return an xml element, using the
+	 * Sabre\CalDAV\Xml\Notification\NotificationInterface classes.
+	 *
+	 * @return NotificationInterface
+	 */
+	public function getNotificationType();
 
-    /**
-     * Returns the etag for the notification.
-     *
-     * The etag must be surrounded by literal double-quotes.
-     *
-     * @return string
-     */
-    public function getETag();
+	/**
+	 * Returns the etag for the notification.
+	 *
+	 * The etag must be surrounded by literal double-quotes.
+	 *
+	 * @return string
+	 */
+	public function getETag();
 }

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

Indentation +316 added lines, -316 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -101,7 +101,7 @@ 
     public function propFindEarly(DAV\PropFind $propFind, DAV\INode $node)
     {
         if ($node instanceof ISharedCalendar) {
-            $propFind->handle('{'.Plugin::NS_CALENDARSERVER.'}invite', function () use ($node) {
+            $propFind->handle('{'.Plugin::NS_CALENDARSERVER.'}invite', function() use ($node) {
                 return new Xml\Property\Invite(
                     $node->getInvites()
                 );
@@ -129,7 +129,7 @@ 
                         break;
                 }
             }
-            $propFind->handle('{'.Plugin::NS_CALENDARSERVER.'}allowed-sharing-modes', function () {
+            $propFind->handle('{'.Plugin::NS_CALENDARSERVER.'}allowed-sharing-modes', function() {
                 return new Xml\Property\AllowedSharingModes(true, false);
             });
         }
@@ -156,7 +156,7 @@ 
         }
 
         if (\Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER === $node->getShareAccess() || \Sabre\DAV\Sharing\Plugin::ACCESS_NOTSHARED === $node->getShareAccess()) {
-            $propPatch->handle('{DAV:}resourcetype', function ($value) use ($node) {
+            $propPatch->handle('{DAV:}resourcetype', function($value) use ($node) {
                 if ($value->is('{'.Plugin::NS_CALENDARSERVER.'}shared-owner')) {
                     return false;
                 }

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

Indentation +17 added lines, -17 removed lines

@@ -19,21 +19,21 @@
  */
 interface ICalendarObjectContainer extends \Sabre\DAV\ICollection
 {
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
-     *
-     * @return array
-     */
-    public function calendarQuery(array $filters);
+	/**
+	 * Performs a calendar-query on the contents of this calendar.
+	 *
+	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
+	 * calendar-query it is possible for a client to request a specific set of
+	 * object, based on contents of iCalendar properties, date-ranges and
+	 * iCalendar component types (VTODO, VEVENT).
+	 *
+	 * This method should just return a list of (relative) urls that match this
+	 * query.
+	 *
+	 * The list of filters are specified as an array. The exact array is
+	 * documented by \Sabre\CalDAV\CalendarQueryParser.
+	 *
+	 * @return array
+	 */
+	public function calendarQuery(array $filters);
 }

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

Indentation +207 added lines, -207 removed lines

@@ -13,211 +13,211 @@
  */
 class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\DAVACL\IACL
 {
-    use \Sabre\DAVACL\ACLTrait;
-
-    /**
-     * Sabre\CalDAV\Backend\BackendInterface.
-     *
-     * @var Backend\AbstractBackend
-     */
-    protected $caldavBackend;
-
-    /**
-     * Array with information about this CalendarObject.
-     *
-     * @var array
-     */
-    protected $objectData;
-
-    /**
-     * Array with information about the containing calendar.
-     *
-     * @var array
-     */
-    protected $calendarInfo;
-
-    /**
-     * Constructor.
-     *
-     * The following properties may be passed within $objectData:
-     *
-     *   * calendarid - This must refer to a calendarid from a caldavBackend
-     *   * uri - A unique uri. Only the 'basename' must be passed.
-     *   * calendardata (optional) - The iCalendar data
-     *   * etag - (optional) The etag for this object, MUST be encloded with
-     *            double-quotes.
-     *   * size - (optional) The size of the data in bytes.
-     *   * lastmodified - (optional) format as a unix timestamp.
-     *   * acl - (optional) Use this to override the default ACL for the node.
-     */
-    public function __construct(Backend\BackendInterface $caldavBackend, array $calendarInfo, array $objectData)
-    {
-        $this->caldavBackend = $caldavBackend;
-
-        if (!isset($objectData['uri'])) {
-            throw new \InvalidArgumentException('The objectData argument must contain an \'uri\' property');
-        }
-
-        $this->calendarInfo = $calendarInfo;
-        $this->objectData = $objectData;
-    }
-
-    /**
-     * Returns the uri for this object.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->objectData['uri'];
-    }
-
-    /**
-     * Returns the ICalendar-formatted object.
-     *
-     * @return string
-     */
-    public function get()
-    {
-        // Pre-populating the 'calendardata' is optional, if we don't have it
-        // already we fetch it from the backend.
-        if (!isset($this->objectData['calendardata'])) {
-            $this->objectData = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
-        }
-
-        return $this->objectData['calendardata'];
-    }
-
-    /**
-     * Updates the ICalendar-formatted object.
-     *
-     * @param string|resource $calendarData
-     *
-     * @return string
-     */
-    public function put($calendarData)
-    {
-        if (is_resource($calendarData)) {
-            $calendarData = stream_get_contents($calendarData);
-        }
-        $etag = $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'], $this->objectData['uri'], $calendarData);
-        $this->objectData['calendardata'] = $calendarData;
-        $this->objectData['etag'] = $etag;
-
-        return $etag;
-    }
-
-    /**
-     * Deletes the calendar object.
-     */
-    public function delete()
-    {
-        $this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
-    }
-
-    /**
-     * Returns the mime content-type.
-     *
-     * @return string
-     */
-    public function getContentType()
-    {
-        $mime = 'text/calendar; charset=utf-8';
-        if (isset($this->objectData['component']) && $this->objectData['component']) {
-            $mime .= '; component='.$this->objectData['component'];
-        }
-
-        return $mime;
-    }
-
-    /**
-     * Returns an ETag for this object.
-     *
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * @return string
-     */
-    public function getETag()
-    {
-        if (isset($this->objectData['etag'])) {
-            return $this->objectData['etag'];
-        } else {
-            return '"'.md5($this->get()).'"';
-        }
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     *
-     * @return int
-     */
-    public function getLastModified()
-    {
-        return $this->objectData['lastmodified'];
-    }
-
-    /**
-     * Returns the size of this object in bytes.
-     *
-     * @return int
-     */
-    public function getSize()
-    {
-        if (array_key_exists('size', $this->objectData)) {
-            return $this->objectData['size'];
-        } else {
-            return strlen($this->get());
-        }
-    }
-
-    /**
-     * Returns the owner principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner()
-    {
-        return $this->calendarInfo['principaluri'];
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL()
-    {
-        // An alternative acl may be specified in the object data.
-        if (isset($this->objectData['acl'])) {
-            return $this->objectData['acl'];
-        }
-
-        // The default ACL
-        return [
-            [
-                'privilege' => '{DAV:}all',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}all',
-                'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-read',
-                'protected' => true,
-            ],
-        ];
-    }
+	use \Sabre\DAVACL\ACLTrait;
+
+	/**
+	 * Sabre\CalDAV\Backend\BackendInterface.
+	 *
+	 * @var Backend\AbstractBackend
+	 */
+	protected $caldavBackend;
+
+	/**
+	 * Array with information about this CalendarObject.
+	 *
+	 * @var array
+	 */
+	protected $objectData;
+
+	/**
+	 * Array with information about the containing calendar.
+	 *
+	 * @var array
+	 */
+	protected $calendarInfo;
+
+	/**
+	 * Constructor.
+	 *
+	 * The following properties may be passed within $objectData:
+	 *
+	 *   * calendarid - This must refer to a calendarid from a caldavBackend
+	 *   * uri - A unique uri. Only the 'basename' must be passed.
+	 *   * calendardata (optional) - The iCalendar data
+	 *   * etag - (optional) The etag for this object, MUST be encloded with
+	 *            double-quotes.
+	 *   * size - (optional) The size of the data in bytes.
+	 *   * lastmodified - (optional) format as a unix timestamp.
+	 *   * acl - (optional) Use this to override the default ACL for the node.
+	 */
+	public function __construct(Backend\BackendInterface $caldavBackend, array $calendarInfo, array $objectData)
+	{
+		$this->caldavBackend = $caldavBackend;
+
+		if (!isset($objectData['uri'])) {
+			throw new \InvalidArgumentException('The objectData argument must contain an \'uri\' property');
+		}
+
+		$this->calendarInfo = $calendarInfo;
+		$this->objectData = $objectData;
+	}
+
+	/**
+	 * Returns the uri for this object.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->objectData['uri'];
+	}
+
+	/**
+	 * Returns the ICalendar-formatted object.
+	 *
+	 * @return string
+	 */
+	public function get()
+	{
+		// Pre-populating the 'calendardata' is optional, if we don't have it
+		// already we fetch it from the backend.
+		if (!isset($this->objectData['calendardata'])) {
+			$this->objectData = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
+		}
+
+		return $this->objectData['calendardata'];
+	}
+
+	/**
+	 * Updates the ICalendar-formatted object.
+	 *
+	 * @param string|resource $calendarData
+	 *
+	 * @return string
+	 */
+	public function put($calendarData)
+	{
+		if (is_resource($calendarData)) {
+			$calendarData = stream_get_contents($calendarData);
+		}
+		$etag = $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'], $this->objectData['uri'], $calendarData);
+		$this->objectData['calendardata'] = $calendarData;
+		$this->objectData['etag'] = $etag;
+
+		return $etag;
+	}
+
+	/**
+	 * Deletes the calendar object.
+	 */
+	public function delete()
+	{
+		$this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'], $this->objectData['uri']);
+	}
+
+	/**
+	 * Returns the mime content-type.
+	 *
+	 * @return string
+	 */
+	public function getContentType()
+	{
+		$mime = 'text/calendar; charset=utf-8';
+		if (isset($this->objectData['component']) && $this->objectData['component']) {
+			$mime .= '; component='.$this->objectData['component'];
+		}
+
+		return $mime;
+	}
+
+	/**
+	 * Returns an ETag for this object.
+	 *
+	 * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+	 *
+	 * @return string
+	 */
+	public function getETag()
+	{
+		if (isset($this->objectData['etag'])) {
+			return $this->objectData['etag'];
+		} else {
+			return '"'.md5($this->get()).'"';
+		}
+	}
+
+	/**
+	 * Returns the last modification date as a unix timestamp.
+	 *
+	 * @return int
+	 */
+	public function getLastModified()
+	{
+		return $this->objectData['lastmodified'];
+	}
+
+	/**
+	 * Returns the size of this object in bytes.
+	 *
+	 * @return int
+	 */
+	public function getSize()
+	{
+		if (array_key_exists('size', $this->objectData)) {
+			return $this->objectData['size'];
+		} else {
+			return strlen($this->get());
+		}
+	}
+
+	/**
+	 * Returns the owner principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner()
+	{
+		return $this->calendarInfo['principaluri'];
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL()
+	{
+		// An alternative acl may be specified in the object data.
+		if (isset($this->objectData['acl'])) {
+			return $this->objectData['acl'];
+		}
+
+		// The default ACL
+		return [
+			[
+				'privilege' => '{DAV:}all',
+				'principal' => $this->calendarInfo['principaluri'],
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}all',
+				'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-write',
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $this->calendarInfo['principaluri'].'/calendar-proxy-read',
+				'protected' => true,
+			],
+		];
+	}
 }