YetiForceCompany / YetiForceCRM

libraries/SabreDAV/CalDAV/CalendarQueryValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      * component we're checking should be specified, not the component to check
      * itself.
      *
-     * @param VObject\Component $parent
+     * @param VObject\Component\VCalendar $parent
      * @param array $filters
      * @return bool
      */

Indentation +351 added lines, -351 removed lines

@@ -20,356 +20,356 @@
  */
 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
-     *
-     * @param VObject\Component $vObject
-     * @param array $filters
-     * @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.
-     *
-     * @param VObject\Component $parent
-     * @param array $filters
-     * @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 ($filter['time-range']) {
-                foreach ($parent->{$filter['name']} as $subComponent) {
-                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['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.
-     *
-     * @param VObject\Component $parent
-     * @param array $filters
-     * @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 ($filter['time-range']) {
-                foreach ($parent->{$filter['name']} as $subComponent) {
-                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['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.
-     *
-     * @param VObject\Property $parent
-     * @param array $filters
-     * @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.
-     * @param array $textMatch
-     * @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 VObject\Node $component
-     * @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 ($component->parent->name === 'VEVENT' && $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 ($expandedEvent->VALARM !== null) {
-                            foreach ($expandedEvent->VALARM as $expandedAlarm) {
-
-                                $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
-                                if ($expandedAlarm->isInTimeRange($start, $end)) {
-                                    return true;
-                                }
-
-                                if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
-                                    // 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);
-                }
-
-            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
+	 *
+	 * @param VObject\Component $vObject
+	 * @param array $filters
+	 * @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.
+	 *
+	 * @param VObject\Component $parent
+	 * @param array $filters
+	 * @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 ($filter['time-range']) {
+				foreach ($parent->{$filter['name']} as $subComponent) {
+					if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['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.
+	 *
+	 * @param VObject\Component $parent
+	 * @param array $filters
+	 * @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 ($filter['time-range']) {
+				foreach ($parent->{$filter['name']} as $subComponent) {
+					if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['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.
+	 *
+	 * @param VObject\Property $parent
+	 * @param array $filters
+	 * @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.
+	 * @param array $textMatch
+	 * @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 VObject\Node $component
+	 * @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 ($component->parent->name === 'VEVENT' && $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 ($expandedEvent->VALARM !== null) {
+							foreach ($expandedEvent->VALARM as $expandedAlarm) {
+
+								$effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
+								if ($expandedAlarm->isInTimeRange($start, $end)) {
+									return true;
+								}
+
+								if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
+									// 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);
+				}
+
+			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');
+
+		}
+
+	}
 
 }

libraries/SabreDAV/CalDAV/Schedule/Plugin.php

Doc Comments +4 added lines, -4 removed lines

@@ -69,7 +69,7 @@ 
     /**
      * Returns a list of features for the DAV: HTTP header.
      *
-     * @return array
+     * @return string[]
      */
     public function getFeatures() {
 
@@ -160,7 +160,7 @@ 
      *
      * @param RequestInterface $request
      * @param ResponseInterface $response
-     * @return bool
+     * @return null|false
      */
     public function httpPost(RequestInterface $request, ResponseInterface $response) {
 
@@ -364,7 +364,7 @@ 
     /**
      * This method is responsible for delivering the ITip message.
      *
-     * @param ITip\Message $itipMessage
+     * @param ITip\Message $iTipMessage
      * @return void
      */
     public function deliver(ITip\Message $iTipMessage) {
@@ -717,7 +717,7 @@ 
      * returning it's result.
      *
      * @param IOutbox $outbox
-     * @param VObject\Component $vObject
+     * @param VObject\Document $vObject
      * @param RequestInterface $request
      * @param ResponseInterface $response
      * @return string

Indentation +927 added lines, -927 removed lines

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

libraries/SabreDAV/VObject/Parser/XML.php

Doc Comments +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
     /**
      * Parse a xCard component.
      *
-     * @param Component $parentComponent
+     * @param VCard $parentComponent
      *
      * @return void
      */

Indentation +361 added lines, -361 removed lines

@@ -20,409 +20,409 @@
  */
 class XML extends Parser {
 
-    const XCAL_NAMESPACE  = 'urn:ietf:params:xml:ns:icalendar-2.0';
-    const XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0';
-
-    /**
-     * The input data.
-     *
-     * @var array
-     */
-    protected $input;
-
-    /**
-     * A pointer/reference to the input.
-     *
-     * @var array
-     */
-    private $pointer;
-
-    /**
-     * Document, root component.
-     *
-     * @var Sabre\VObject\Document
-     */
-    protected $root;
-
-    /**
-     * Creates the parser.
-     *
-     * Optionally, it's possible to parse the input stream here.
-     *
-     * @param mixed $input
-     * @param int $options Any parser options (OPTION constants).
-     *
-     * @return void
-     */
-    public function __construct($input = null, $options = 0) {
-
-        if (0 === $options) {
-            $options = parent::OPTION_FORGIVING;
-        }
-
-        parent::__construct($input, $options);
-
-    }
-
-    /**
-     * Parse xCal or xCard.
-     *
-     * @param resource|string $input
-     * @param int $options
-     *
-     * @throws \Exception
-     *
-     * @return Sabre\VObject\Document
-     */
-    public function parse($input = null, $options = 0) {
-
-        if (!is_null($input)) {
-            $this->setInput($input);
-        }
-
-        if (0 !== $options) {
-            $this->options = $options;
-        }
-
-        if (is_null($this->input)) {
-            throw new EofException('End of input stream, or no input supplied');
-        }
-
-        switch ($this->input['name']) {
-
-            case '{' . self::XCAL_NAMESPACE . '}icalendar':
-                $this->root = new VCalendar([], false);
-                $this->pointer = &$this->input['value'][0];
-                $this->parseVCalendarComponents($this->root);
-                break;
-
-            case '{' . self::XCARD_NAMESPACE . '}vcards':
-                foreach ($this->input['value'] as &$vCard) {
-
-                    $this->root = new VCard(['version' => '4.0'], false);
-                    $this->pointer  = &$vCard;
-                    $this->parseVCardComponents($this->root);
-
-                    // We just parse the first <vcard /> element.
-                    break;
-
-                }
-                break;
-
-            default:
-                throw new ParseException('Unsupported XML standard');
-
-        }
-
-        return $this->root;
-    }
-
-    /**
-     * Parse a xCalendar component.
-     *
-     * @param Component $parentComponent
-     *
-     * @return void
-     */
-    protected function parseVCalendarComponents(Component $parentComponent) {
-
-        foreach ($this->pointer['value'] ?: [] as $children) {
-
-            switch (static::getTagName($children['name'])) {
-
-                case 'properties':
-                    $this->pointer = &$children['value'];
-                    $this->parseProperties($parentComponent);
-                    break;
-
-                case 'components':
-                    $this->pointer = &$children;
-                    $this->parseComponent($parentComponent);
-                    break;
-            }
-        }
+	const XCAL_NAMESPACE  = 'urn:ietf:params:xml:ns:icalendar-2.0';
+	const XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0';
+
+	/**
+	 * The input data.
+	 *
+	 * @var array
+	 */
+	protected $input;
+
+	/**
+	 * A pointer/reference to the input.
+	 *
+	 * @var array
+	 */
+	private $pointer;
+
+	/**
+	 * Document, root component.
+	 *
+	 * @var Sabre\VObject\Document
+	 */
+	protected $root;
+
+	/**
+	 * Creates the parser.
+	 *
+	 * Optionally, it's possible to parse the input stream here.
+	 *
+	 * @param mixed $input
+	 * @param int $options Any parser options (OPTION constants).
+	 *
+	 * @return void
+	 */
+	public function __construct($input = null, $options = 0) {
+
+		if (0 === $options) {
+			$options = parent::OPTION_FORGIVING;
+		}
+
+		parent::__construct($input, $options);
+
+	}
+
+	/**
+	 * Parse xCal or xCard.
+	 *
+	 * @param resource|string $input
+	 * @param int $options
+	 *
+	 * @throws \Exception
+	 *
+	 * @return Sabre\VObject\Document
+	 */
+	public function parse($input = null, $options = 0) {
+
+		if (!is_null($input)) {
+			$this->setInput($input);
+		}
+
+		if (0 !== $options) {
+			$this->options = $options;
+		}
+
+		if (is_null($this->input)) {
+			throw new EofException('End of input stream, or no input supplied');
+		}
+
+		switch ($this->input['name']) {
+
+			case '{' . self::XCAL_NAMESPACE . '}icalendar':
+				$this->root = new VCalendar([], false);
+				$this->pointer = &$this->input['value'][0];
+				$this->parseVCalendarComponents($this->root);
+				break;
+
+			case '{' . self::XCARD_NAMESPACE . '}vcards':
+				foreach ($this->input['value'] as &$vCard) {
+
+					$this->root = new VCard(['version' => '4.0'], false);
+					$this->pointer  = &$vCard;
+					$this->parseVCardComponents($this->root);
+
+					// We just parse the first <vcard /> element.
+					break;
+
+				}
+				break;
+
+			default:
+				throw new ParseException('Unsupported XML standard');
+
+		}
+
+		return $this->root;
+	}
+
+	/**
+	 * Parse a xCalendar component.
+	 *
+	 * @param Component $parentComponent
+	 *
+	 * @return void
+	 */
+	protected function parseVCalendarComponents(Component $parentComponent) {
+
+		foreach ($this->pointer['value'] ?: [] as $children) {
+
+			switch (static::getTagName($children['name'])) {
+
+				case 'properties':
+					$this->pointer = &$children['value'];
+					$this->parseProperties($parentComponent);
+					break;
+
+				case 'components':
+					$this->pointer = &$children;
+					$this->parseComponent($parentComponent);
+					break;
+			}
+		}
 
-    }
+	}
 
-    /**
-     * Parse a xCard component.
-     *
-     * @param Component $parentComponent
-     *
-     * @return void
-     */
-    protected function parseVCardComponents(Component $parentComponent) {
+	/**
+	 * Parse a xCard component.
+	 *
+	 * @param Component $parentComponent
+	 *
+	 * @return void
+	 */
+	protected function parseVCardComponents(Component $parentComponent) {
 
-        $this->pointer = &$this->pointer['value'];
-        $this->parseProperties($parentComponent);
+		$this->pointer = &$this->pointer['value'];
+		$this->parseProperties($parentComponent);
 
-    }
+	}
 
-    /**
-     * Parse xCalendar and xCard properties.
-     *
-     * @param Component $parentComponent
-     * @param string  $propertyNamePrefix
-     *
-     * @return void
-     */
-    protected function parseProperties(Component $parentComponent, $propertyNamePrefix = '') {
+	/**
+	 * Parse xCalendar and xCard properties.
+	 *
+	 * @param Component $parentComponent
+	 * @param string  $propertyNamePrefix
+	 *
+	 * @return void
+	 */
+	protected function parseProperties(Component $parentComponent, $propertyNamePrefix = '') {
 
-        foreach ($this->pointer ?: [] as $xmlProperty) {
+		foreach ($this->pointer ?: [] as $xmlProperty) {
 
-            list($namespace, $tagName) = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
+			list($namespace, $tagName) = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
 
-            $propertyName       = $tagName;
-            $propertyValue      = [];
-            $propertyParameters = [];
-            $propertyType       = 'text';
+			$propertyName       = $tagName;
+			$propertyValue      = [];
+			$propertyParameters = [];
+			$propertyType       = 'text';
 
-            // A property which is not part of the standard.
-            if ($namespace !== self::XCAL_NAMESPACE
-                && $namespace !== self::XCARD_NAMESPACE) {
+			// A property which is not part of the standard.
+			if ($namespace !== self::XCAL_NAMESPACE
+				&& $namespace !== self::XCARD_NAMESPACE) {
 
-                $propertyName = 'xml';
-                $value = '<' . $tagName . ' xmlns="' . $namespace . '"';
+				$propertyName = 'xml';
+				$value = '<' . $tagName . ' xmlns="' . $namespace . '"';
 
-                foreach ($xmlProperty['attributes'] as $attributeName => $attributeValue) {
-                    $value .= ' ' . $attributeName . '="' . str_replace('"', '\"', $attributeValue) . '"';
-                }
+				foreach ($xmlProperty['attributes'] as $attributeName => $attributeValue) {
+					$value .= ' ' . $attributeName . '="' . str_replace('"', '\"', $attributeValue) . '"';
+				}
 
-                $value .= '>' . $xmlProperty['value'] . '</' . $tagName . '>';
+				$value .= '>' . $xmlProperty['value'] . '</' . $tagName . '>';
 
-                $propertyValue = [$value];
+				$propertyValue = [$value];
 
-                $this->createProperty(
-                    $parentComponent,
-                    $propertyName,
-                    $propertyParameters,
-                    $propertyType,
-                    $propertyValue
-                );
+				$this->createProperty(
+					$parentComponent,
+					$propertyName,
+					$propertyParameters,
+					$propertyType,
+					$propertyValue
+				);
 
-                continue;
-            }
+				continue;
+			}
 
-            // xCard group.
-            if ($propertyName === 'group') {
+			// xCard group.
+			if ($propertyName === 'group') {
 
-                if (!isset($xmlProperty['attributes']['name'])) {
-                    continue;
-                }
+				if (!isset($xmlProperty['attributes']['name'])) {
+					continue;
+				}
 
-                $this->pointer = &$xmlProperty['value'];
-                $this->parseProperties(
-                    $parentComponent,
-                    strtoupper($xmlProperty['attributes']['name']) . '.'
-                );
+				$this->pointer = &$xmlProperty['value'];
+				$this->parseProperties(
+					$parentComponent,
+					strtoupper($xmlProperty['attributes']['name']) . '.'
+				);
 
-                continue;
+				continue;
 
-            }
+			}
 
-            // Collect parameters.
-            foreach ($xmlProperty['value'] as $i => $xmlPropertyChild) {
+			// Collect parameters.
+			foreach ($xmlProperty['value'] as $i => $xmlPropertyChild) {
 
-                if (!is_array($xmlPropertyChild)
-                    || 'parameters' !== static::getTagName($xmlPropertyChild['name']))
-                    continue;
+				if (!is_array($xmlPropertyChild)
+					|| 'parameters' !== static::getTagName($xmlPropertyChild['name']))
+					continue;
 
-                $xmlParameters = $xmlPropertyChild['value'];
+				$xmlParameters = $xmlPropertyChild['value'];
 
-                foreach ($xmlParameters as $xmlParameter) {
+				foreach ($xmlParameters as $xmlParameter) {
 
-                    $propertyParameterValues = [];
+					$propertyParameterValues = [];
 
-                    foreach ($xmlParameter['value'] as $xmlParameterValues) {
-                        $propertyParameterValues[] = $xmlParameterValues['value'];
-                    }
+					foreach ($xmlParameter['value'] as $xmlParameterValues) {
+						$propertyParameterValues[] = $xmlParameterValues['value'];
+					}
 
-                    $propertyParameters[static::getTagName($xmlParameter['name'])]
-                        = implode(',', $propertyParameterValues);
+					$propertyParameters[static::getTagName($xmlParameter['name'])]
+						= implode(',', $propertyParameterValues);
 
-                }
+				}
 
-                array_splice($xmlProperty['value'], $i, 1);
+				array_splice($xmlProperty['value'], $i, 1);
 
-            }
+			}
 
-            $propertyNameExtended = ($this->root instanceof VCalendar
-                                      ? 'xcal'
-                                      : 'xcard') . ':' . $propertyName;
+			$propertyNameExtended = ($this->root instanceof VCalendar
+									  ? 'xcal'
+									  : 'xcard') . ':' . $propertyName;
 
-            switch ($propertyNameExtended) {
+			switch ($propertyNameExtended) {
 
-                case 'xcal:geo':
-                    $propertyType               = 'float';
-                    $propertyValue['latitude']  = 0;
-                    $propertyValue['longitude'] = 0;
+				case 'xcal:geo':
+					$propertyType               = 'float';
+					$propertyValue['latitude']  = 0;
+					$propertyValue['longitude'] = 0;
 
-                    foreach ($xmlProperty['value'] as $xmlRequestChild) {
-                        $propertyValue[static::getTagName($xmlRequestChild['name'])]
-                            = $xmlRequestChild['value'];
-                    }
-                    break;
+					foreach ($xmlProperty['value'] as $xmlRequestChild) {
+						$propertyValue[static::getTagName($xmlRequestChild['name'])]
+							= $xmlRequestChild['value'];
+					}
+					break;
 
-                case 'xcal:request-status':
-                    $propertyType = 'text';
+				case 'xcal:request-status':
+					$propertyType = 'text';
 
-                    foreach ($xmlProperty['value'] as $xmlRequestChild) {
-                        $propertyValue[static::getTagName($xmlRequestChild['name'])]
-                            = $xmlRequestChild['value'];
-                    }
-                    break;
+					foreach ($xmlProperty['value'] as $xmlRequestChild) {
+						$propertyValue[static::getTagName($xmlRequestChild['name'])]
+							= $xmlRequestChild['value'];
+					}
+					break;
 
-                case 'xcal:freebusy':
-                    $propertyType = 'freebusy';
-                    // We don't break because we only want to set
-                    // another property type.
+				case 'xcal:freebusy':
+					$propertyType = 'freebusy';
+					// We don't break because we only want to set
+					// another property type.
 
-                case 'xcal:categories':
-                case 'xcal:resources':
-                case 'xcal:exdate':
-                    foreach ($xmlProperty['value'] as $specialChild) {
-                        $propertyValue[static::getTagName($specialChild['name'])]
-                            = $specialChild['value'];
-                    }
-                    break;
+				case 'xcal:categories':
+				case 'xcal:resources':
+				case 'xcal:exdate':
+					foreach ($xmlProperty['value'] as $specialChild) {
+						$propertyValue[static::getTagName($specialChild['name'])]
+							= $specialChild['value'];
+					}
+					break;
 
-                case 'xcal:rdate':
-                    $propertyType = 'date-time';
+				case 'xcal:rdate':
+					$propertyType = 'date-time';
 
-                    foreach ($xmlProperty['value'] as $specialChild) {
-
-                        $tagName = static::getTagName($specialChild['name']);
-
-                        if ('period' === $tagName) {
-
-                            $propertyParameters['value'] = 'PERIOD';
-                            $propertyValue[]             = implode('/', $specialChild['value']);
+					foreach ($xmlProperty['value'] as $specialChild) {
+
+						$tagName = static::getTagName($specialChild['name']);
+
+						if ('period' === $tagName) {
+
+							$propertyParameters['value'] = 'PERIOD';
+							$propertyValue[]             = implode('/', $specialChild['value']);
 
-                        }
-                        else {
-                            $propertyValue[] = $specialChild['value'];
-                        }
-                    }
-                    break;
-
-                default:
-                    $propertyType  = static::getTagName($xmlProperty['value'][0]['name']);
+						}
+						else {
+							$propertyValue[] = $specialChild['value'];
+						}
+					}
+					break;
+
+				default:
+					$propertyType  = static::getTagName($xmlProperty['value'][0]['name']);
 
-                    foreach ($xmlProperty['value'] as $value) {
-                        $propertyValue[] = $value['value'];
-                    }
+					foreach ($xmlProperty['value'] as $value) {
+						$propertyValue[] = $value['value'];
+					}
 
-                    if ('date' === $propertyType) {
-                        $propertyParameters['value'] = 'DATE';
-                    }
-                    break;
-            }
+					if ('date' === $propertyType) {
+						$propertyParameters['value'] = 'DATE';
+					}
+					break;
+			}
 
-            $this->createProperty(
-                $parentComponent,
-                $propertyNamePrefix . $propertyName,
-                $propertyParameters,
-                $propertyType,
-                $propertyValue
-            );
-
-        }
-
-    }
-
-    /**
-     * Parse a component.
-     *
-     * @param Component $parentComponent
-     *
-     * @return void
-     */
-    protected function parseComponent(Component $parentComponent) {
-
-        $components = $this->pointer['value'] ?: [];
-
-        foreach ($components as $component) {
-
-            $componentName    = static::getTagName($component['name']);
-            $currentComponent = $this->root->createComponent(
-                $componentName,
-                null,
-                false
-            );
-
-            $this->pointer = &$component;
-            $this->parseVCalendarComponents($currentComponent);
-
-            $parentComponent->add($currentComponent);
-
-        }
-
-    }
-
-    /**
-     * Create a property.
-     *
-     * @param Component $parentComponent
-     * @param string $name
-     * @param array $parameters
-     * @param string $type
-     * @param mixed $value
-     *
-     * @return void
-     */
-    protected function createProperty(Component $parentComponent, $name, $parameters, $type, $value) {
-
-        $property = $this->root->createProperty(
-            $name,
-            null,
-            $parameters,
-            $type
-        );
-        $parentComponent->add($property);
-        $property->setXmlValue($value);
-
-    }
-
-    /**
-     * Sets the input data.
-     *
-     * @param resource|string $input
-     *
-     * @return void
-     */
-    public function setInput($input) {
-
-        if (is_resource($input)) {
-            $input = stream_get_contents($input);
-        }
-
-        if (is_string($input)) {
-
-            $reader = new SabreXml\Reader();
-            $reader->elementMap['{' . self::XCAL_NAMESPACE . '}period']
-                = 'Sabre\VObject\Parser\XML\Element\KeyValue';
-            $reader->elementMap['{' . self::XCAL_NAMESPACE . '}recur']
-                = 'Sabre\VObject\Parser\XML\Element\KeyValue';
-            $reader->xml($input);
-            $input  = $reader->parse();
-
-        }
-
-        $this->input = $input;
-
-    }
-
-    /**
-     * Get tag name from a Clark notation.
-     *
-     * @param string $clarkedTagName
-     *
-     * @return string
-     */
-    protected static function getTagName($clarkedTagName) {
-
-        list(, $tagName) = SabreXml\Service::parseClarkNotation($clarkedTagName);
-        return $tagName;
-
-    }
+			$this->createProperty(
+				$parentComponent,
+				$propertyNamePrefix . $propertyName,
+				$propertyParameters,
+				$propertyType,
+				$propertyValue
+			);
+
+		}
+
+	}
+
+	/**
+	 * Parse a component.
+	 *
+	 * @param Component $parentComponent
+	 *
+	 * @return void
+	 */
+	protected function parseComponent(Component $parentComponent) {
+
+		$components = $this->pointer['value'] ?: [];
+
+		foreach ($components as $component) {
+
+			$componentName    = static::getTagName($component['name']);
+			$currentComponent = $this->root->createComponent(
+				$componentName,
+				null,
+				false
+			);
+
+			$this->pointer = &$component;
+			$this->parseVCalendarComponents($currentComponent);
+
+			$parentComponent->add($currentComponent);
+
+		}
+
+	}
+
+	/**
+	 * Create a property.
+	 *
+	 * @param Component $parentComponent
+	 * @param string $name
+	 * @param array $parameters
+	 * @param string $type
+	 * @param mixed $value
+	 *
+	 * @return void
+	 */
+	protected function createProperty(Component $parentComponent, $name, $parameters, $type, $value) {
+
+		$property = $this->root->createProperty(
+			$name,
+			null,
+			$parameters,
+			$type
+		);
+		$parentComponent->add($property);
+		$property->setXmlValue($value);
+
+	}
+
+	/**
+	 * Sets the input data.
+	 *
+	 * @param resource|string $input
+	 *
+	 * @return void
+	 */
+	public function setInput($input) {
+
+		if (is_resource($input)) {
+			$input = stream_get_contents($input);
+		}
+
+		if (is_string($input)) {
+
+			$reader = new SabreXml\Reader();
+			$reader->elementMap['{' . self::XCAL_NAMESPACE . '}period']
+				= 'Sabre\VObject\Parser\XML\Element\KeyValue';
+			$reader->elementMap['{' . self::XCAL_NAMESPACE . '}recur']
+				= 'Sabre\VObject\Parser\XML\Element\KeyValue';
+			$reader->xml($input);
+			$input  = $reader->parse();
+
+		}
+
+		$this->input = $input;
+
+	}
+
+	/**
+	 * Get tag name from a Clark notation.
+	 *
+	 * @param string $clarkedTagName
+	 *
+	 * @return string
+	 */
+	protected static function getTagName($clarkedTagName) {
+
+		list(, $tagName) = SabreXml\Service::parseClarkNotation($clarkedTagName);
+		return $tagName;
+
+	}
 }

libraries/restler/restler.php

Indentation +1299 added lines, -1299 removed lines

@@ -16,883 +16,883 @@ 
  */
 class Restler
 {
-    // ==================================================================
-    //
-    // Public variables
-    //
-    // ------------------------------------------------------------------
-
-    const VERSION = '2.2.1';
-
-    /**
-     * URL of the currently mapped service
-     * @var string
-     */
-    public $url;
-
-    /**
-     * Http request method of the current request.
-     * Any value between [GET, PUT, POST, DELETE]
-     * @var string
-     */
-    public $request_method;
-
-    /**
-     * Requested data format. Instance of the current format class
-     * which implements the iFormat interface
-     * @var iFormat
-     * @example jsonFormat, xmlFormat, yamlFormat etc
-     */
-    public $request_format;
-
-    /**
-     * Data sent to the service
-     * @var array
-     */
-    public $request_data = array();
-
-    /**
-     * Used in production mode to store the URL Map to disk
-     * @var string
-     */
-    public $cache_dir;
-
-    /**
-     * base directory to locate format and auth files
-     * @var string
-     */
-    public $base_dir;
-
-    /**
-     * Name of an iRespond implementation class
-     * @var string
-     */
-    public $response = 'DefaultResponse';
-
-    /**
-     * Response data format. Instance of the current format class
-     * which implements the iFormat interface
-     * @var iFormat
-     * @example jsonFormat, xmlFormat, yamlFormat etc
-     */
-    public $response_format;
-
-    // ==================================================================
-    //
-    // Private & Protected variables
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * When set to false, it will run in debug mode and parse the
-     * class files every time to map it to the URL
-     * @var boolean
-     */
-    protected $production_mode;
-
-    /**
-     * Associated array that maps urls to their respective class and method
-     * @var array
-     */
-    protected $routes = array();
-
-    /**
-     * Associated array that maps formats to their respective format class name
-     * @var array
-     */
-    protected $format_map = array();
-
-    /**
-     * Instance of the current api service class
-     * @var object
-     */
-    protected $service_class_instance;
-
-    /**
-     * Name of the api method being called
-     * @var string
-     */
-    protected $service_method;
-
-    /**
-     * list of authentication classes
-     * @var array
-     */
-    protected $auth_classes = array();
-
-    /**
-     * list of error handling classes
-     * @var array
-     */
-    protected $error_classes = array();
-
-    /**
-     * HTTP status codes
-     * @var array
-     */
-    private $codes = array(
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        306 => '(Unused)',
-        307 => 'Temporary Redirect',
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported'
-    );
-
-    /**
-     * Caching of url map is enabled or not
-     * @var boolean
-     */
-    protected $cached;
-
-    // ==================================================================
-    //
-    // Public functions
-    //
-    // ------------------------------------------------------------------
-
-
-    /**
-     * Constructor
-     * @param boolean $production_mode When set to false, it will run in
-     * debug mode and parse the class files every time to map it to the URL
-     */
-    public function __construct($production_mode = false)
-    {
-        $this->production_mode = $production_mode;
-        $this->cache_dir = getcwd();
-        $this->base_dir = RESTLER_PATH;
-    }
-
-
-    /**
-     * Store the url map cache if needed
-     */
-    public function __destruct()
-    {
-        if ($this->production_mode && !($this->cached)) {
-            $this->saveCache();
-        }
-    }
-
-
-    /**
-     * Use it in production mode to refresh the url map cache
-     */
-    public function refreshCache()
-    {
-        $this->routes = array();
-        $this->cached = false;
-    }
-
-
-    /**
-     * Call this method and pass all the formats that should be
-     * supported by the API. Accepts multiple parameters
-     * @param string class name of the format class that implements iFormat
-     * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
-     */
-    public function setSupportedFormats()
-    {
-        $args = func_get_args();
-        $extensions = array();
-        foreach ($args as $class_name) {
-            if (!is_string($class_name) || !class_exists($class_name)) {
-                throw new Exception("$class_name is not a vaild Format Class.");
-            }
-            $obj = new $class_name;
-            if (!($obj instanceof iFormat)) {
-                throw new Exception('Invalid format class; must implement '
-                    . 'iFormat interface');
-            }
-            foreach ($obj->getMIMEMap() as $extension => $mime) {
-                if (!isset($this->format_map[$extension])) {
-                    $this->format_map[$extension] = $class_name;
-                }
-                $mime = explode(',', $mime);
-                if (!is_array($mime)) {
-                    $mime = array($mime);
-                }
-                foreach ($mime as $value) {
-                    if (!isset($this->format_map[$value])) {
-                        $this->format_map[$value] = $class_name;
-                    }
-                }
-                $extensions[".$extension"] = true;
-            }
-        }
-        $this->format_map['default'] = $args[0];
-        $this->format_map['extensions'] = array_keys($extensions);
-    }
-
-
-    /**
-     * Add api classes throgh this method. All the public methods
-     * that do not start with _ (underscore) will be  will be exposed
-     * as the public api by default.
-     *
-     * All the protected methods that do not start with _ (underscore)
-     * will exposed as protected api which will require authentication
-     * @param string $class name of the service class
-     * @param string $basePath optional url prefix for mapping, uses
-     * lowercase version of the class name when not specified
-     * @throws Exception when supplied with invalid class name
-     */
-    public function addAPIClass($class_name, $base_path = null)
-    {
-        if (!class_exists($class_name)) {
-            throw new Exception("API class $class_name is missing.");
-        }
-        $this->loadCache();
-        if (!$this->cached) {
-            if (is_null($base_path)) {
-                $base_path = strtolower($class_name);
-                $index = strrpos($class_name, '\\');
-                if ($index !== false) {
-                    $base_path = substr($base_path, $index + 1);
-                }
-            } else {
-                $base_path = trim($base_path, '/');
-            }
-            if (strlen($base_path) > 0) {
-                $base_path .= '/';
-            }
-            $this->generateMap($class_name, $base_path);
-        }
-    }
-
-
-    /**
-     * protected methods will need atleast one authentication class to be set
-     * in order to allow that method to be executed
-     * @param string $class_name of the authentication class
-     * @param string $base_path optional url prefix for mapping
-     */
-    public function addAuthenticationClass($class_name, $base_path = null)
-    {
-        $this->auth_classes[] = $class_name;
-        $this->addAPIClass($class_name, $base_path);
-    }
-
-
-    /**
-     * Add class for custom error handling
-     * @param string $class_name of the error handling class
-     */
-    public function addErrorClass($class_name)
-    {
-        $this->error_classes[] = $class_name;
-    }
-
-
-    /**
-     * Convenience method to respond with an error message
-     * @param int $statusCode http error code
-     * @param string $errorMessage optional custom error message
-     */
-    public function handleError($status_code, $error_message = null)
-    {
-        $method = "handle$status_code";
-        $handled = false;
-        foreach ($this->error_classes as $class_name) {
-            if (method_exists($class_name, $method)) {
-                $obj = new $class_name();
-                $obj->restler = $this;
-                $obj->$method();
-                $handled = true;
-            }
-        }
-        if ($handled) {
-            return;
-        }
-        $message = $this->codes[$status_code]
-            . (!$error_message ? '' : ': ' . $error_message);
-        $this->setStatus($status_code);
-        $responder = new $this->response();
-        $responder->restler = $this;
-        $this->sendData($responder->__formatError($status_code, $message));
-    }
-
-
-    /**
-     * An initialize function to allow use of the restler error generation 
-     * functions for pre-processing and pre-routing of requests.
-     */
-    public function init()
-    {
-        if (empty($this->format_map)) {
-            $this->setSupportedFormats('JsonFormat');
-        }
-        $this->url = $this->getPath();
-        $this->request_method = $this->getRequestMethod();
-        $this->response_format = $this->getResponseFormat();
-        $this->request_format = $this->getRequestFormat();
-        if (is_null($this->request_format)) {
-            $this->request_format = $this->response_format;
-        }
-        if ($this->request_method == 'PUT' || $this->request_method == 'POST') {
-            $this->request_data = $this->getRequestData();
-        }
-    }
-
-
-    /**
-     * Main function for processing the api request
-     * and return the response
-     * @throws Exception when the api service class is missing
-     * @throws RestException to send error response
-     */
-    public function handle()
-    {
-        $this->init();
-        $o = $this->mapUrlToMethod();
-
-        if (!isset($o->class_name)) {
-            $this->handleError(404);
-        } else {
-            try {
-                if ($o->method_flag) {
-                    $auth_method = '__isAuthenticated';
-                    if (!count($this->auth_classes)) {
-                        throw new RestException(401);
-                    }
-                    foreach ($this->auth_classes as $auth_class) {
-                        $auth_obj = new $auth_class();
-                        $auth_obj->restler = $this;
-                        $this->applyClassMetadata($auth_class, $auth_obj, $o);
-                        if (!method_exists($auth_obj, $auth_method)) {
-                            throw new RestException(401, 'Authentication Class '
-                                . 'should implement iAuthenticate');
-                        } else if (!$auth_obj->$auth_method()) {
-                            throw new RestException(401);
-                        }
-                    }
-                }
-                $this->applyClassMetadata(get_class($this->request_format),
-                    $this->request_format, $o);
-                $pre_process = '_' . $this->request_format->getExtension() . '_'
-                    . $o->method_name;
-                $this->service_method = $o->method_name;
-                if ($o->method_flag == 2) {
-                    $o = unprotect($o);
-                }
-                $object = $this->service_class_instance = new $o->class_name();
-                $object->restler = $this;
-                if (method_exists($o->class_name, $pre_process)) {
-                    call_user_func_array(
-                        array($object, $pre_process), $o->arguments
-                    );
-                }
-                switch ($o->method_flag) {
-                    case 3:
-                        $reflection_method = new ReflectionMethod($object,
-                                $o->method_name);
-                        $reflection_method->setAccessible(true);
-                        $result = $reflection_method->invokeArgs($object,
-                            $o->arguments);
-                        break;
-                    case 2:
-                    case 1:
-                    default:
-                        $result = call_user_func_array(array(
-                            $object,
-                            $o->method_name), $o->arguments
-                        );
-                        break;
-                }
-            } catch (RestException $e) {
-                $this->handleError($e->getCode(), $e->getMessage());
-            }
-        }
-        $responder = new $this->response();
-        $responder->restler = $this;
-        $this->applyClassMetadata($this->response, $responder, $o);
-        if (isset($result) && $result !== null) {
-            $result = $responder->__formatResponse($result);
-            $this->sendData($result);
-        }
-    }
-
-
-    /**
-     * Encodes the response in the prefered format
-     * and sends back
-     * @param $data array php data
-     */
-    public function sendData($data)
-    {
-        $data = $this->response_format->encode($data, 
-            !($this->production_mode)
-        );
-        $post_process = '_' . $this->service_method . '_'
-            . $this->response_format->getExtension();
-        if (isset($this->service_class_instance)
-            && method_exists($this->service_class_instance, $post_process)
-        ) {
-            $data = call_user_func(array($this->service_class_instance,
-                $post_process), $data);
-        }
-        header("Cache-Control: no-cache, must-revalidate");
-        header("Expires: 0");
-        header('Content-Type: ' . $this->response_format->getMIME());
-        //.'; charset=utf-8');
-        header("X-Powered-By: Luracast Restler v" . Restler::VERSION);
+	// ==================================================================
+	//
+	// Public variables
+	//
+	// ------------------------------------------------------------------
+
+	const VERSION = '2.2.1';
+
+	/**
+	 * URL of the currently mapped service
+	 * @var string
+	 */
+	public $url;
+
+	/**
+	 * Http request method of the current request.
+	 * Any value between [GET, PUT, POST, DELETE]
+	 * @var string
+	 */
+	public $request_method;
+
+	/**
+	 * Requested data format. Instance of the current format class
+	 * which implements the iFormat interface
+	 * @var iFormat
+	 * @example jsonFormat, xmlFormat, yamlFormat etc
+	 */
+	public $request_format;
+
+	/**
+	 * Data sent to the service
+	 * @var array
+	 */
+	public $request_data = array();
+
+	/**
+	 * Used in production mode to store the URL Map to disk
+	 * @var string
+	 */
+	public $cache_dir;
+
+	/**
+	 * base directory to locate format and auth files
+	 * @var string
+	 */
+	public $base_dir;
+
+	/**
+	 * Name of an iRespond implementation class
+	 * @var string
+	 */
+	public $response = 'DefaultResponse';
+
+	/**
+	 * Response data format. Instance of the current format class
+	 * which implements the iFormat interface
+	 * @var iFormat
+	 * @example jsonFormat, xmlFormat, yamlFormat etc
+	 */
+	public $response_format;
+
+	// ==================================================================
+	//
+	// Private & Protected variables
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * When set to false, it will run in debug mode and parse the
+	 * class files every time to map it to the URL
+	 * @var boolean
+	 */
+	protected $production_mode;
+
+	/**
+	 * Associated array that maps urls to their respective class and method
+	 * @var array
+	 */
+	protected $routes = array();
+
+	/**
+	 * Associated array that maps formats to their respective format class name
+	 * @var array
+	 */
+	protected $format_map = array();
+
+	/**
+	 * Instance of the current api service class
+	 * @var object
+	 */
+	protected $service_class_instance;
+
+	/**
+	 * Name of the api method being called
+	 * @var string
+	 */
+	protected $service_method;
+
+	/**
+	 * list of authentication classes
+	 * @var array
+	 */
+	protected $auth_classes = array();
+
+	/**
+	 * list of error handling classes
+	 * @var array
+	 */
+	protected $error_classes = array();
+
+	/**
+	 * HTTP status codes
+	 * @var array
+	 */
+	private $codes = array(
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authoritative Information',
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found',
+		303 => 'See Other',
+		304 => 'Not Modified',
+		305 => 'Use Proxy',
+		306 => '(Unused)',
+		307 => 'Temporary Redirect',
+		400 => 'Bad Request',
+		401 => 'Unauthorized',
+		402 => 'Payment Required',
+		403 => 'Forbidden',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+		406 => 'Not Acceptable',
+		407 => 'Proxy Authentication Required',
+		408 => 'Request Timeout',
+		409 => 'Conflict',
+		410 => 'Gone',
+		411 => 'Length Required',
+		412 => 'Precondition Failed',
+		413 => 'Request Entity Too Large',
+		414 => 'Request-URI Too Long',
+		415 => 'Unsupported Media Type',
+		416 => 'Requested Range Not Satisfiable',
+		417 => 'Expectation Failed',
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version Not Supported'
+	);
+
+	/**
+	 * Caching of url map is enabled or not
+	 * @var boolean
+	 */
+	protected $cached;
+
+	// ==================================================================
+	//
+	// Public functions
+	//
+	// ------------------------------------------------------------------
+
+
+	/**
+	 * Constructor
+	 * @param boolean $production_mode When set to false, it will run in
+	 * debug mode and parse the class files every time to map it to the URL
+	 */
+	public function __construct($production_mode = false)
+	{
+		$this->production_mode = $production_mode;
+		$this->cache_dir = getcwd();
+		$this->base_dir = RESTLER_PATH;
+	}
+
+
+	/**
+	 * Store the url map cache if needed
+	 */
+	public function __destruct()
+	{
+		if ($this->production_mode && !($this->cached)) {
+			$this->saveCache();
+		}
+	}
+
+
+	/**
+	 * Use it in production mode to refresh the url map cache
+	 */
+	public function refreshCache()
+	{
+		$this->routes = array();
+		$this->cached = false;
+	}
+
+
+	/**
+	 * Call this method and pass all the formats that should be
+	 * supported by the API. Accepts multiple parameters
+	 * @param string class name of the format class that implements iFormat
+	 * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
+	 */
+	public function setSupportedFormats()
+	{
+		$args = func_get_args();
+		$extensions = array();
+		foreach ($args as $class_name) {
+			if (!is_string($class_name) || !class_exists($class_name)) {
+				throw new Exception("$class_name is not a vaild Format Class.");
+			}
+			$obj = new $class_name;
+			if (!($obj instanceof iFormat)) {
+				throw new Exception('Invalid format class; must implement '
+					. 'iFormat interface');
+			}
+			foreach ($obj->getMIMEMap() as $extension => $mime) {
+				if (!isset($this->format_map[$extension])) {
+					$this->format_map[$extension] = $class_name;
+				}
+				$mime = explode(',', $mime);
+				if (!is_array($mime)) {
+					$mime = array($mime);
+				}
+				foreach ($mime as $value) {
+					if (!isset($this->format_map[$value])) {
+						$this->format_map[$value] = $class_name;
+					}
+				}
+				$extensions[".$extension"] = true;
+			}
+		}
+		$this->format_map['default'] = $args[0];
+		$this->format_map['extensions'] = array_keys($extensions);
+	}
+
+
+	/**
+	 * Add api classes throgh this method. All the public methods
+	 * that do not start with _ (underscore) will be  will be exposed
+	 * as the public api by default.
+	 *
+	 * All the protected methods that do not start with _ (underscore)
+	 * will exposed as protected api which will require authentication
+	 * @param string $class name of the service class
+	 * @param string $basePath optional url prefix for mapping, uses
+	 * lowercase version of the class name when not specified
+	 * @throws Exception when supplied with invalid class name
+	 */
+	public function addAPIClass($class_name, $base_path = null)
+	{
+		if (!class_exists($class_name)) {
+			throw new Exception("API class $class_name is missing.");
+		}
+		$this->loadCache();
+		if (!$this->cached) {
+			if (is_null($base_path)) {
+				$base_path = strtolower($class_name);
+				$index = strrpos($class_name, '\\');
+				if ($index !== false) {
+					$base_path = substr($base_path, $index + 1);
+				}
+			} else {
+				$base_path = trim($base_path, '/');
+			}
+			if (strlen($base_path) > 0) {
+				$base_path .= '/';
+			}
+			$this->generateMap($class_name, $base_path);
+		}
+	}
+
+
+	/**
+	 * protected methods will need atleast one authentication class to be set
+	 * in order to allow that method to be executed
+	 * @param string $class_name of the authentication class
+	 * @param string $base_path optional url prefix for mapping
+	 */
+	public function addAuthenticationClass($class_name, $base_path = null)
+	{
+		$this->auth_classes[] = $class_name;
+		$this->addAPIClass($class_name, $base_path);
+	}
+
+
+	/**
+	 * Add class for custom error handling
+	 * @param string $class_name of the error handling class
+	 */
+	public function addErrorClass($class_name)
+	{
+		$this->error_classes[] = $class_name;
+	}
+
+
+	/**
+	 * Convenience method to respond with an error message
+	 * @param int $statusCode http error code
+	 * @param string $errorMessage optional custom error message
+	 */
+	public function handleError($status_code, $error_message = null)
+	{
+		$method = "handle$status_code";
+		$handled = false;
+		foreach ($this->error_classes as $class_name) {
+			if (method_exists($class_name, $method)) {
+				$obj = new $class_name();
+				$obj->restler = $this;
+				$obj->$method();
+				$handled = true;
+			}
+		}
+		if ($handled) {
+			return;
+		}
+		$message = $this->codes[$status_code]
+			. (!$error_message ? '' : ': ' . $error_message);
+		$this->setStatus($status_code);
+		$responder = new $this->response();
+		$responder->restler = $this;
+		$this->sendData($responder->__formatError($status_code, $message));
+	}
+
+
+	/**
+	 * An initialize function to allow use of the restler error generation 
+	 * functions for pre-processing and pre-routing of requests.
+	 */
+	public function init()
+	{
+		if (empty($this->format_map)) {
+			$this->setSupportedFormats('JsonFormat');
+		}
+		$this->url = $this->getPath();
+		$this->request_method = $this->getRequestMethod();
+		$this->response_format = $this->getResponseFormat();
+		$this->request_format = $this->getRequestFormat();
+		if (is_null($this->request_format)) {
+			$this->request_format = $this->response_format;
+		}
+		if ($this->request_method == 'PUT' || $this->request_method == 'POST') {
+			$this->request_data = $this->getRequestData();
+		}
+	}
+
+
+	/**
+	 * Main function for processing the api request
+	 * and return the response
+	 * @throws Exception when the api service class is missing
+	 * @throws RestException to send error response
+	 */
+	public function handle()
+	{
+		$this->init();
+		$o = $this->mapUrlToMethod();
+
+		if (!isset($o->class_name)) {
+			$this->handleError(404);
+		} else {
+			try {
+				if ($o->method_flag) {
+					$auth_method = '__isAuthenticated';
+					if (!count($this->auth_classes)) {
+						throw new RestException(401);
+					}
+					foreach ($this->auth_classes as $auth_class) {
+						$auth_obj = new $auth_class();
+						$auth_obj->restler = $this;
+						$this->applyClassMetadata($auth_class, $auth_obj, $o);
+						if (!method_exists($auth_obj, $auth_method)) {
+							throw new RestException(401, 'Authentication Class '
+								. 'should implement iAuthenticate');
+						} else if (!$auth_obj->$auth_method()) {
+							throw new RestException(401);
+						}
+					}
+				}
+				$this->applyClassMetadata(get_class($this->request_format),
+					$this->request_format, $o);
+				$pre_process = '_' . $this->request_format->getExtension() . '_'
+					. $o->method_name;
+				$this->service_method = $o->method_name;
+				if ($o->method_flag == 2) {
+					$o = unprotect($o);
+				}
+				$object = $this->service_class_instance = new $o->class_name();
+				$object->restler = $this;
+				if (method_exists($o->class_name, $pre_process)) {
+					call_user_func_array(
+						array($object, $pre_process), $o->arguments
+					);
+				}
+				switch ($o->method_flag) {
+					case 3:
+						$reflection_method = new ReflectionMethod($object,
+								$o->method_name);
+						$reflection_method->setAccessible(true);
+						$result = $reflection_method->invokeArgs($object,
+							$o->arguments);
+						break;
+					case 2:
+					case 1:
+					default:
+						$result = call_user_func_array(array(
+							$object,
+							$o->method_name), $o->arguments
+						);
+						break;
+				}
+			} catch (RestException $e) {
+				$this->handleError($e->getCode(), $e->getMessage());
+			}
+		}
+		$responder = new $this->response();
+		$responder->restler = $this;
+		$this->applyClassMetadata($this->response, $responder, $o);
+		if (isset($result) && $result !== null) {
+			$result = $responder->__formatResponse($result);
+			$this->sendData($result);
+		}
+	}
+
+
+	/**
+	 * Encodes the response in the prefered format
+	 * and sends back
+	 * @param $data array php data
+	 */
+	public function sendData($data)
+	{
+		$data = $this->response_format->encode($data, 
+			!($this->production_mode)
+		);
+		$post_process = '_' . $this->service_method . '_'
+			. $this->response_format->getExtension();
+		if (isset($this->service_class_instance)
+			&& method_exists($this->service_class_instance, $post_process)
+		) {
+			$data = call_user_func(array($this->service_class_instance,
+				$post_process), $data);
+		}
+		header("Cache-Control: no-cache, must-revalidate");
+		header("Expires: 0");
+		header('Content-Type: ' . $this->response_format->getMIME());
+		//.'; charset=utf-8');
+		header("X-Powered-By: Luracast Restler v" . Restler::VERSION);
 		if($this->production_mode){
 			die($data);
 		}else{
 			echo $data;
 		}
-    }
-
-
-    /**
-     * Sets the HTTP response status
-     * @param int $code response code
-     */
-    public function setStatus($code)
-    {
-        header("{$_SERVER['SERVER_PROTOCOL']} $code " . 
-            $this->codes[strval($code)]);
-    }
-
-
-    /**
-     * Compare two strings and remove the common
-     * sub string from the first string and return it
-     * @param string $first
-     * @param string $second
-     * @param string $char optional, set it as
-     * blank string for char by char comparison
-     * @return string
-     */
-    public function removeCommonPath($first, $second, $char = '/')
-    {
-        $first = explode($char, $first);
-        $second = explode($char, $second);
-        while (count($second)) {
-            if ($first[0] == $second[0]) {
-                array_shift($first);
-            } else {
-                break;
-            }
-            array_shift($second);
-        }
-        return implode($char, $first);
-    }
-
-
-    /**
-     * Save cache to file
-     */
-    public function saveCache()
-    {
-        $file = $this->cache_dir . '/routes.php';
-        $s = '$o=array();' . PHP_EOL;
-        foreach ($this->routes as $key => $value) {
-            $s .= PHP_EOL . PHP_EOL . PHP_EOL . 
-                "############### $key ###############" . PHP_EOL . PHP_EOL;
-            $s .= '$o[\'' . $key . '\']=array();';
-            foreach ($value as $ke => $va) {
-                $s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL;
-                $s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace(
-                        PHP_EOL, PHP_EOL . "\t", var_export($va, true)
-                    ) . ';';
-            }
-        }
-        $s .= PHP_EOL . 'return $o;';
-        $r = @file_put_contents($file, "<?php $s");
-        @chmod($file, 0777);
-        if ($r === false) {
-            throw new Exception(
-                "The cache directory located at '$this->cache_dir' needs to "
-                . "have the permissions set to read/write/execute for everyone"
-                . " in order to save cache and improve performance.");
-        }
-    }
-
-    // ==================================================================
-    //
-    // Protected functions
-    //
-    // ------------------------------------------------------------------
-
-
-    /**
-     * Parses the requst url and get the api path
-     * @return string api path
-     */
-    protected function getPath()
-    {
-        $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'],
-                $_SERVER['SCRIPT_NAME']));
-        $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path);
-        $path = str_replace($this->format_map['extensions'], '', $path);
-        return $path;
-    }
-
-
-    /**
-     * Parses the request to figure out the http request type
-     * @return string which will be one of the following
-     * [GET, POST, PUT, DELETE]
-     * @example GET
-     */
-    protected function getRequestMethod()
-    {
-        $method = $_SERVER['REQUEST_METHOD'];
-        if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
-            $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
-        }
-        //support for HEAD request
-        if ($method == 'HEAD') {
-            $method = 'GET';
-        }
-        return $method;
-    }
-
-
-    /**
-     * Parses the request to figure out format of the request data
-     * @return iFormat any class that implements iFormat
-     * @example JsonFormat
-     */
-    protected function getRequestFormat()
-    {
-        $format = null;
-        //check if client has sent any information on request format
-        if (isset($_SERVER['CONTENT_TYPE'])) {
-            $mime = explode(';', $_SERVER['CONTENT_TYPE']);
-            $mime = $mime[0];
-            if ($mime == UrlEncodedFormat::MIME) {
-                $format = new UrlEncodedFormat();
-            } else {
-                if (isset($this->format_map[$mime])) {
-                    $format = $this->format_map[$mime];
-                    $format = is_string($format) ? new $format : $format;
-                    $format->setMIME($mime);
-                }
-            }
-        }
-        return $format;
-    }
-
-
-    /**
-     * Parses the request to figure out the best format for response
-     * @return iFormat any class that implements iFormat
-     * @example JsonFormat
-     */
-    protected function getResponseFormat()
-    {
-        //check if client has specified an extension
-        /**
-         * @var iFormat
-         */
-        $format = null;
-        $extensions = explode('.',
-            parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
-        while ($extensions) {
-            $extension = array_pop($extensions);
-            $extension = explode('/', $extension);
-            $extension = array_shift($extension);
-            if ($extension && isset($this->format_map[$extension])) {
-                $format = $this->format_map[$extension];
-                $format = is_string($format) ? new $format : $format;
-                $format->setExtension($extension);
-                //echo "Extension $extension";
-                return $format;
-            }
-        }
-        //check if client has sent list of accepted data formats
-        if (isset($_SERVER['HTTP_ACCEPT'])) {
-            $acceptList = array();
-            $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
-            if (!is_array($accepts)) {
-                $accepts = array($accepts);
-            }
-            foreach ($accepts as $pos => $accept) {
-                $parts = explode(';q=', trim($accept));
-                $type = array_shift($parts);
-                $quality = count($parts) ? 
-                    floatval(array_shift($parts)) : 
-                    (1000 - $pos) / 1000;
-                $acceptList[$type] = $quality;
-            }
-            arsort($acceptList);
-            foreach ($acceptList as $accept => $quality) {
-                if (isset($this->format_map[$accept])) {
-                    $format = $this->format_map[$accept];
-                    $format = is_string($format) ? new $format : $format;
-                    $format->setMIME($accept);
-                    //echo "MIME $accept";
-                    // Tell cache content is based on Accept header
-                    header("Vary: Accept"); 
-                    return $format;
-                }
-            }
-        } else {
-            // RFC 2616: If no Accept header field is
-            // present, then it is assumed that the
-            // client accepts all media types.
-            $_SERVER['HTTP_ACCEPT'] = '*/*';
-        }
-        if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== false) {
-            if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== false) {
-                $format = new JsonFormat;
-            } else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== false) {
-                $format = new XmlFormat;
-            } else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== false) {
-                $format = new $this->format_map['default'];
-            }
-        }
-        if (empty($format)) {
-            // RFC 2616: If an Accept header field is present, and if the 
-            // server cannot send a response which is acceptable according to 
-            // the combined Accept field value, then the server SHOULD send 
-            // a 406 (not acceptable) response.
-            header('HTTP/1.1 406 Not Acceptable');
-            die('406 Not Acceptable: The server was unable to ' . 
-                    'negotiate content for this request.');
-        } else {
-            // Tell cache content is based ot Accept header
-            header("Vary: Accept"); 
-            return $format;
-        }
-    }
-
-
-    /**
-     * Parses the request data and returns it
-     * @return array php data
-     */
-    protected function getRequestData()
-    {
-        try {
-            $r = file_get_contents('php://input');
-            if (is_null($r)) {
-                return $_GET;
-            }
-            $r = $this->request_format->decode($r);
-            return is_null($r) ? array() : $r;
-        } catch (RestException $e) {
-            $this->handleError($e->getCode(), $e->getMessage());
-        }
-    }
-
-
-    protected function mapUrlToMethod()
-    {
-        if (!isset($this->routes[$this->request_method])) {
-            return array();
-        }
-        $urls = $this->routes[$this->request_method];
-        if (!$urls) {
-            return array();
-        }
-
-        $found = false;
-        $this->request_data += $_GET;
-        $params = array('request_data' => $this->request_data);
-        $params += $this->request_data;
-        $lc = strtolower($this->url);
-        foreach ($urls as $url => $call) {
-            //echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
-            $call = (object) $call;
-            if (strstr($url, ':')) {
-                $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)',
-                    preg_quote($url));
-                if (preg_match(":^$regex$:i", $this->url, $matches)) {
-                    foreach ($matches as $arg => $match) {
-                        if (isset($call->arguments[$arg])) {
-                            //flog("$arg => $match $args[$arg]");
-                            $params[$arg] = $match;
-                        }
-                    }
-                    $found = true;
-                    break;
-                }
-            } else if ($url == $lc) {
-                $found = true;
-                break;
-            }
-        }
-        if ($found) {
-            //echo PHP_EOL."Found $url ";
-            //print_r($call);
-            $p = $call->defaults;
-            foreach ($call->arguments as $key => $value) {
-                //echo "$key => $value \n";
-                if (isset($params[$key])) {
-                    $p[$value] = $params[$key];
-                }
-            }
-            $call->arguments = $p;
-            return $call;
-        }
-    }
-
-
-    /**
-     * Apply static and non-static properties defined in
-     * the method information anotation
-     * @param String $class_name
-     * @param Object $instance instance of that class
-     * @param Object $method_info method information and metadata
-     */
-    protected function applyClassMetadata($class_name, $instance, $method_info)
-    {
-        if (isset($method_info->metadata[$class_name])
-            && is_array($method_info->metadata[$class_name])
-        ) {
-            foreach ($method_info->metadata[$class_name] as
-                    $property => $value) {
-                if (property_exists($class_name, $property)) {
-                    $reflection_property = 
-                        new ReflectionProperty($class_name, $property);
-                    $reflection_property->setValue($instance, $value);
-                }
-            }
-        }
-    }
-
-
-    protected function loadCache()
-    {
-        if ($this->cached !== null) {
-            return;
-        }
-        $file = $this->cache_dir . '/routes.php';
-        $this->cached = false;
-
-        if ($this->production_mode) {
-            if (file_exists($file)) {
-                $routes = include($file);
-            }
-            if (isset($routes) && is_array($routes)) {
-                $this->routes = $routes;
-                $this->cached = true;
-            }
-        } else {
-            //@unlink($this->cache_dir . "/$name.php");
-        }
-    }
-
-
-    /**
-     * Generates cachable url to method mapping
-     * @param string $class_name
-     * @param string $base_path
-     */
-    protected function generateMap($class_name, $base_path = '')
-    {
-        $reflection = new ReflectionClass($class_name);
-        $class_metadata = parse_doc($reflection->getDocComment());
-        $methods = $reflection->getMethods(
-            ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED
-        );
-        foreach ($methods as $method) {
-            $doc = $method->getDocComment();
-            $arguments = array();
-            $defaults = array();
-            $metadata = $class_metadata + parse_doc($doc);
-            $params = $method->getParameters();
-            $position = 0;
-            foreach ($params as $param) {
-                $arguments[$param->getName()] = $position;
-                $defaults[$position] = $param->isDefaultValueAvailable() ? 
-                    $param->getDefaultValue() : null;
-                $position++;
-            }
-            $method_flag = $method->isProtected() ? 
-                (isRestlerCompatibilityModeEnabled() ? 2 : 3) : 
-                (isset($metadata['protected']) ? 1 : 0);
-
-            //take note of the order
-            $call = array(
-                'class_name' => $class_name,
-                'method_name' => $method->getName(),
-                'arguments' => $arguments,
-                'defaults' => $defaults,
-                'metadata' => $metadata,
-                'method_flag' => $method_flag
-            );
-            $method_url = strtolower($method->getName());
-            if (preg_match_all(
-                '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
-                    $doc, $matches, PREG_SET_ORDER)
-            ) {
-                foreach ($matches as $match) {
-                    $http_method = $match[1];
-                    $url = rtrim($base_path . $match[2], '/');
-                    $this->routes[$http_method][$url] = $call;
-                }
-            } elseif ($method_url[0] != '_') { 
-                //not prefixed with underscore
-                // no configuration found so use convention
-                if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i',
-                        $method_url, $matches)
-                ) {
-                    $http_method = strtoupper($matches[0][0]);
-                    $method_url = substr($method_url, strlen($http_method));
-                } else {
-                    $http_method = 'GET';
-                }
-                $url = $base_path
-                    . ($method_url == 'index' || $method_url == 'default' ? '' :
-                        $method_url);
-                $url = rtrim($url, '/');
-                $this->routes[$http_method][$url] = $call;
-                foreach ($params as $param) {
-                    if ($param->getName() == 'request_data') {
-                        break;
-                    }
-                    $url .= $url == '' ? ':' : '/:';
-                    $url .= $param->getName();
-                    $this->routes[$http_method][$url] = $call;
-                }
-            }
-        }
-    }
+	}
+
+
+	/**
+	 * Sets the HTTP response status
+	 * @param int $code response code
+	 */
+	public function setStatus($code)
+	{
+		header("{$_SERVER['SERVER_PROTOCOL']} $code " . 
+			$this->codes[strval($code)]);
+	}
+
+
+	/**
+	 * Compare two strings and remove the common
+	 * sub string from the first string and return it
+	 * @param string $first
+	 * @param string $second
+	 * @param string $char optional, set it as
+	 * blank string for char by char comparison
+	 * @return string
+	 */
+	public function removeCommonPath($first, $second, $char = '/')
+	{
+		$first = explode($char, $first);
+		$second = explode($char, $second);
+		while (count($second)) {
+			if ($first[0] == $second[0]) {
+				array_shift($first);
+			} else {
+				break;
+			}
+			array_shift($second);
+		}
+		return implode($char, $first);
+	}
+
+
+	/**
+	 * Save cache to file
+	 */
+	public function saveCache()
+	{
+		$file = $this->cache_dir . '/routes.php';
+		$s = '$o=array();' . PHP_EOL;
+		foreach ($this->routes as $key => $value) {
+			$s .= PHP_EOL . PHP_EOL . PHP_EOL . 
+				"############### $key ###############" . PHP_EOL . PHP_EOL;
+			$s .= '$o[\'' . $key . '\']=array();';
+			foreach ($value as $ke => $va) {
+				$s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL;
+				$s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace(
+						PHP_EOL, PHP_EOL . "\t", var_export($va, true)
+					) . ';';
+			}
+		}
+		$s .= PHP_EOL . 'return $o;';
+		$r = @file_put_contents($file, "<?php $s");
+		@chmod($file, 0777);
+		if ($r === false) {
+			throw new Exception(
+				"The cache directory located at '$this->cache_dir' needs to "
+				. "have the permissions set to read/write/execute for everyone"
+				. " in order to save cache and improve performance.");
+		}
+	}
+
+	// ==================================================================
+	//
+	// Protected functions
+	//
+	// ------------------------------------------------------------------
+
+
+	/**
+	 * Parses the requst url and get the api path
+	 * @return string api path
+	 */
+	protected function getPath()
+	{
+		$path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'],
+				$_SERVER['SCRIPT_NAME']));
+		$path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path);
+		$path = str_replace($this->format_map['extensions'], '', $path);
+		return $path;
+	}
+
+
+	/**
+	 * Parses the request to figure out the http request type
+	 * @return string which will be one of the following
+	 * [GET, POST, PUT, DELETE]
+	 * @example GET
+	 */
+	protected function getRequestMethod()
+	{
+		$method = $_SERVER['REQUEST_METHOD'];
+		if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+			$method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
+		}
+		//support for HEAD request
+		if ($method == 'HEAD') {
+			$method = 'GET';
+		}
+		return $method;
+	}
+
+
+	/**
+	 * Parses the request to figure out format of the request data
+	 * @return iFormat any class that implements iFormat
+	 * @example JsonFormat
+	 */
+	protected function getRequestFormat()
+	{
+		$format = null;
+		//check if client has sent any information on request format
+		if (isset($_SERVER['CONTENT_TYPE'])) {
+			$mime = explode(';', $_SERVER['CONTENT_TYPE']);
+			$mime = $mime[0];
+			if ($mime == UrlEncodedFormat::MIME) {
+				$format = new UrlEncodedFormat();
+			} else {
+				if (isset($this->format_map[$mime])) {
+					$format = $this->format_map[$mime];
+					$format = is_string($format) ? new $format : $format;
+					$format->setMIME($mime);
+				}
+			}
+		}
+		return $format;
+	}
+
+
+	/**
+	 * Parses the request to figure out the best format for response
+	 * @return iFormat any class that implements iFormat
+	 * @example JsonFormat
+	 */
+	protected function getResponseFormat()
+	{
+		//check if client has specified an extension
+		/**
+		 * @var iFormat
+		 */
+		$format = null;
+		$extensions = explode('.',
+			parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
+		while ($extensions) {
+			$extension = array_pop($extensions);
+			$extension = explode('/', $extension);
+			$extension = array_shift($extension);
+			if ($extension && isset($this->format_map[$extension])) {
+				$format = $this->format_map[$extension];
+				$format = is_string($format) ? new $format : $format;
+				$format->setExtension($extension);
+				//echo "Extension $extension";
+				return $format;
+			}
+		}
+		//check if client has sent list of accepted data formats
+		if (isset($_SERVER['HTTP_ACCEPT'])) {
+			$acceptList = array();
+			$accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
+			if (!is_array($accepts)) {
+				$accepts = array($accepts);
+			}
+			foreach ($accepts as $pos => $accept) {
+				$parts = explode(';q=', trim($accept));
+				$type = array_shift($parts);
+				$quality = count($parts) ? 
+					floatval(array_shift($parts)) : 
+					(1000 - $pos) / 1000;
+				$acceptList[$type] = $quality;
+			}
+			arsort($acceptList);
+			foreach ($acceptList as $accept => $quality) {
+				if (isset($this->format_map[$accept])) {
+					$format = $this->format_map[$accept];
+					$format = is_string($format) ? new $format : $format;
+					$format->setMIME($accept);
+					//echo "MIME $accept";
+					// Tell cache content is based on Accept header
+					header("Vary: Accept"); 
+					return $format;
+				}
+			}
+		} else {
+			// RFC 2616: If no Accept header field is
+			// present, then it is assumed that the
+			// client accepts all media types.
+			$_SERVER['HTTP_ACCEPT'] = '*/*';
+		}
+		if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== false) {
+			if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== false) {
+				$format = new JsonFormat;
+			} else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== false) {
+				$format = new XmlFormat;
+			} else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== false) {
+				$format = new $this->format_map['default'];
+			}
+		}
+		if (empty($format)) {
+			// RFC 2616: If an Accept header field is present, and if the 
+			// server cannot send a response which is acceptable according to 
+			// the combined Accept field value, then the server SHOULD send 
+			// a 406 (not acceptable) response.
+			header('HTTP/1.1 406 Not Acceptable');
+			die('406 Not Acceptable: The server was unable to ' . 
+					'negotiate content for this request.');
+		} else {
+			// Tell cache content is based ot Accept header
+			header("Vary: Accept"); 
+			return $format;
+		}
+	}
+
+
+	/**
+	 * Parses the request data and returns it
+	 * @return array php data
+	 */
+	protected function getRequestData()
+	{
+		try {
+			$r = file_get_contents('php://input');
+			if (is_null($r)) {
+				return $_GET;
+			}
+			$r = $this->request_format->decode($r);
+			return is_null($r) ? array() : $r;
+		} catch (RestException $e) {
+			$this->handleError($e->getCode(), $e->getMessage());
+		}
+	}
+
+
+	protected function mapUrlToMethod()
+	{
+		if (!isset($this->routes[$this->request_method])) {
+			return array();
+		}
+		$urls = $this->routes[$this->request_method];
+		if (!$urls) {
+			return array();
+		}
+
+		$found = false;
+		$this->request_data += $_GET;
+		$params = array('request_data' => $this->request_data);
+		$params += $this->request_data;
+		$lc = strtolower($this->url);
+		foreach ($urls as $url => $call) {
+			//echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
+			$call = (object) $call;
+			if (strstr($url, ':')) {
+				$regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)',
+					preg_quote($url));
+				if (preg_match(":^$regex$:i", $this->url, $matches)) {
+					foreach ($matches as $arg => $match) {
+						if (isset($call->arguments[$arg])) {
+							//flog("$arg => $match $args[$arg]");
+							$params[$arg] = $match;
+						}
+					}
+					$found = true;
+					break;
+				}
+			} else if ($url == $lc) {
+				$found = true;
+				break;
+			}
+		}
+		if ($found) {
+			//echo PHP_EOL."Found $url ";
+			//print_r($call);
+			$p = $call->defaults;
+			foreach ($call->arguments as $key => $value) {
+				//echo "$key => $value \n";
+				if (isset($params[$key])) {
+					$p[$value] = $params[$key];
+				}
+			}
+			$call->arguments = $p;
+			return $call;
+		}
+	}
+
+
+	/**
+	 * Apply static and non-static properties defined in
+	 * the method information anotation
+	 * @param String $class_name
+	 * @param Object $instance instance of that class
+	 * @param Object $method_info method information and metadata
+	 */
+	protected function applyClassMetadata($class_name, $instance, $method_info)
+	{
+		if (isset($method_info->metadata[$class_name])
+			&& is_array($method_info->metadata[$class_name])
+		) {
+			foreach ($method_info->metadata[$class_name] as
+					$property => $value) {
+				if (property_exists($class_name, $property)) {
+					$reflection_property = 
+						new ReflectionProperty($class_name, $property);
+					$reflection_property->setValue($instance, $value);
+				}
+			}
+		}
+	}
+
+
+	protected function loadCache()
+	{
+		if ($this->cached !== null) {
+			return;
+		}
+		$file = $this->cache_dir . '/routes.php';
+		$this->cached = false;
+
+		if ($this->production_mode) {
+			if (file_exists($file)) {
+				$routes = include($file);
+			}
+			if (isset($routes) && is_array($routes)) {
+				$this->routes = $routes;
+				$this->cached = true;
+			}
+		} else {
+			//@unlink($this->cache_dir . "/$name.php");
+		}
+	}
+
+
+	/**
+	 * Generates cachable url to method mapping
+	 * @param string $class_name
+	 * @param string $base_path
+	 */
+	protected function generateMap($class_name, $base_path = '')
+	{
+		$reflection = new ReflectionClass($class_name);
+		$class_metadata = parse_doc($reflection->getDocComment());
+		$methods = $reflection->getMethods(
+			ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED
+		);
+		foreach ($methods as $method) {
+			$doc = $method->getDocComment();
+			$arguments = array();
+			$defaults = array();
+			$metadata = $class_metadata + parse_doc($doc);
+			$params = $method->getParameters();
+			$position = 0;
+			foreach ($params as $param) {
+				$arguments[$param->getName()] = $position;
+				$defaults[$position] = $param->isDefaultValueAvailable() ? 
+					$param->getDefaultValue() : null;
+				$position++;
+			}
+			$method_flag = $method->isProtected() ? 
+				(isRestlerCompatibilityModeEnabled() ? 2 : 3) : 
+				(isset($metadata['protected']) ? 1 : 0);
+
+			//take note of the order
+			$call = array(
+				'class_name' => $class_name,
+				'method_name' => $method->getName(),
+				'arguments' => $arguments,
+				'defaults' => $defaults,
+				'metadata' => $metadata,
+				'method_flag' => $method_flag
+			);
+			$method_url = strtolower($method->getName());
+			if (preg_match_all(
+				'/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
+					$doc, $matches, PREG_SET_ORDER)
+			) {
+				foreach ($matches as $match) {
+					$http_method = $match[1];
+					$url = rtrim($base_path . $match[2], '/');
+					$this->routes[$http_method][$url] = $call;
+				}
+			} elseif ($method_url[0] != '_') { 
+				//not prefixed with underscore
+				// no configuration found so use convention
+				if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i',
+						$method_url, $matches)
+				) {
+					$http_method = strtoupper($matches[0][0]);
+					$method_url = substr($method_url, strlen($http_method));
+				} else {
+					$http_method = 'GET';
+				}
+				$url = $base_path
+					. ($method_url == 'index' || $method_url == 'default' ? '' :
+						$method_url);
+				$url = rtrim($url, '/');
+				$this->routes[$http_method][$url] = $call;
+				foreach ($params as $param) {
+					if ($param->getName() == 'request_data') {
+						break;
+					}
+					$url .= $url == '' ? ':' : '/:';
+					$url .= $param->getName();
+					$this->routes[$http_method][$url] = $call;
+				}
+			}
+		}
+	}
 
 }
 
 if (version_compare(PHP_VERSION, '5.3.0') < 0) {
-    require_once 'compat.php';
+	require_once 'compat.php';
 }
 
 // ==================================================================
@@ -916,10 +916,10 @@ 
 {
 
 
-    public function __construct($http_status_code, $error_message = null)
-    {
-        parent::__construct($error_message, $http_status_code);
-    }
+	public function __construct($http_status_code, $error_message = null)
+	{
+		parent::__construct($error_message, $http_status_code);
+	}
 
 }
 
@@ -937,21 +937,21 @@ 
 {
 
 
-    /**
-     * Result of an api call is passed to this method
-     * to create a standard structure for the data
-     * @param unknown_type $result can be a primitive or array or object
-     */
-    public function __formatResponse($result);
+	/**
+	 * Result of an api call is passed to this method
+	 * to create a standard structure for the data
+	 * @param unknown_type $result can be a primitive or array or object
+	 */
+	public function __formatResponse($result);
 
 
-    /**
-     * When the api call results in RestException this method
-     * will be called to return the error message
-     * @param int $status_code
-     * @param String $message
-     */
-    public function __formatError($status_code, $message);
+	/**
+	 * When the api call results in RestException this method
+	 * will be called to return the error message
+	 * @param int $status_code
+	 * @param String $message
+	 */
+	public function __formatError($status_code, $message);
 }
 
 /**
@@ -968,21 +968,21 @@ 
 {
 
 
-    public function __formatResponse($result)
-    {
-        return $result;
-    }
+	public function __formatResponse($result)
+	{
+		return $result;
+	}
 
 
-    public function __formatError($statusCode, $message)
-    {
-        return array(
-            'error' => array(
-                'code' => $statusCode,
-                'message' => $message
-            )
-        );
-    }
+	public function __formatError($statusCode, $message)
+	{
+		return array(
+			'error' => array(
+				'code' => $statusCode,
+				'message' => $message
+			)
+		);
+	}
 
 }
 
@@ -1000,11 +1000,11 @@ 
 {
 
 
-    /**
-     * Auth function that is called when a protected method is requested
-     * @return boolean true or false
-     */
-    public function __isAuthenticated();
+	/**
+	 * Auth function that is called when a protected method is requested
+	 * @return boolean true or false
+	 */
+	public function __isAuthenticated();
 }
 
 /**
@@ -1022,60 +1022,60 @@ 
 {
 
 
-    /**
-     * Get Extension => MIME type mappings as an associative array
-     * @return array list of mime strings for the format
-     * @example array('json'=>'application/json');
-     */
-    public function getMIMEMap();
+	/**
+	 * Get Extension => MIME type mappings as an associative array
+	 * @return array list of mime strings for the format
+	 * @example array('json'=>'application/json');
+	 */
+	public function getMIMEMap();
 
 
-    /**
-     * Set the selected MIME type
-     * @param string $mime MIME type
-     */
-    public function setMIME($mime);
+	/**
+	 * Set the selected MIME type
+	 * @param string $mime MIME type
+	 */
+	public function setMIME($mime);
 
 
-    /**
-     * Get selected MIME type
-     */
-    public function getMIME();
+	/**
+	 * Get selected MIME type
+	 */
+	public function getMIME();
 
 
-    /**
-     * Set the selected file extension
-     * @param string $extension file extension
-     */
-    public function setExtension($extension);
+	/**
+	 * Set the selected file extension
+	 * @param string $extension file extension
+	 */
+	public function setExtension($extension);
 
 
-    /**
-     * Get the selected file extension
-     * @return string file extension
-     */
-    public function getExtension();
+	/**
+	 * Get the selected file extension
+	 * @return string file extension
+	 */
+	public function getExtension();
 
 
-    /**
-     * Encode the given data in the format
-     * @param array $data resulting data that needs to
-     * be encoded in the given format
-     * @param boolean $human_readable set to true when restler
-     * is not running in production mode. Formatter has to
-     * make the encoded output more human readable
-     * @return string encoded string
-     */
-    public function encode($data, $human_readable = false);
+	/**
+	 * Encode the given data in the format
+	 * @param array $data resulting data that needs to
+	 * be encoded in the given format
+	 * @param boolean $human_readable set to true when restler
+	 * is not running in production mode. Formatter has to
+	 * make the encoded output more human readable
+	 * @return string encoded string
+	 */
+	public function encode($data, $human_readable = false);
 
 
-    /**
-     * Decode the given data from the format
-     * @param string $data data sent from client to
-     * the api in the given format.
-     * @return array associative array of the parsed data
-     */
-    public function decode($data);
+	/**
+	 * Decode the given data from the format
+	 * @param string $data data sent from client to
+	 * the api in the given format.
+	 * @return array associative array of the parsed data
+	 */
+	public function decode($data);
 }
 
 /**
@@ -1091,57 +1091,57 @@ 
 class UrlEncodedFormat implements iFormat
 {
 
-    const MIME = 'application/x-www-form-urlencoded';
-    const EXTENSION = 'post';
+	const MIME = 'application/x-www-form-urlencoded';
+	const EXTENSION = 'post';
 
 
-    public function getMIMEMap()
-    {
-        return array(self::EXTENSION => self::MIME);
-    }
+	public function getMIMEMap()
+	{
+		return array(self::EXTENSION => self::MIME);
+	}
 
 
-    public function getMIME()
-    {
-        return self::MIME;
-    }
+	public function getMIME()
+	{
+		return self::MIME;
+	}
 
 
-    public function getExtension()
-    {
-        return self::EXTENSION;
-    }
+	public function getExtension()
+	{
+		return self::EXTENSION;
+	}
 
 
-    public function setMIME($mime)
-    {
-        //do nothing
-    }
+	public function setMIME($mime)
+	{
+		//do nothing
+	}
 
 
-    public function setExtension($extension)
-    {
-        //do nothing
-    }
+	public function setExtension($extension)
+	{
+		//do nothing
+	}
 
 
-    public function encode($data, $human_readable = false)
-    {
-        return http_build_query($data);
-    }
+	public function encode($data, $human_readable = false)
+	{
+		return http_build_query($data);
+	}
 
 
-    public function decode($data)
-    {
-        parse_str($data, $r);
-        return $r;
-    }
+	public function decode($data)
+	{
+		parse_str($data, $r);
+		return $r;
+	}
 
 
-    public function __toString()
-    {
-        return $this->getExtension();
-    }
+	public function __toString()
+	{
+		return $this->getExtension();
+	}
 
 }
 
@@ -1158,158 +1158,158 @@ 
 class JsonFormat implements iFormat
 {
 
-    const MIME = 'application/json,application/javascript';
-
-    static $mime = 'application/json';
-
-    const EXTENSION = 'json';
-
-
-    public function getMIMEMap()
-    {
-        return array(self::EXTENSION => self::MIME);
-    }
-
-
-    public function getMIME()
-    {
-        return self::$mime;
-    }
-
-
-    public function getExtension()
-    {
-        return self::EXTENSION;
-    }
-
-
-    public function setMIME($mime)
-    {
-        self::$mime = $mime;
-    }
-
-
-    public function setExtension($extension)
-    {
-        //do nothing
-    }
-
-
-    public function encode($data, $human_readable = false)
-    {
-        return $human_readable ? 
-            $this->json_format(json_encode(object_to_array($data))) : 
-            json_encode(object_to_array($data));
-    }
-
-
-    public function decode($data)
-    {
-        $decoded = json_decode($data);
-        if (function_exists('json_last_error')) {
-            $message = '';
-            switch (json_last_error()) {
-                case JSON_ERROR_NONE:
-                    return object_to_array($decoded);
-                    break;
-                case JSON_ERROR_DEPTH:
-                    $message = 'maximum stack depth exceeded';
-                    break;
-                case JSON_ERROR_STATE_MISMATCH:
-                    $message = 'underflow or the modes mismatch';
-                    break;
-                case JSON_ERROR_CTRL_CHAR:
-                    $message = 'unexpected control character found';
-                    break;
-                case JSON_ERROR_SYNTAX:
-                    $message = 'malformed JSON';
-                    break;
-                case JSON_ERROR_UTF8:
-                    $message = 'malformed UTF-8 characters, '.
-                        'possibly incorrectly encoded';
-                    break;
-                default:
-                    $message = 'unknown error';
-                    break;
-            }
-            throw new RestException(400, 'Error parsing JSON, ' . $message);
-        } else if (strlen($data) && $decoded === null || $decoded === $data) {
-            throw new RestException(400, 'Error parsing JSON');
-        }
-        return object_to_array($decoded);
-    }
-
-
-    /**
-     * Pretty print JSON string
-     * @param string $json
-     * @return string formated json
-     */
-    private function json_format($json)
-    {
-        $tab = "  ";
-        $new_json = "";
-        $indent_level = 0;
-        $in_string = false;
-        $len = strlen($json);
-
-        for ($c = 0; $c < $len; $c++) {
-            $char = $json[$c];
-            switch ($char) {
-                case '{':
-                case '[':
-                    if (!$in_string) {
-                        $new_json .= $char . "\n" .
-                            str_repeat($tab, $indent_level + 1);
-                        $indent_level++;
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case '}':
-                case ']':
-                    if (!$in_string) {
-                        $indent_level--;
-                        $new_json .= "\n" . str_repeat($tab, $indent_level) 
-                            . $char;
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case ',':
-                    if (!$in_string) {
-                        $new_json .= ",\n" . str_repeat($tab, $indent_level);
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case ':':
-                    if (!$in_string) {
-                        $new_json .= ": ";
-                    } else {
-                        $new_json .= $char;
-                    }
-                    break;
-                case '"':
-                    if ($c == 0) {
-                        $in_string = true;
-                    } else if ($c > 0 && $json[$c - 1] != '\\') {
-                        $in_string = !$in_string;
-                    }
-                default:
-                    $new_json .= $char;
-                    break;
-            }
-        }
-
-        return $new_json;
-    }
-
-
-    public function __toString()
-    {
-        return $this->getExtension();
-    }
+	const MIME = 'application/json,application/javascript';
+
+	static $mime = 'application/json';
+
+	const EXTENSION = 'json';
+
+
+	public function getMIMEMap()
+	{
+		return array(self::EXTENSION => self::MIME);
+	}
+
+
+	public function getMIME()
+	{
+		return self::$mime;
+	}
+
+
+	public function getExtension()
+	{
+		return self::EXTENSION;
+	}
+
+
+	public function setMIME($mime)
+	{
+		self::$mime = $mime;
+	}
+
+
+	public function setExtension($extension)
+	{
+		//do nothing
+	}
+
+
+	public function encode($data, $human_readable = false)
+	{
+		return $human_readable ? 
+			$this->json_format(json_encode(object_to_array($data))) : 
+			json_encode(object_to_array($data));
+	}
+
+
+	public function decode($data)
+	{
+		$decoded = json_decode($data);
+		if (function_exists('json_last_error')) {
+			$message = '';
+			switch (json_last_error()) {
+				case JSON_ERROR_NONE:
+					return object_to_array($decoded);
+					break;
+				case JSON_ERROR_DEPTH:
+					$message = 'maximum stack depth exceeded';
+					break;
+				case JSON_ERROR_STATE_MISMATCH:
+					$message = 'underflow or the modes mismatch';
+					break;
+				case JSON_ERROR_CTRL_CHAR:
+					$message = 'unexpected control character found';
+					break;
+				case JSON_ERROR_SYNTAX:
+					$message = 'malformed JSON';
+					break;
+				case JSON_ERROR_UTF8:
+					$message = 'malformed UTF-8 characters, '.
+						'possibly incorrectly encoded';
+					break;
+				default:
+					$message = 'unknown error';
+					break;
+			}
+			throw new RestException(400, 'Error parsing JSON, ' . $message);
+		} else if (strlen($data) && $decoded === null || $decoded === $data) {
+			throw new RestException(400, 'Error parsing JSON');
+		}
+		return object_to_array($decoded);
+	}
+
+
+	/**
+	 * Pretty print JSON string
+	 * @param string $json
+	 * @return string formated json
+	 */
+	private function json_format($json)
+	{
+		$tab = "  ";
+		$new_json = "";
+		$indent_level = 0;
+		$in_string = false;
+		$len = strlen($json);
+
+		for ($c = 0; $c < $len; $c++) {
+			$char = $json[$c];
+			switch ($char) {
+				case '{':
+				case '[':
+					if (!$in_string) {
+						$new_json .= $char . "\n" .
+							str_repeat($tab, $indent_level + 1);
+						$indent_level++;
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case '}':
+				case ']':
+					if (!$in_string) {
+						$indent_level--;
+						$new_json .= "\n" . str_repeat($tab, $indent_level) 
+							. $char;
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case ',':
+					if (!$in_string) {
+						$new_json .= ",\n" . str_repeat($tab, $indent_level);
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case ':':
+					if (!$in_string) {
+						$new_json .= ": ";
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case '"':
+					if ($c == 0) {
+						$in_string = true;
+					} else if ($c > 0 && $json[$c - 1] != '\\') {
+						$in_string = !$in_string;
+					}
+				default:
+					$new_json .= $char;
+					break;
+			}
+		}
+
+		return $new_json;
+	}
+
+
+	public function __toString()
+	{
+		return $this->getExtension();
+	}
 
 }
 
@@ -1327,123 +1327,123 @@ 
 class DocParser
 {
 
-    private $params = array();
-
-
-    public function parse($doc = '')
-    {
-        if ($doc == '') {
-            return $this->params;
-        }
-        //Get the comment
-        if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) {
-            return $this->params;
-        }
-        $comment = trim($comment[1]);
-        //Get all the lines and strip the * from the first character
-        if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) {
-            return $this->params;
-        }
-        $this->parseLines($lines[1]);
-        return $this->params;
-    }
-
-
-    private function parseLines($lines)
-    {
-        foreach ($lines as $line) {
-            $parsedLine = $this->parseLine($line); //Parse the line
-
-            if ($parsedLine === false && !isset($this->params['description'])) {
-                if (isset($desc)) {
-                    //Store the first line in the short description
-                    $this->params['description'] = implode(PHP_EOL, $desc);
-                }
-                $desc = array();
-            } else if ($parsedLine !== false) {
-                $desc[] = $parsedLine; //Store the line in the long description
-            }
-        }
-        $desc = implode(' ', $desc);
-        if (!empty($desc)) {
-            $this->params['long_description'] = $desc;
-        }
-    }
-
-
-    private function parseLine($line)
-    {
-        //trim the whitespace from the line
-        $line = trim($line);
-
-        if (empty($line)) {
-            return false; //Empty line
-        }
-
-        if (strpos($line, '@') === 0) {
-            if (strpos($line, ' ') > 0) {
-                //Get the parameter name
-                $param = substr($line, 1, strpos($line, ' ') - 1);
-                $value = substr($line, strlen($param) + 2); //Get the value
-            } else {
-                $param = substr($line, 1);
-                $value = '';
-            }
-            //Parse the line and return false if the parameter is valid
-            if ($this->setParam($param, $value)) {
-                return false;
-            }
-        }
-        return $line;
-    }
-
-
-    private function setParam($param, $value)
-    {
-        if ($param == 'param' || $param == 'return') {
-            $value = $this->formatParamOrReturn($value);
-        }
-        if ($param == 'class') {
-            list($param, $value) = $this->formatClass($value);
-        }
-
-        if (empty($this->params[$param])) {
-            $this->params[$param] = $value;
-        } else if ($param == 'param') {
-            $arr = array($this->params[$param], $value);
-            $this->params[$param] = $arr;
-        } else {
-            $this->params[$param] = $value + $this->params[$param];
-        }
-        return true;
-    }
-
-
-    private function formatClass($value)
-    {
-        $r = preg_split("[\(|\)]", $value);
-        if (count($r) > 1) {
-            $param = $r[0];
-            parse_str($r[1], $value);
-            foreach ($value as $key => $val) {
-                $val = explode(',', $val);
-                if (count($val) > 1) {
-                    $value[$key] = $val;
-                }
-            }
-        } else {
-            $param = 'Unknown';
-        }
-        return array($param, $value);
-    }
-
-
-    private function formatParamOrReturn($string)
-    {
-        $pos = strpos($string, ' ');
-        $type = substr($string, 0, $pos);
-        return '(' . $type . ')' . substr($string, $pos + 1);
-    }
+	private $params = array();
+
+
+	public function parse($doc = '')
+	{
+		if ($doc == '') {
+			return $this->params;
+		}
+		//Get the comment
+		if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) {
+			return $this->params;
+		}
+		$comment = trim($comment[1]);
+		//Get all the lines and strip the * from the first character
+		if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) {
+			return $this->params;
+		}
+		$this->parseLines($lines[1]);
+		return $this->params;
+	}
+
+
+	private function parseLines($lines)
+	{
+		foreach ($lines as $line) {
+			$parsedLine = $this->parseLine($line); //Parse the line
+
+			if ($parsedLine === false && !isset($this->params['description'])) {
+				if (isset($desc)) {
+					//Store the first line in the short description
+					$this->params['description'] = implode(PHP_EOL, $desc);
+				}
+				$desc = array();
+			} else if ($parsedLine !== false) {
+				$desc[] = $parsedLine; //Store the line in the long description
+			}
+		}
+		$desc = implode(' ', $desc);
+		if (!empty($desc)) {
+			$this->params['long_description'] = $desc;
+		}
+	}
+
+
+	private function parseLine($line)
+	{
+		//trim the whitespace from the line
+		$line = trim($line);
+
+		if (empty($line)) {
+			return false; //Empty line
+		}
+
+		if (strpos($line, '@') === 0) {
+			if (strpos($line, ' ') > 0) {
+				//Get the parameter name
+				$param = substr($line, 1, strpos($line, ' ') - 1);
+				$value = substr($line, strlen($param) + 2); //Get the value
+			} else {
+				$param = substr($line, 1);
+				$value = '';
+			}
+			//Parse the line and return false if the parameter is valid
+			if ($this->setParam($param, $value)) {
+				return false;
+			}
+		}
+		return $line;
+	}
+
+
+	private function setParam($param, $value)
+	{
+		if ($param == 'param' || $param == 'return') {
+			$value = $this->formatParamOrReturn($value);
+		}
+		if ($param == 'class') {
+			list($param, $value) = $this->formatClass($value);
+		}
+
+		if (empty($this->params[$param])) {
+			$this->params[$param] = $value;
+		} else if ($param == 'param') {
+			$arr = array($this->params[$param], $value);
+			$this->params[$param] = $arr;
+		} else {
+			$this->params[$param] = $value + $this->params[$param];
+		}
+		return true;
+	}
+
+
+	private function formatClass($value)
+	{
+		$r = preg_split("[\(|\)]", $value);
+		if (count($r) > 1) {
+			$param = $r[0];
+			parse_str($r[1], $value);
+			foreach ($value as $key => $val) {
+				$val = explode(',', $val);
+				if (count($val) > 1) {
+					$value[$key] = $val;
+				}
+			}
+		} else {
+			$param = 'Unknown';
+		}
+		return array($param, $value);
+	}
+
+
+	private function formatParamOrReturn($string)
+	{
+		$pos = strpos($string, ' ');
+		$type = substr($string, 0, $pos);
+		return '(' . $type . ')' . substr($string, $pos + 1);
+	}
 
 }
 
@@ -1456,30 +1456,30 @@ 
 
 function parse_doc($php_doc_comment)
 {
-    $p = new DocParser();
-    return $p->parse($php_doc_comment);
+	$p = new DocParser();
+	return $p->parse($php_doc_comment);
 
-    $p = new Parser($php_doc_comment);
-    return $p;
+	$p = new Parser($php_doc_comment);
+	return $p;
 
-    $php_doc_comment = preg_replace(
-        "/(^[\\s]*\\/\\*\\*)
+	$php_doc_comment = preg_replace(
+		"/(^[\\s]*\\/\\*\\*)
         |(^[\\s]\\*\\/)
         |(^[\\s]*\\*?\\s)
         |(^[\\s]*)
         |(^[\\t]*)/ixm",
-        "", $php_doc_comment);
-    $php_doc_comment = str_replace("\r", "", $php_doc_comment);
-    $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
-    return explode("\n", $php_doc_comment);
-
-    $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', 
-            $php_doc_comment));
-    return $php_doc_comment;
-
-    preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment,
-        $matches);
-    return array_combine($matches[1], $matches[2]);
+		"", $php_doc_comment);
+	$php_doc_comment = str_replace("\r", "", $php_doc_comment);
+	$php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
+	return explode("\n", $php_doc_comment);
+
+	$php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', 
+			$php_doc_comment));
+	return $php_doc_comment;
+
+	preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment,
+		$matches);
+	return array_combine($matches[1], $matches[2]);
 }
 
 
@@ -1498,21 +1498,21 @@ 
  */
 function object_to_array($object, $utf_encode = false)
 {
-    if (is_array($object)
-        || (is_object($object)
-        && !($object instanceof JsonSerializable))
-    ) {
-        $array = array();
-        foreach ($object as $key => $value) {
-            $value = object_to_array($value, $utf_encode);
-            if ($utf_encode && is_string($value)) {
-                $value = utf8_encode($value);
-            }
-            $array[$key] = $value;
-        }
-        return $array;
-    }
-    return $object;
+	if (is_array($object)
+		|| (is_object($object)
+		&& !($object instanceof JsonSerializable))
+	) {
+		$array = array();
+		foreach ($object as $key => $value) {
+			$value = object_to_array($value, $utf_encode);
+			if ($utf_encode && is_string($value)) {
+				$value = utf8_encode($value);
+			}
+			$array[$key] = $value;
+		}
+		return $array;
+	}
+	return $object;
 }
 
 
@@ -1522,21 +1522,21 @@ 
  */
 function autoload_formats($class_name)
 {
-    $class_name = strtolower($class_name);
+	$class_name = strtolower($class_name);
 	
-    $file = RESTLER_PATH . "../../../api/mobile_services/$class_name.php";
-    if (file_exists($file)) {
-        require_once ($file);
-    } else {
+	$file = RESTLER_PATH . "../../../api/mobile_services/$class_name.php";
+	if (file_exists($file)) {
+		require_once ($file);
+	} else {
 		$file = RESTLER_PATH . "/../../api/mobile_services/$class_name.php";
-        if (file_exists($file)) {
-            require_once ($file);
-        } elseif (file_exists(RESTLER_PATH . "/../api/mobile_services/$class_name.php")) {
-            require_once ("/../api/mobile_services/$class_name.php");
-        } elseif (file_exists("$class_name.php")) {
-            require_once ("$class_name.php");
-        }
-    }
+		if (file_exists($file)) {
+			require_once ($file);
+		} elseif (file_exists(RESTLER_PATH . "/../api/mobile_services/$class_name.php")) {
+			require_once ("/../api/mobile_services/$class_name.php");
+		} elseif (file_exists("$class_name.php")) {
+			require_once ("$class_name.php");
+		}
+	}
 }
 
 // ==================================================================
@@ -1553,10 +1553,10 @@ 
 if (!function_exists('isRestlerCompatibilityModeEnabled')) {
 
 
-    public function isRestlerCompatibilityModeEnabled()
-    {
-        return false;
-    }
+	public function isRestlerCompatibilityModeEnabled()
+	{
+		return false;
+	}
 
 }
 define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file

libraries/SabreDAV/HTTP/RequestDecorator.php

Indentation +210 added lines, -210 removed lines

@@ -14,218 +14,218 @@
  */
 class RequestDecorator implements RequestInterface {
 
-    use MessageDecoratorTrait;
+	use MessageDecoratorTrait;
 
-    /**
-     * Constructor.
-     *
-     * @param RequestInterface $inner
-     */
-    public function __construct(RequestInterface $inner) {
+	/**
+	 * Constructor.
+	 *
+	 * @param RequestInterface $inner
+	 */
+	public function __construct(RequestInterface $inner) {
 
-        $this->inner = $inner;
+		$this->inner = $inner;
 
-    }
+	}
 
-    /**
-     * Returns the current HTTP method
-     *
-     * @return string
-     */
-    public function getMethod() {
-
-        return $this->inner->getMethod();
-
-    }
-
-    /**
-     * Sets the HTTP method
-     *
-     * @param string $method
-     * @return void
-     */
-    public function setMethod($method) {
-
-        $this->inner->setMethod($method);
-
-    }
-
-    /**
-     * Returns the request url.
-     *
-     * @return string
-     */
-    public function getUrl() {
-
-        return $this->inner->getUrl();
-
-    }
-
-    /**
-     * Sets the request url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setUrl($url) {
-
-        $this->inner->setUrl($url);
-
-    }
-
-    /**
-     * Returns the absolute url.
-     *
-     * @return string
-     */
-    public function getAbsoluteUrl() {
-
-        return $this->inner->getAbsoluteUrl();
-
-    }
-
-    /**
-     * Sets the absolute url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setAbsoluteUrl($url) {
-
-        $this->inner->setAbsoluteUrl($url);
-
-    }
-
-    /**
-     * Returns the current base url.
-     *
-     * @return string
-     */
-    public function getBaseUrl() {
-
-        return $this->inner->getBaseUrl();
-
-    }
-
-    /**
-     * Sets a base url.
-     *
-     * This url is used for relative path calculations.
-     *
-     * The base url should default to /
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setBaseUrl($url) {
-
-        $this->inner->setBaseUrl($url);
-
-    }
-
-    /**
-     * Returns the relative path.
-     *
-     * This is being calculated using the base url. This path will not start
-     * with a slash, so it will always return something like
-     * 'example/path.html'.
-     *
-     * If the full path is equal to the base url, this method will return an
-     * empty string.
-     *
-     * This method will also urldecode the path, and if the url was incoded as
-     * ISO-8859-1, it will convert it to UTF-8.
-     *
-     * If the path is outside of the base url, a LogicException will be thrown.
-     *
-     * @return string
-     */
-    public function getPath() {
-
-        return $this->inner->getPath();
-
-    }
-
-    /**
-     * Returns the list of query parameters.
-     *
-     * This is equivalent to PHP's $_GET superglobal.
-     *
-     * @return array
-     */
-    public function getQueryParameters() {
-
-        return $this->inner->getQueryParameters();
-
-    }
-
-    /**
-     * Returns the POST data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * @return array
-     */
-    public function getPostData() {
-
-        return $this->inner->getPostData();
-
-    }
-
-    /**
-     * Sets the post data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * This would not have been needed, if POST data was accessible as
-     * php://input, but unfortunately we need to special case it.
-     *
-     * @param array $postData
-     * @return void
-     */
-    public function setPostData(array $postData) {
-
-        $this->inner->setPostData($postData);
-
-    }
-
-
-    /**
-     * Returns an item from the _SERVER array.
-     *
-     * If the value does not exist in the array, null is returned.
-     *
-     * @param string $valueName
-     * @return string|null
-     */
-    public function getRawServerValue($valueName) {
-
-        return $this->inner->getRawServerValue($valueName);
-
-    }
-
-    /**
-     * Sets the _SERVER array.
-     *
-     * @param array $data
-     * @return void
-     */
-    public function setRawServerData(array $data) {
-
-        $this->inner->setRawServerData($data);
-
-    }
-
-    /**
-     * Serializes the request object as a string.
-     *
-     * This is useful for debugging purposes.
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return $this->inner->__toString();
-
-    }
+	/**
+	 * Returns the current HTTP method
+	 *
+	 * @return string
+	 */
+	public function getMethod() {
+
+		return $this->inner->getMethod();
+
+	}
+
+	/**
+	 * Sets the HTTP method
+	 *
+	 * @param string $method
+	 * @return void
+	 */
+	public function setMethod($method) {
+
+		$this->inner->setMethod($method);
+
+	}
+
+	/**
+	 * Returns the request url.
+	 *
+	 * @return string
+	 */
+	public function getUrl() {
+
+		return $this->inner->getUrl();
+
+	}
+
+	/**
+	 * Sets the request url.
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setUrl($url) {
+
+		$this->inner->setUrl($url);
+
+	}
+
+	/**
+	 * Returns the absolute url.
+	 *
+	 * @return string
+	 */
+	public function getAbsoluteUrl() {
+
+		return $this->inner->getAbsoluteUrl();
+
+	}
+
+	/**
+	 * Sets the absolute url.
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setAbsoluteUrl($url) {
+
+		$this->inner->setAbsoluteUrl($url);
+
+	}
+
+	/**
+	 * Returns the current base url.
+	 *
+	 * @return string
+	 */
+	public function getBaseUrl() {
+
+		return $this->inner->getBaseUrl();
+
+	}
+
+	/**
+	 * Sets a base url.
+	 *
+	 * This url is used for relative path calculations.
+	 *
+	 * The base url should default to /
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setBaseUrl($url) {
+
+		$this->inner->setBaseUrl($url);
+
+	}
+
+	/**
+	 * Returns the relative path.
+	 *
+	 * This is being calculated using the base url. This path will not start
+	 * with a slash, so it will always return something like
+	 * 'example/path.html'.
+	 *
+	 * If the full path is equal to the base url, this method will return an
+	 * empty string.
+	 *
+	 * This method will also urldecode the path, and if the url was incoded as
+	 * ISO-8859-1, it will convert it to UTF-8.
+	 *
+	 * If the path is outside of the base url, a LogicException will be thrown.
+	 *
+	 * @return string
+	 */
+	public function getPath() {
+
+		return $this->inner->getPath();
+
+	}
+
+	/**
+	 * Returns the list of query parameters.
+	 *
+	 * This is equivalent to PHP's $_GET superglobal.
+	 *
+	 * @return array
+	 */
+	public function getQueryParameters() {
+
+		return $this->inner->getQueryParameters();
+
+	}
+
+	/**
+	 * Returns the POST data.
+	 *
+	 * This is equivalent to PHP's $_POST superglobal.
+	 *
+	 * @return array
+	 */
+	public function getPostData() {
+
+		return $this->inner->getPostData();
+
+	}
+
+	/**
+	 * Sets the post data.
+	 *
+	 * This is equivalent to PHP's $_POST superglobal.
+	 *
+	 * This would not have been needed, if POST data was accessible as
+	 * php://input, but unfortunately we need to special case it.
+	 *
+	 * @param array $postData
+	 * @return void
+	 */
+	public function setPostData(array $postData) {
+
+		$this->inner->setPostData($postData);
+
+	}
+
+
+	/**
+	 * Returns an item from the _SERVER array.
+	 *
+	 * If the value does not exist in the array, null is returned.
+	 *
+	 * @param string $valueName
+	 * @return string|null
+	 */
+	public function getRawServerValue($valueName) {
+
+		return $this->inner->getRawServerValue($valueName);
+
+	}
+
+	/**
+	 * Sets the _SERVER array.
+	 *
+	 * @param array $data
+	 * @return void
+	 */
+	public function setRawServerData(array $data) {
+
+		$this->inner->setRawServerData($data);
+
+	}
+
+	/**
+	 * Serializes the request object as a string.
+	 *
+	 * This is useful for debugging purposes.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+
+		return $this->inner->__toString();
+
+	}
 }

libraries/SabreDAV/HTTP/Response.php

Indentation +179 added lines, -179 removed lines

@@ -11,184 +11,184 @@
  */
 class Response extends Message implements ResponseInterface {
 
-    /**
-     * This is the list of currently registered HTTP status codes.
-     *
-     * @var array
-     */
-    static $statusCodes = [
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authorative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-Status', // RFC 4918
-        208 => 'Already Reported', // RFC 5842
-        226 => 'IM Used', // RFC 3229
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        418 => 'I\'m a teapot', // RFC 2324
-        421 => 'Misdirected Request', // RFC7540 (HTTP/2)
-        422 => 'Unprocessable Entity', // RFC 4918
-        423 => 'Locked', // RFC 4918
-        424 => 'Failed Dependency', // RFC 4918
-        426 => 'Upgrade Required',
-        428 => 'Precondition Required', // RFC 6585
-        429 => 'Too Many Requests', // RFC 6585
-        431 => 'Request Header Fields Too Large', // RFC 6585
-        451 => 'Unavailable For Legal Reasons', // draft-tbray-http-legally-restricted-status
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version not supported',
-        506 => 'Variant Also Negotiates',
-        507 => 'Insufficient Storage', // RFC 4918
-        508 => 'Loop Detected', // RFC 5842
-        509 => 'Bandwidth Limit Exceeded', // non-standard
-        510 => 'Not extended',
-        511 => 'Network Authentication Required', // RFC 6585
-    ];
-
-    /**
-     * HTTP status code
-     *
-     * @var int
-     */
-    protected $status;
-
-    /**
-     * HTTP status text
-     *
-     * @var string
-     */
-    protected $statusText;
-
-    /**
-     * Creates the response object
-     *
-     * @param string|int $status
-     * @param array $headers
-     * @param resource $body
-     * @return void
-     */
-    public function __construct($status = null, array $headers = null, $body = null) {
-
-        if (!is_null($status)) $this->setStatus($status);
-        if (!is_null($headers)) $this->setHeaders($headers);
-        if (!is_null($body)) $this->setBody($body);
-
-    }
-
-
-    /**
-     * Returns the current HTTP status code.
-     *
-     * @return int
-     */
-    public function getStatus() {
-
-        return $this->status;
-
-    }
-
-    /**
-     * Returns the human-readable status string.
-     *
-     * In the case of a 200, this may for example be 'OK'.
-     *
-     * @return string
-     */
-    public function getStatusText() {
-
-        return $this->statusText;
-
-    }
-
-    /**
-     * Sets the HTTP status code.
-     *
-     * This can be either the full HTTP status code with human readable string,
-     * for example: "403 I can't let you do that, Dave".
-     *
-     * Or just the code, in which case the appropriate default message will be
-     * added.
-     *
-     * @param string|int $status
-     * @throws \InvalidArgumentExeption
-     * @return void
-     */
-    public function setStatus($status) {
-
-        if (ctype_digit($status) || is_int($status)) {
-
-            $statusCode = $status;
-            $statusText = isset(self::$statusCodes[$status]) ? self::$statusCodes[$status] : 'Unknown';
-
-        } else {
-            list(
-                $statusCode,
-                $statusText
-            ) = explode(' ', $status, 2);
-        }
-        if ($statusCode < 100 || $statusCode > 999) {
-            throw new \InvalidArgumentException('The HTTP status code must be exactly 3 digits');
-        }
-
-        $this->status = $statusCode;
-        $this->statusText = $statusText;
-
-    }
-
-    /**
-     * Serializes the response object as a string.
-     *
-     * This is useful for debugging purposes.
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        $str = 'HTTP/' . $this->httpVersion . ' ' . $this->getStatus() . ' ' . $this->getStatusText() . "\r\n";
-        foreach ($this->getHeaders() as $key => $value) {
-            foreach ($value as $v) {
-                $str .= $key . ": " . $v . "\r\n";
-            }
-        }
-        $str .= "\r\n";
-        $str .= $this->getBodyAsString();
-        return $str;
-
-    }
+	/**
+	 * This is the list of currently registered HTTP status codes.
+	 *
+	 * @var array
+	 */
+	static $statusCodes = [
+		100 => 'Continue',
+		101 => 'Switching Protocols',
+		102 => 'Processing',
+		200 => 'OK',
+		201 => 'Created',
+		202 => 'Accepted',
+		203 => 'Non-Authorative Information',
+		204 => 'No Content',
+		205 => 'Reset Content',
+		206 => 'Partial Content',
+		207 => 'Multi-Status', // RFC 4918
+		208 => 'Already Reported', // RFC 5842
+		226 => 'IM Used', // RFC 3229
+		300 => 'Multiple Choices',
+		301 => 'Moved Permanently',
+		302 => 'Found',
+		303 => 'See Other',
+		304 => 'Not Modified',
+		305 => 'Use Proxy',
+		307 => 'Temporary Redirect',
+		308 => 'Permanent Redirect',
+		400 => 'Bad Request',
+		401 => 'Unauthorized',
+		402 => 'Payment Required',
+		403 => 'Forbidden',
+		404 => 'Not Found',
+		405 => 'Method Not Allowed',
+		406 => 'Not Acceptable',
+		407 => 'Proxy Authentication Required',
+		408 => 'Request Timeout',
+		409 => 'Conflict',
+		410 => 'Gone',
+		411 => 'Length Required',
+		412 => 'Precondition failed',
+		413 => 'Request Entity Too Large',
+		414 => 'Request-URI Too Long',
+		415 => 'Unsupported Media Type',
+		416 => 'Requested Range Not Satisfiable',
+		417 => 'Expectation Failed',
+		418 => 'I\'m a teapot', // RFC 2324
+		421 => 'Misdirected Request', // RFC7540 (HTTP/2)
+		422 => 'Unprocessable Entity', // RFC 4918
+		423 => 'Locked', // RFC 4918
+		424 => 'Failed Dependency', // RFC 4918
+		426 => 'Upgrade Required',
+		428 => 'Precondition Required', // RFC 6585
+		429 => 'Too Many Requests', // RFC 6585
+		431 => 'Request Header Fields Too Large', // RFC 6585
+		451 => 'Unavailable For Legal Reasons', // draft-tbray-http-legally-restricted-status
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+		502 => 'Bad Gateway',
+		503 => 'Service Unavailable',
+		504 => 'Gateway Timeout',
+		505 => 'HTTP Version not supported',
+		506 => 'Variant Also Negotiates',
+		507 => 'Insufficient Storage', // RFC 4918
+		508 => 'Loop Detected', // RFC 5842
+		509 => 'Bandwidth Limit Exceeded', // non-standard
+		510 => 'Not extended',
+		511 => 'Network Authentication Required', // RFC 6585
+	];
+
+	/**
+	 * HTTP status code
+	 *
+	 * @var int
+	 */
+	protected $status;
+
+	/**
+	 * HTTP status text
+	 *
+	 * @var string
+	 */
+	protected $statusText;
+
+	/**
+	 * Creates the response object
+	 *
+	 * @param string|int $status
+	 * @param array $headers
+	 * @param resource $body
+	 * @return void
+	 */
+	public function __construct($status = null, array $headers = null, $body = null) {
+
+		if (!is_null($status)) $this->setStatus($status);
+		if (!is_null($headers)) $this->setHeaders($headers);
+		if (!is_null($body)) $this->setBody($body);
+
+	}
+
+
+	/**
+	 * Returns the current HTTP status code.
+	 *
+	 * @return int
+	 */
+	public function getStatus() {
+
+		return $this->status;
+
+	}
+
+	/**
+	 * Returns the human-readable status string.
+	 *
+	 * In the case of a 200, this may for example be 'OK'.
+	 *
+	 * @return string
+	 */
+	public function getStatusText() {
+
+		return $this->statusText;
+
+	}
+
+	/**
+	 * Sets the HTTP status code.
+	 *
+	 * This can be either the full HTTP status code with human readable string,
+	 * for example: "403 I can't let you do that, Dave".
+	 *
+	 * Or just the code, in which case the appropriate default message will be
+	 * added.
+	 *
+	 * @param string|int $status
+	 * @throws \InvalidArgumentExeption
+	 * @return void
+	 */
+	public function setStatus($status) {
+
+		if (ctype_digit($status) || is_int($status)) {
+
+			$statusCode = $status;
+			$statusText = isset(self::$statusCodes[$status]) ? self::$statusCodes[$status] : 'Unknown';
+
+		} else {
+			list(
+				$statusCode,
+				$statusText
+			) = explode(' ', $status, 2);
+		}
+		if ($statusCode < 100 || $statusCode > 999) {
+			throw new \InvalidArgumentException('The HTTP status code must be exactly 3 digits');
+		}
+
+		$this->status = $statusCode;
+		$this->statusText = $statusText;
+
+	}
+
+	/**
+	 * Serializes the response object as a string.
+	 *
+	 * This is useful for debugging purposes.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+
+		$str = 'HTTP/' . $this->httpVersion . ' ' . $this->getStatus() . ' ' . $this->getStatusText() . "\r\n";
+		foreach ($this->getHeaders() as $key => $value) {
+			foreach ($value as $v) {
+				$str .= $key . ": " . $v . "\r\n";
+			}
+		}
+		$str .= "\r\n";
+		$str .= $this->getBodyAsString();
+		return $str;
+
+	}
 
 }

libraries/SabreDAV/HTTP/ClientHttpException.php

Indentation +40 added lines, -40 removed lines

@@ -14,45 +14,45 @@
  */
 class ClientHttpException extends \Exception implements HttpException {
 
-    /**
-     * Response object
-     *
-     * @var ResponseInterface
-     */
-    protected $response;
-
-    /**
-     * Constructor
-     *
-     * @param ResponseInterface $response
-     */
-    public function __construct(ResponseInterface $response) {
-
-        $this->response = $response;
-        parent::__construct($response->getStatusText(), $response->getStatus());
-
-    }
-
-    /**
-     * The http status code for the error.
-     *
-     * @return int
-     */
-    public function getHttpStatus() {
-
-        return $this->response->getStatus();
-
-    }
-
-    /**
-     * Returns the full response object.
-     *
-     * @return ResponseInterface
-     */
-    public function getResponse() {
-
-        return $this->response;
-
-    }
+	/**
+	 * Response object
+	 *
+	 * @var ResponseInterface
+	 */
+	protected $response;
+
+	/**
+	 * Constructor
+	 *
+	 * @param ResponseInterface $response
+	 */
+	public function __construct(ResponseInterface $response) {
+
+		$this->response = $response;
+		parent::__construct($response->getStatusText(), $response->getStatus());
+
+	}
+
+	/**
+	 * The http status code for the error.
+	 *
+	 * @return int
+	 */
+	public function getHttpStatus() {
+
+		return $this->response->getStatus();
+
+	}
+
+	/**
+	 * Returns the full response object.
+	 *
+	 * @return ResponseInterface
+	 */
+	public function getResponse() {
+
+		return $this->response;
+
+	}
 
 }

libraries/SabreDAV/HTTP/ResponseDecorator.php

Indentation +67 added lines, -67 removed lines

@@ -14,71 +14,71 @@
  */
 class ResponseDecorator implements ResponseInterface {
 
-    use MessageDecoratorTrait;
-
-    /**
-     * Constructor.
-     *
-     * @param ResponseInterface $inner
-     */
-    public function __construct(ResponseInterface $inner) {
-
-        $this->inner = $inner;
-
-    }
-
-    /**
-     * Returns the current HTTP status code.
-     *
-     * @return int
-     */
-    public function getStatus() {
-
-        return $this->inner->getStatus();
-
-    }
-
-
-    /**
-     * Returns the human-readable status string.
-     *
-     * In the case of a 200, this may for example be 'OK'.
-     *
-     * @return string
-     */
-    public function getStatusText() {
-
-        return $this->inner->getStatusText();
-
-    }
-    /**
-     * Sets the HTTP status code.
-     *
-     * This can be either the full HTTP status code with human readable string,
-     * for example: "403 I can't let you do that, Dave".
-     *
-     * Or just the code, in which case the appropriate default message will be
-     * added.
-     *
-     * @param string|int $status
-     * @return void
-     */
-    public function setStatus($status) {
-
-        $this->inner->setStatus($status);
-
-    }
-
-    /**
-     * Serializes the request object as a string.
-     *
-     * This is useful for debugging purposes.
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return $this->inner->__toString();
-
-    }
+	use MessageDecoratorTrait;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param ResponseInterface $inner
+	 */
+	public function __construct(ResponseInterface $inner) {
+
+		$this->inner = $inner;
+
+	}
+
+	/**
+	 * Returns the current HTTP status code.
+	 *
+	 * @return int
+	 */
+	public function getStatus() {
+
+		return $this->inner->getStatus();
+
+	}
+
+
+	/**
+	 * Returns the human-readable status string.
+	 *
+	 * In the case of a 200, this may for example be 'OK'.
+	 *
+	 * @return string
+	 */
+	public function getStatusText() {
+
+		return $this->inner->getStatusText();
+
+	}
+	/**
+	 * Sets the HTTP status code.
+	 *
+	 * This can be either the full HTTP status code with human readable string,
+	 * for example: "403 I can't let you do that, Dave".
+	 *
+	 * Or just the code, in which case the appropriate default message will be
+	 * added.
+	 *
+	 * @param string|int $status
+	 * @return void
+	 */
+	public function setStatus($status) {
+
+		$this->inner->setStatus($status);
+
+	}
+
+	/**
+	 * Serializes the request object as a string.
+	 *
+	 * This is useful for debugging purposes.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+
+		return $this->inner->__toString();
+
+	}
 }

libraries/SabreDAV/HTTP/HttpException.php

Indentation +9 added lines, -9 removed lines

@@ -17,14 +17,14 @@
  */
 interface HttpException {
 
-    /**
-     * The http status code for the error.
-     *
-     * This may either be just the number, or a number and a human-readable
-     * message, separated by a space.
-     *
-     * @return string|null
-     */
-    public function getHttpStatus();
+	/**
+	 * The http status code for the error.
+	 *
+	 * This may either be just the number, or a number and a human-readable
+	 * message, separated by a space.
+	 *
+	 * @return string|null
+	 */
+	public function getHttpStatus();
 
 }