diff --git a/.gitignore b/.gitignore
index 68c48822e9..ac58f3e6a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
data
owncloud
config/config.php
+config/mount.php
+apps/inc.php
# just sane ignores
.*.sw[po]
diff --git a/.htaccess b/.htaccess
index 11520d743d..adc6667d5b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +1,9 @@
ErrorDocument 403 /core/templates/403.php
ErrorDocument 404 /core/templates/404.php
+Redirect 301 /apps/calendar/caldav.php /remote/caldav.php
+Redirect 301 /apps/contacts/carddav.php /remote/carddav.php
+Redirect 301 /apps/files/webdav.php /remote/webdav.php
+Redirect 301 /files/webdav.php /remote/webdav.php
php_value upload_max_filesize 512M
php_value post_max_size 512M
@@ -10,6 +14,10 @@ php_value memory_limit 512M
RewriteEngine on
-RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]
+RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+RewriteRule ^.well-known/carddav /remote/carddav.php [R]
+RewriteRule ^.well-known/caldav /remote/caldav.php [R]
+
+RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
Options -Indexes
diff --git a/3rdparty/Sabre.includes.php b/3rdparty/Sabre.includes.php
index d41b287b77..c133437366 100644
--- a/3rdparty/Sabre.includes.php
+++ b/3rdparty/Sabre.includes.php
@@ -3,125 +3,24 @@
/**
* Library include file
*
+ * This file is deprecated, don't use it!
+ * Instead, use the specific includes files that are in the sub-packages.
+ *
+ * Sabre/DAV/includes.php
+ * Sabre/HTTP/includes.php
+ *
+ * etc..
+ *
* This file contains all includes to the rest of the SabreDAV library
- * Make sure the lib/ directory is in PHP's include_path
+ * Make sure the lib/ directory is in PHP's include_path.
*
* @package Sabre
- * @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @deprecated Don't use this file, it will be remove in a future version
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
-/* Utilities */
-include 'Sabre/HTTP/Util.php';
-include 'Sabre/HTTP/Response.php';
-include 'Sabre/HTTP/Request.php';
-include 'Sabre/HTTP/AbstractAuth.php';
-include 'Sabre/HTTP/BasicAuth.php';
-include 'Sabre/HTTP/DigestAuth.php';
-include 'Sabre/HTTP/AWSAuth.php';
-
-/* Version */
-include 'Sabre/DAV/Version.php';
-include 'Sabre/HTTP/Version.php';
-
-/* Exceptions */
-include 'Sabre/DAV/Exception.php';
-include 'Sabre/DAV/Exception/BadRequest.php';
-include 'Sabre/DAV/Exception/Conflict.php';
-include 'Sabre/DAV/Exception/FileNotFound.php';
-include 'Sabre/DAV/Exception/InsufficientStorage.php';
-include 'Sabre/DAV/Exception/Locked.php';
-include 'Sabre/DAV/Exception/LockTokenMatchesRequestUri.php';
-include 'Sabre/DAV/Exception/MethodNotAllowed.php';
-include 'Sabre/DAV/Exception/NotImplemented.php';
-include 'Sabre/DAV/Exception/Forbidden.php';
-include 'Sabre/DAV/Exception/PreconditionFailed.php';
-include 'Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php';
-include 'Sabre/DAV/Exception/UnsupportedMediaType.php';
-include 'Sabre/DAV/Exception/NotAuthenticated.php';
-
-include 'Sabre/DAV/Exception/ConflictingLock.php';
-include 'Sabre/DAV/Exception/ReportNotImplemented.php';
-include 'Sabre/DAV/Exception/InvalidResourceType.php';
-
-/* Properties */
-include 'Sabre/DAV/Property.php';
-include 'Sabre/DAV/Property/GetLastModified.php';
-include 'Sabre/DAV/Property/ResourceType.php';
-include 'Sabre/DAV/Property/SupportedLock.php';
-include 'Sabre/DAV/Property/LockDiscovery.php';
-include 'Sabre/DAV/Property/IHref.php';
-include 'Sabre/DAV/Property/Href.php';
-include 'Sabre/DAV/Property/HrefList.php';
-include 'Sabre/DAV/Property/SupportedReportSet.php';
-include 'Sabre/DAV/Property/Response.php';
-include 'Sabre/DAV/Property/ResponseList.php';
-
-/* Node interfaces */
-include 'Sabre/DAV/INode.php';
-include 'Sabre/DAV/IFile.php';
-include 'Sabre/DAV/ICollection.php';
-include 'Sabre/DAV/IProperties.php';
-include 'Sabre/DAV/ILockable.php';
-include 'Sabre/DAV/IQuota.php';
-include 'Sabre/DAV/IExtendedCollection.php';
-
-/* Node abstract implementations */
-include 'Sabre/DAV/Node.php';
-include 'Sabre/DAV/File.php';
-include 'Sabre/DAV/Collection.php';
-include 'Sabre/DAV/Directory.php';
-
-/* Utilities */
-include 'Sabre/DAV/SimpleCollection.php';
-include 'Sabre/DAV/SimpleDirectory.php';
-include 'Sabre/DAV/XMLUtil.php';
-include 'Sabre/DAV/URLUtil.php';
-
-/* Filesystem implementation */
-include 'Sabre/DAV/FS/Node.php';
-include 'Sabre/DAV/FS/File.php';
-include 'Sabre/DAV/FS/Directory.php';
-
-/* Advanced filesystem implementation */
-include 'Sabre/DAV/FSExt/Node.php';
-include 'Sabre/DAV/FSExt/File.php';
-include 'Sabre/DAV/FSExt/Directory.php';
-
-/* Trees */
-include 'Sabre/DAV/Tree.php';
-include 'Sabre/DAV/ObjectTree.php';
-include 'Sabre/DAV/Tree/Filesystem.php';
-
-/* Server */
-include 'Sabre/DAV/Server.php';
-include 'Sabre/DAV/ServerPlugin.php';
-
-/* Browser */
-include 'Sabre/DAV/Browser/Plugin.php';
-include 'Sabre/DAV/Browser/MapGetToPropFind.php';
-include 'Sabre/DAV/Browser/GuessContentType.php';
-
-/* Locks */
-include 'Sabre/DAV/Locks/LockInfo.php';
-include 'Sabre/DAV/Locks/Plugin.php';
-include 'Sabre/DAV/Locks/Backend/Abstract.php';
-include 'Sabre/DAV/Locks/Backend/FS.php';
-include 'Sabre/DAV/Locks/Backend/PDO.php';
-
-/* Temporary File Filter plugin */
-include 'Sabre/DAV/TemporaryFileFilterPlugin.php';
-
-/* Authentication plugin */
-include 'Sabre/DAV/Auth/Plugin.php';
-include 'Sabre/DAV/Auth/IBackend.php';
-include 'Sabre/DAV/Auth/Backend/AbstractDigest.php';
-include 'Sabre/DAV/Auth/Backend/AbstractBasic.php';
-include 'Sabre/DAV/Auth/Backend/File.php';
-include 'Sabre/DAV/Auth/Backend/PDO.php';
-
-/* DavMount plugin */
-include 'Sabre/DAV/Mount/Plugin.php';
+include 'Sabre/HTTP/includes.php';
+include 'Sabre/DAV/includes.php';
diff --git a/3rdparty/Sabre/CalDAV/Backend/Abstract.php b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
index b694eef49e..7aba1d69ff 100644
--- a/3rdparty/Sabre/CalDAV/Backend/Abstract.php
+++ b/3rdparty/Sabre/CalDAV/Backend/Abstract.php
@@ -2,10 +2,10 @@
/**
* Abstract Calendaring backend. Extend this class to create your own backends.
- *
+ *
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -17,16 +17,16 @@ abstract class Sabre_CalDAV_Backend_Abstract {
* Every project is an array with the following keys:
* * id, a unique id that will be used by other functions to modify the
* calendar. This can be the same as the uri or a database key.
- * * uri, which the basename of the uri with which the calendar is
+ * * uri, which the basename of the uri with which the calendar is
* accessed.
- * * principalUri. The owner of the calendar. Almost always the same as
+ * * principaluri. The owner of the calendar. Almost always the same as
* principalUri passed to this method.
*
* Furthermore it can contain webdav properties in clark notation. A very
- * common one is '{DAV:}displayname'.
+ * common one is '{DAV:}displayname'.
*
- * @param string $principalUri
- * @return array
+ * @param string $principalUri
+ * @return array
*/
abstract function getCalendarsForUser($principalUri);
@@ -39,9 +39,9 @@ abstract class Sabre_CalDAV_Backend_Abstract {
* @param string $principalUri
* @param string $calendarUri
* @param array $properties
- * @return void
+ * @return void
*/
- abstract function createCalendar($principalUri,$calendarUri,array $properties);
+ abstract function createCalendar($principalUri,$calendarUri,array $properties);
/**
* Updates properties for a calendar.
@@ -56,7 +56,7 @@ abstract class Sabre_CalDAV_Backend_Abstract {
* If the operation was successful, true can be returned.
* If the operation failed, false can be returned.
*
- * Deletion of a non-existant property is always succesful.
+ * Deletion of a non-existent property is always successful.
*
* Lastly, it is optional to return detailed information about any
* failures. In this case an array should be returned with the following
@@ -71,24 +71,24 @@ abstract class Sabre_CalDAV_Backend_Abstract {
* )
* )
*
- * In this example it was forbidden to update {DAV:}displayname.
+ * In this example it was forbidden to update {DAV:}displayname.
* (403 Forbidden), which in turn also caused {DAV:}owner to fail
* (424 Failed Dependency) because the request needs to be atomic.
*
* @param string $calendarId
* @param array $mutations
- * @return bool|array
+ * @return bool|array
*/
public function updateCalendar($calendarId, array $mutations) {
-
- return false;
+
+ return false;
}
/**
- * Delete a calendar and all it's objects
- *
- * @param string $calendarId
+ * Delete a calendar and all it's objects
+ *
+ * @param string $calendarId
* @return void
*/
abstract function deleteCalendar($calendarId);
@@ -98,22 +98,27 @@ abstract class Sabre_CalDAV_Backend_Abstract {
*
* Every item contains an array with the following keys:
* * id - unique identifier which will be used for subsequent updates
- * * calendardata - The iCalendar-compatible calnedar data
+ * * calendardata - The iCalendar-compatible calendar data
* * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
* * lastmodified - a timestamp of the last modification time
- * * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+ * * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
* ' "abcdef"')
* * calendarid - The calendarid as it was passed to this function.
+ * * size - The size of the calendar objects, in bytes.
*
- * Note that the etag is optional, but it's highly encouraged to return for
+ * Note that the etag is optional, but it's highly encouraged to return for
* speed reasons.
*
- * The calendardata is also optional. If it's not returned
- * 'getCalendarObject' will be called later, which *is* expected to return
+ * The calendardata is also optional. If it's not returned
+ * 'getCalendarObject' will be called later, which *is* expected to return
* calendardata.
- *
- * @param string $calendarId
- * @return array
+ *
+ * If neither etag or size are specified, the calendardata will be
+ * used/fetched to determine these numbers. If both are specified the
+ * amount of times this is needed is reduced by a great degree.
+ *
+ * @param string $calendarId
+ * @return array
*/
abstract function getCalendarObjects($calendarId);
@@ -121,41 +126,41 @@ abstract class Sabre_CalDAV_Backend_Abstract {
* Returns information from a single calendar object, based on it's object
* uri.
*
- * The returned array must have the same keys as getCalendarObjects. The
- * 'calendardata' object is required here though, while it's not required
+ * The returned array must have the same keys as getCalendarObjects. The
+ * 'calendardata' object is required here though, while it's not required
* for getCalendarObjects.
- *
- * @param string $calendarId
- * @param string $objectUri
- * @return array
+ *
+ * @param string $calendarId
+ * @param string $objectUri
+ * @return array
*/
abstract function getCalendarObject($calendarId,$objectUri);
/**
- * Creates a new calendar object.
- *
- * @param string $calendarId
- * @param string $objectUri
- * @param string $calendarData
+ * Creates a new calendar object.
+ *
+ * @param string $calendarId
+ * @param string $objectUri
+ * @param string $calendarData
* @return void
*/
abstract function createCalendarObject($calendarId,$objectUri,$calendarData);
/**
- * Updates an existing calendarobject, based on it's uri.
- *
- * @param string $calendarId
- * @param string $objectUri
- * @param string $calendarData
+ * Updates an existing calendarobject, based on it's uri.
+ *
+ * @param string $calendarId
+ * @param string $objectUri
+ * @param string $calendarData
* @return void
*/
abstract function updateCalendarObject($calendarId,$objectUri,$calendarData);
/**
- * Deletes an existing calendar object.
- *
- * @param string $calendarId
- * @param string $objectUri
+ * Deletes an existing calendar object.
+ *
+ * @param string $calendarId
+ * @param string $objectUri
* @return void
*/
abstract function deleteCalendarObject($calendarId,$objectUri);
diff --git a/3rdparty/Sabre/CalDAV/Backend/PDO.php b/3rdparty/Sabre/CalDAV/Backend/PDO.php
index 7b1b33b912..ddacf940c7 100644
--- a/3rdparty/Sabre/CalDAV/Backend/PDO.php
+++ b/3rdparty/Sabre/CalDAV/Backend/PDO.php
@@ -3,35 +3,35 @@
/**
* PDO CalDAV backend
*
- * This backend is used to store calendar-data in a PDO database, such as
+ * This backend is used to store calendar-data in a PDO database, such as
* sqlite or MySQL
- *
+ *
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
/**
- * pdo
- *
+ * pdo
+ *
* @var PDO
*/
protected $pdo;
/**
- * The table name that will be used for calendars
- *
- * @var string
+ * The table name that will be used for calendars
+ *
+ * @var string
*/
protected $calendarTableName;
/**
- * The table name that will be used for calendar objects
- *
- * @var string
+ * The table name that will be used for calendar objects
+ *
+ * @var string
*/
protected $calendarObjectTableName;
@@ -39,7 +39,7 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
* List of CalDAV properties, and how they map to database fieldnames
*
* Add your own properties by simply adding on to this array
- *
+ *
* @var array
*/
public $propertyMap = array(
@@ -51,9 +51,11 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
);
/**
- * Creates the backend
- *
- * @param PDO $pdo
+ * Creates the backend
+ *
+ * @param PDO $pdo
+ * @param string $calendarTableName
+ * @param string $calendarObjectTableName
*/
public function __construct(PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects') {
@@ -69,16 +71,16 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
* Every project is an array with the following keys:
* * id, a unique id that will be used by other functions to modify the
* calendar. This can be the same as the uri or a database key.
- * * uri, which the basename of the uri with which the calendar is
+ * * uri, which the basename of the uri with which the calendar is
* accessed.
- * * principalUri. The owner of the calendar. Almost always the same as
+ * * principaluri. The owner of the calendar. Almost always the same as
* principalUri passed to this method.
*
* Furthermore it can contain webdav properties in clark notation. A very
- * common one is '{DAV:}displayname'.
+ * common one is '{DAV:}displayname'.
*
- * @param string $principalUri
- * @return array
+ * @param string $principalUri
+ * @return array
*/
public function getCalendarsForUser($principalUri) {
@@ -89,15 +91,18 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
$fields[] = 'components';
$fields[] = 'principaluri';
- // Making fields a comma-delimited list
+ // Making fields a comma-delimited list
$fields = implode(', ', $fields);
- $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM `".$this->calendarTableName."` WHERE principaluri = ?");
+ $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM ".$this->calendarTableName." WHERE principaluri = ? ORDER BY calendarorder ASC");
$stmt->execute(array($principalUri));
$calendars = array();
while($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
- $components = explode(',',$row['components']);
+ $components = array();
+ if ($row['components']) {
+ $components = explode(',',$row['components']);
+ }
$calendar = array(
'id' => $row['id'],
@@ -106,7 +111,7 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
'{' . Sabre_CalDAV_Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
'{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set' => new Sabre_CalDAV_Property_SupportedCalendarComponentSet($components),
);
-
+
foreach($this->propertyMap as $xmlName=>$dbName) {
$calendar[$xmlName] = $row[$dbName];
@@ -129,8 +134,9 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
* @param string $principalUri
* @param string $calendarUri
* @param array $properties
+ * @return string
*/
- public function createCalendar($principalUri,$calendarUri, array $properties) {
+ public function createCalendar($principalUri, $calendarUri, array $properties) {
$fieldNames = array(
'principaluri',
@@ -158,13 +164,12 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
foreach($this->propertyMap as $xmlName=>$dbName) {
if (isset($properties[$xmlName])) {
- $myValue = $properties[$xmlName];
$values[':' . $dbName] = $properties[$xmlName];
$fieldNames[] = $dbName;
}
}
- $stmt = $this->pdo->prepare("INSERT INTO `".$this->calendarTableName."` (".implode(', ', $fieldNames).") VALUES (".implode(', ',array_keys($values)).")");
+ $stmt = $this->pdo->prepare("INSERT INTO ".$this->calendarTableName." (".implode(', ', $fieldNames).") VALUES (".implode(', ',array_keys($values)).")");
$stmt->execute($values);
return $this->pdo->lastInsertId();
@@ -184,7 +189,7 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
* If the operation was successful, true can be returned.
* If the operation failed, false can be returned.
*
- * Deletion of a non-existant property is always succesful.
+ * Deletion of a non-existent property is always successful.
*
* Lastly, it is optional to return detailed information about any
* failures. In this case an array should be returned with the following
@@ -199,13 +204,13 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
* )
* )
*
- * In this example it was forbidden to update {DAV:}displayname.
+ * In this example it was forbidden to update {DAV:}displayname.
* (403 Forbidden), which in turn also caused {DAV:}owner to fail
* (424 Failed Dependency) because the request needs to be atomic.
*
* @param string $calendarId
- * @param array $mutations
- * @return bool|array
+ * @param array $mutations
+ * @return bool|array
*/
public function updateCalendar($calendarId, array $mutations) {
@@ -220,7 +225,7 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
foreach($mutations as $propertyName=>$propertyValue) {
- // We don't know about this property.
+ // We don't know about this property.
if (!isset($this->propertyMap[$propertyName])) {
$hasError = true;
$result[403][$propertyName] = null;
@@ -230,7 +235,7 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
$fieldName = $this->propertyMap[$propertyName];
$newValues[$fieldName] = $propertyValue;
-
+
}
// If there were any errors we need to fail the request
@@ -258,55 +263,60 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
}
$valuesSql[] = 'ctag = ctag + 1';
- $stmt = $this->pdo->prepare("UPDATE `" . $this->calendarTableName . "` SET " . implode(', ',$valuesSql) . " WHERE id = ?");
- $newValues['id'] = $calendarId;
+ $stmt = $this->pdo->prepare("UPDATE " . $this->calendarTableName . " SET " . implode(', ',$valuesSql) . " WHERE id = ?");
+ $newValues['id'] = $calendarId;
$stmt->execute(array_values($newValues));
- return true;
+ return true;
}
/**
- * Delete a calendar and all it's objects
- *
- * @param string $calendarId
+ * Delete a calendar and all it's objects
+ *
+ * @param string $calendarId
* @return void
*/
public function deleteCalendar($calendarId) {
- $stmt = $this->pdo->prepare('DELETE FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ?');
+ $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
$stmt->execute(array($calendarId));
- $stmt = $this->pdo->prepare('DELETE FROM `'.$this->calendarTableName.'` WHERE id = ?');
+ $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarTableName.' WHERE id = ?');
$stmt->execute(array($calendarId));
}
/**
- * Returns all calendar objects within a calendar.
+ * Returns all calendar objects within a calendar.
*
* Every item contains an array with the following keys:
* * id - unique identifier which will be used for subsequent updates
- * * calendardata - The iCalendar-compatible calnedar data
+ * * calendardata - The iCalendar-compatible calendar data
* * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
* * lastmodified - a timestamp of the last modification time
- * * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+ * * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
* ' "abcdef"')
* * calendarid - The calendarid as it was passed to this function.
+ * * size - The size of the calendar objects, in bytes.
*
- * Note that the etag is optional, but it's highly encouraged to return for
+ * Note that the etag is optional, but it's highly encouraged to return for
* speed reasons.
*
- * The calendardata is also optional. If it's not returned
- * 'getCalendarObject' will be called later, which *is* expected to return
+ * The calendardata is also optional. If it's not returned
+ * 'getCalendarObject' will be called later, which *is* expected to return
* calendardata.
- *
- * @param string $calendarId
- * @return array
+ *
+ * If neither etag or size are specified, the calendardata will be
+ * used/fetched to determine these numbers. If both are specified the
+ * amount of times this is needed is reduced by a great degree.
+ *
+ * @param string $calendarId
+ * @return array
*/
public function getCalendarObjects($calendarId) {
- $stmt = $this->pdo->prepare('SELECT * FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ?');
+ $stmt = $this->pdo->prepare('SELECT * FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
$stmt->execute(array($calendarId));
return $stmt->fetchAll();
@@ -316,68 +326,68 @@ class Sabre_CalDAV_Backend_PDO extends Sabre_CalDAV_Backend_Abstract {
* Returns information from a single calendar object, based on it's object
* uri.
*
- * The returned array must have the same keys as getCalendarObjects. The
- * 'calendardata' object is required here though, while it's not required
+ * The returned array must have the same keys as getCalendarObjects. The
+ * 'calendardata' object is required here though, while it's not required
* for getCalendarObjects.
- *
- * @param string $calendarId
- * @param string $objectUri
- * @return array
+ *
+ * @param string $calendarId
+ * @param string $objectUri
+ * @return array
*/
public function getCalendarObject($calendarId,$objectUri) {
- $stmt = $this->pdo->prepare('SELECT * FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ? AND uri = ?');
+ $stmt = $this->pdo->prepare('SELECT * FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
$stmt->execute(array($calendarId, $objectUri));
return $stmt->fetch();
}
/**
- * Creates a new calendar object.
- *
- * @param string $calendarId
- * @param string $objectUri
- * @param string $calendarData
+ * Creates a new calendar object.
+ *
+ * @param string $calendarId
+ * @param string $objectUri
+ * @param string $calendarData
* @return void
*/
public function createCalendarObject($calendarId,$objectUri,$calendarData) {
- $stmt = $this->pdo->prepare('INSERT INTO `'.$this->calendarObjectTableName.'` (calendarid, uri, calendardata, lastmodified) VALUES (?,?,?,?)');
+ $stmt = $this->pdo->prepare('INSERT INTO '.$this->calendarObjectTableName.' (calendarid, uri, calendardata, lastmodified) VALUES (?,?,?,?)');
$stmt->execute(array($calendarId,$objectUri,$calendarData,time()));
- $stmt = $this->pdo->prepare('UPDATE `'.$this->calendarTableName.'` SET ctag = ctag + 1 WHERE id = ?');
+ $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
$stmt->execute(array($calendarId));
}
/**
- * Updates an existing calendarobject, based on it's uri.
- *
- * @param string $calendarId
- * @param string $objectUri
- * @param string $calendarData
+ * Updates an existing calendarobject, based on it's uri.
+ *
+ * @param string $calendarId
+ * @param string $objectUri
+ * @param string $calendarData
* @return void
*/
public function updateCalendarObject($calendarId,$objectUri,$calendarData) {
- $stmt = $this->pdo->prepare('UPDATE `'.$this->calendarObjectTableName.'` SET calendardata = ?, lastmodified = ? WHERE calendarid = ? AND uri = ?');
+ $stmt = $this->pdo->prepare('UPDATE '.$this->calendarObjectTableName.' SET calendardata = ?, lastmodified = ? WHERE calendarid = ? AND uri = ?');
$stmt->execute(array($calendarData,time(),$calendarId,$objectUri));
- $stmt = $this->pdo->prepare('UPDATE `'.$this->calendarTableName.'` SET ctag = ctag + 1 WHERE id = ?');
+ $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
$stmt->execute(array($calendarId));
}
/**
- * Deletes an existing calendar object.
- *
- * @param string $calendarId
- * @param string $objectUri
+ * Deletes an existing calendar object.
+ *
+ * @param string $calendarId
+ * @param string $objectUri
* @return void
*/
public function deleteCalendarObject($calendarId,$objectUri) {
- $stmt = $this->pdo->prepare('DELETE FROM `'.$this->calendarObjectTableName.'` WHERE calendarid = ? AND uri = ?');
+ $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
$stmt->execute(array($calendarId,$objectUri));
- $stmt = $this->pdo->prepare('UPDATE `'. $this->calendarTableName .'` SET ctag = ctag + 1 WHERE id = ?');
+ $stmt = $this->pdo->prepare('UPDATE '. $this->calendarTableName .' SET ctag = ctag + 1 WHERE id = ?');
$stmt->execute(array($calendarId));
}
diff --git a/3rdparty/Sabre/CalDAV/Calendar.php b/3rdparty/Sabre/CalDAV/Calendar.php
index 0d2b387577..623df2dd1b 100644
--- a/3rdparty/Sabre/CalDAV/Calendar.php
+++ b/3rdparty/Sabre/CalDAV/Calendar.php
@@ -5,42 +5,42 @@
*
* A calendar can contain multiple TODO and or Events. These are represented
* as Sabre_CalDAV_CalendarObject objects.
- *
+ *
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProperties, Sabre_DAVACL_IACL {
/**
- * This is an array with calendar information
- *
- * @var array
+ * This is an array with calendar information
+ *
+ * @var array
*/
protected $calendarInfo;
/**
- * CalDAV backend
- *
- * @var Sabre_CalDAV_Backend_Abstract
+ * CalDAV backend
+ *
+ * @var Sabre_CalDAV_Backend_Abstract
*/
protected $caldavBackend;
/**
* Principal backend
- *
+ *
* @var Sabre_DAVACL_IPrincipalBackend
*/
protected $principalBackend;
/**
- * Constructor
- *
- * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
- * @param array $calendarInfo
- * @return void
+ * Constructor
+ *
+ * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+ * @param Sabre_CalDAV_Backend_Abstract $caldavBackend
+ * @param array $calendarInfo
*/
public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, Sabre_CalDAV_Backend_Abstract $caldavBackend, $calendarInfo) {
@@ -52,9 +52,9 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
}
/**
- * Returns the name of the calendar
- *
- * @return string
+ * Returns the name of the calendar
+ *
+ * @return string
*/
public function getName() {
@@ -63,10 +63,10 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
}
/**
- * Updates properties such as the display name and description
- *
- * @param array $mutations
- * @return array
+ * Updates properties such as the display name and description
+ *
+ * @param array $mutations
+ * @return array
*/
public function updateProperties($mutations) {
@@ -75,10 +75,10 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
}
/**
- * Returns the list of properties
- *
- * @param array $properties
- * @return array
+ * Returns the list of properties
+ *
+ * @param array $requestedProperties
+ * @return array
*/
public function getProperties($requestedProperties) {
@@ -86,16 +86,16 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
foreach($requestedProperties as $prop) switch($prop) {
- case '{urn:ietf:params:xml:ns:caldav}supported-calendar-data' :
- $response[$prop] = new Sabre_CalDAV_Property_SupportedCalendarData();
+ case '{urn:ietf:params:xml:ns:caldav}supported-calendar-data' :
+ $response[$prop] = new Sabre_CalDAV_Property_SupportedCalendarData();
break;
- case '{urn:ietf:params:xml:ns:caldav}supported-collation-set' :
- $response[$prop] = new Sabre_CalDAV_Property_SupportedCollationSet();
+ case '{urn:ietf:params:xml:ns:caldav}supported-collation-set' :
+ $response[$prop] = new Sabre_CalDAV_Property_SupportedCollationSet();
break;
case '{DAV:}owner' :
$response[$prop] = new Sabre_DAVACL_Property_Principal(Sabre_DAVACL_Property_Principal::HREF,$this->calendarInfo['principaluri']);
break;
- default :
+ default :
if (isset($this->calendarInfo[$prop])) $response[$prop] = $this->calendarInfo[$prop];
break;
@@ -108,22 +108,22 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
* Returns a calendar object
*
* The contained calendar objects are for example Events or Todo's.
- *
- * @param string $name
- * @return Sabre_DAV_ICalendarObject
+ *
+ * @param string $name
+ * @return Sabre_DAV_ICalendarObject
*/
public function getChild($name) {
$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
- if (!$obj) throw new Sabre_DAV_Exception_FileNotFound('Calendar object not found');
+ if (!$obj) throw new Sabre_DAV_Exception_NotFound('Calendar object not found');
return new Sabre_CalDAV_CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
}
/**
- * Returns the full list of calendar objects
- *
- * @return array
+ * Returns the full list of calendar objects
+ *
+ * @return array
*/
public function getChildren() {
@@ -137,17 +137,17 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
}
/**
- * Checks if a child-node exists.
- *
- * @param string $name
- * @return bool
+ * Checks if a child-node exists.
+ *
+ * @param string $name
+ * @return bool
*/
public function childExists($name) {
$obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
- if (!$obj)
+ if (!$obj)
return false;
- else
+ else
return true;
}
@@ -156,8 +156,8 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
* Creates a new directory
*
* We actually block this, as subdirectories are not allowed in calendars.
- *
- * @param string $name
+ *
+ * @param string $name
* @return void
*/
public function createDirectory($name) {
@@ -170,32 +170,23 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
* Creates a new file
*
* The contents of the new file must be a valid ICalendar string.
- *
- * @param string $name
- * @param resource $calendarData
- * @return void
+ *
+ * @param string $name
+ * @param resource $calendarData
+ * @return string|null
*/
public function createFile($name,$calendarData = null) {
- $calendarData = stream_get_contents($calendarData);
- // Converting to UTF-8, if needed
- $calendarData = Sabre_DAV_StringUtil::ensureUTF8($calendarData);
-
- $supportedComponents = $this->calendarInfo['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set'];
- if ($supportedComponents) {
- $supportedComponents = $supportedComponents->getValue();
- } else {
- $supportedComponents = null;
+ if (is_resource($calendarData)) {
+ $calendarData = stream_get_contents($calendarData);
}
- Sabre_CalDAV_ICalendarUtil::validateICalendarObject($calendarData, $supportedComponents);
-
- $this->caldavBackend->createCalendarObject($this->calendarInfo['id'],$name,$calendarData);
+ return $this->caldavBackend->createCalendarObject($this->calendarInfo['id'],$name,$calendarData);
}
/**
- * Deletes the calendar.
- *
+ * Deletes the calendar.
+ *
* @return void
*/
public function delete() {
@@ -205,10 +196,10 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
}
/**
- * Renames the calendar. Note that most calendars use the
- * {DAV:}displayname to display a name to display a name.
- *
- * @param string $newName
+ * Renames the calendar. Note that most calendars use the
+ * {DAV:}displayname to display a name to display a name.
+ *
+ * @param string $newName
* @return void
*/
public function setName($newName) {
@@ -219,7 +210,7 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
/**
* Returns the last modification date as a unix timestamp.
- *
+ *
* @return void
*/
public function getLastModified() {
@@ -231,8 +222,8 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
/**
* Returns the owner principal
*
- * This must be a url to a principal, or null if there's no owner
- *
+ * This must be a url to a principal, or null if there's no owner
+ *
* @return string|null
*/
public function getOwner() {
@@ -245,8 +236,8 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
* Returns a group principal
*
* This must be a url to a principal, or null if there's no owner
- *
- * @return string|null
+ *
+ * @return string|null
*/
public function getGroup() {
@@ -258,13 +249,13 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
* Returns a list of ACE's for this node.
*
* Each ACE has the following properties:
- * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+ * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
* currently the only supported privileges
* * 'principal', a url to the principal who owns the node
- * * 'protected' (optional), indicating that this ACE is not allowed to
- * be updated.
- *
- * @return array
+ * * 'protected' (optional), indicating that this ACE is not allowed to
+ * be updated.
+ *
+ * @return array
*/
public function getACL() {
@@ -294,6 +285,11 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
'protected' => true,
),
+ array(
+ 'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
+ 'principal' => '{DAV:}authenticated',
+ 'protected' => true,
+ ),
);
@@ -302,9 +298,9 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
/**
* Updates the ACL
*
- * This method will receive a list of new ACE's.
- *
- * @param array $acl
+ * This method will receive a list of new ACE's.
+ *
+ * @param array $acl
* @return void
*/
public function setACL(array $acl) {
@@ -313,6 +309,35 @@ class Sabre_CalDAV_Calendar implements Sabre_CalDAV_ICalendar, Sabre_DAV_IProper
}
+ /**
+ * Returns the list of supported privileges for this node.
+ *
+ * The returned data structure is a list of nested privileges.
+ * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+ * standard structure.
+ *
+ * If null is returned from this method, the default privilege set is used,
+ * which is fine for most common usecases.
+ *
+ * @return array|null
+ */
+ public function getSupportedPrivilegeSet() {
+ $default = Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet();
+
+ // We need to inject 'read-free-busy' in the tree, aggregated under
+ // {DAV:}read.
+ foreach($default['aggregates'] as &$agg) {
+
+ if ($agg['privilege'] !== '{DAV:}read') continue;
+
+ $agg['aggregates'][] = array(
+ 'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}read-free-busy',
+ );
+
+ }
+ return $default;
+
+ }
}
diff --git a/3rdparty/Sabre/CalDAV/CalendarObject.php b/3rdparty/Sabre/CalDAV/CalendarObject.php
index 0c99f18deb..72f0a578d1 100644
--- a/3rdparty/Sabre/CalDAV/CalendarObject.php
+++ b/3rdparty/Sabre/CalDAV/CalendarObject.php
@@ -1,43 +1,43 @@
calendarInfo['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}supported-calendar-component-set'];
- if ($supportedComponents) {
- $supportedComponents = $supportedComponents->getValue();
- } else {
- $supportedComponents = null;
}
- Sabre_CalDAV_ICalendarUtil::validateICalendarObject($calendarData, $supportedComponents);
-
- $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'],$this->objectData['uri'],$calendarData);
+ $etag = $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'],$this->objectData['uri'],$calendarData);
$this->objectData['calendardata'] = $calendarData;
+ $this->objectData['etag'] = $etag;
+
+ return $etag;
}
/**
- * Deletes the calendar object
- *
+ * Deletes the calendar object
+ *
* @return void
*/
public function delete() {
@@ -121,9 +113,9 @@ class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV
}
/**
- * Returns the mime content-type
- *
- * @return string
+ * Returns the mime content-type
+ *
+ * @return string
*/
public function getContentType() {
@@ -134,9 +126,9 @@ class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV
/**
* Returns an ETag for this object.
*
- * The ETag is an arbritrary string, but MUST be surrounded by double-quotes.
- *
- * @return string
+ * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
+ *
+ * @return string
*/
public function getETag() {
@@ -150,8 +142,8 @@ class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV
/**
* Returns the last modification date as a unix timestamp
- *
- * @return time
+ *
+ * @return time
*/
public function getLastModified() {
@@ -160,21 +152,25 @@ class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV
}
/**
- * Returns the size of this object in bytes
- *
+ * Returns the size of this object in bytes
+ *
* @return int
*/
public function getSize() {
- return strlen($this->objectData['calendardata']);
+ if (array_key_exists('size',$this->objectData)) {
+ return $this->objectData['size'];
+ } else {
+ return strlen($this->get());
+ }
}
/**
* Returns the owner principal
*
- * This must be a url to a principal, or null if there's no owner
- *
+ * This must be a url to a principal, or null if there's no owner
+ *
* @return string|null
*/
public function getOwner() {
@@ -187,8 +183,8 @@ class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV
* Returns a group principal
*
* This must be a url to a principal, or null if there's no owner
- *
- * @return string|null
+ *
+ * @return string|null
*/
public function getGroup() {
@@ -200,13 +196,13 @@ class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV
* Returns a list of ACE's for this node.
*
* Each ACE has the following properties:
- * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+ * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
* currently the only supported privileges
* * 'principal', a url to the principal who owns the node
- * * 'protected' (optional), indicating that this ACE is not allowed to
- * be updated.
- *
- * @return array
+ * * 'protected' (optional), indicating that this ACE is not allowed to
+ * be updated.
+ *
+ * @return array
*/
public function getACL() {
@@ -244,9 +240,9 @@ class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV
/**
* Updates the ACL
*
- * This method will receive a list of new ACE's.
- *
- * @param array $acl
+ * This method will receive a list of new ACE's.
+ *
+ * @param array $acl
* @return void
*/
public function setACL(array $acl) {
@@ -255,6 +251,23 @@ class Sabre_CalDAV_CalendarObject extends Sabre_DAV_File implements Sabre_CalDAV
}
+ /**
+ * Returns the list of supported privileges for this node.
+ *
+ * The returned data structure is a list of nested privileges.
+ * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+ * standard structure.
+ *
+ * If null is returned from this method, the default privilege set is used,
+ * which is fine for most common usecases.
+ *
+ * @return array|null
+ */
+ public function getSupportedPrivilegeSet() {
+
+ return null;
+
+ }
}
diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryParser.php b/3rdparty/Sabre/CalDAV/CalendarQueryParser.php
new file mode 100644
index 0000000000..bd0d343382
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarQueryParser.php
@@ -0,0 +1,296 @@
+dom = $dom;
+
+ $this->xpath = new DOMXPath($dom);
+ $this->xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
+ $this->xpath->registerNameSpace('dav','urn:DAV');
+
+ }
+
+ /**
+ * Parses the request.
+ *
+ * @return void
+ */
+ public function parse() {
+
+ $filterNode = null;
+
+ $filter = $this->xpath->query('/cal:calendar-query/cal:filter');
+ if ($filter->length !== 1) {
+ throw new Sabre_DAV_Exception_BadRequest('Only one filter element is allowed');
+ }
+
+ $compFilters = $this->parseCompFilters($filter->item(0));
+ if (count($compFilters)!==1) {
+ throw new Sabre_DAV_Exception_BadRequest('There must be exactly 1 top-level comp-filter.');
+ }
+
+ $this->filters = $compFilters[0];
+ $this->requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($this->dom->firstChild));
+
+ $expand = $this->xpath->query('/cal:calendar-query/dav:prop/cal:calendar-data/cal:expand');
+ if ($expand->length>0) {
+ $this->expand = $this->parseExpand($expand->item(0));
+ }
+
+
+ }
+
+ /**
+ * Parses all the 'comp-filter' elements from a node
+ *
+ * @param DOMElement $parentNode
+ * @return array
+ */
+ protected function parseCompFilters(DOMElement $parentNode) {
+
+ $compFilterNodes = $this->xpath->query('cal:comp-filter', $parentNode);
+ $result = array();
+
+ for($ii=0; $ii < $compFilterNodes->length; $ii++) {
+
+ $compFilterNode = $compFilterNodes->item($ii);
+
+ $compFilter = array();
+ $compFilter['name'] = $compFilterNode->getAttribute('name');
+ $compFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $compFilterNode)->length>0;
+ $compFilter['comp-filters'] = $this->parseCompFilters($compFilterNode);
+ $compFilter['prop-filters'] = $this->parsePropFilters($compFilterNode);
+ $compFilter['time-range'] = $this->parseTimeRange($compFilterNode);
+
+ if ($compFilter['time-range'] && !in_array($compFilter['name'],array(
+ 'VEVENT',
+ 'VTODO',
+ 'VJOURNAL',
+ 'VFREEBUSY',
+ 'VALARM',
+ ))) {
+ throw new Sabre_DAV_Exception_BadRequest('The time-range filter is not defined for the ' . $compFilter['name'] . ' component');
+ };
+
+ $result[] = $compFilter;
+
+ }
+
+ return $result;
+
+ }
+
+ /**
+ * Parses all the prop-filter elements from a node
+ *
+ * @param DOMElement $parentNode
+ * @return array
+ */
+ protected function parsePropFilters(DOMElement $parentNode) {
+
+ $propFilterNodes = $this->xpath->query('cal:prop-filter', $parentNode);
+ $result = array();
+
+ for ($ii=0; $ii < $propFilterNodes->length; $ii++) {
+
+ $propFilterNode = $propFilterNodes->item($ii);
+ $propFilter = array();
+ $propFilter['name'] = $propFilterNode->getAttribute('name');
+ $propFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $propFilterNode)->length>0;
+ $propFilter['param-filters'] = $this->parseParamFilters($propFilterNode);
+ $propFilter['text-match'] = $this->parseTextMatch($propFilterNode);
+ $propFilter['time-range'] = $this->parseTimeRange($propFilterNode);
+
+ $result[] = $propFilter;
+
+ }
+
+ return $result;
+
+ }
+
+ /**
+ * Parses the param-filter element
+ *
+ * @param DOMElement $parentNode
+ * @return array
+ */
+ protected function parseParamFilters(DOMElement $parentNode) {
+
+ $paramFilterNodes = $this->xpath->query('cal:param-filter', $parentNode);
+ $result = array();
+
+ for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
+
+ $paramFilterNode = $paramFilterNodes->item($ii);
+ $paramFilter = array();
+ $paramFilter['name'] = $paramFilterNode->getAttribute('name');
+ $paramFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $paramFilterNode)->length>0;
+ $paramFilter['text-match'] = $this->parseTextMatch($paramFilterNode);
+
+ $result[] = $paramFilter;
+
+ }
+
+ return $result;
+
+ }
+
+ /**
+ * Parses the text-match element
+ *
+ * @param DOMElement $parentNode
+ * @return array|null
+ */
+ protected function parseTextMatch(DOMElement $parentNode) {
+
+ $textMatchNodes = $this->xpath->query('cal:text-match', $parentNode);
+
+ if ($textMatchNodes->length === 0)
+ return null;
+
+ $textMatchNode = $textMatchNodes->item(0);
+ $negateCondition = $textMatchNode->getAttribute('negate-condition');
+ $negateCondition = $negateCondition==='yes';
+ $collation = $textMatchNode->getAttribute('collation');
+ if (!$collation) $collation = 'i;ascii-casemap';
+
+ return array(
+ 'negate-condition' => $negateCondition,
+ 'collation' => $collation,
+ 'value' => $textMatchNode->nodeValue
+ );
+
+ }
+
+ /**
+ * Parses the time-range element
+ *
+ * @param DOMElement $parentNode
+ * @return array|null
+ */
+ protected function parseTimeRange(DOMElement $parentNode) {
+
+ $timeRangeNodes = $this->xpath->query('cal:time-range', $parentNode);
+ if ($timeRangeNodes->length === 0) {
+ return null;
+ }
+
+ $timeRangeNode = $timeRangeNodes->item(0);
+
+ if ($start = $timeRangeNode->getAttribute('start')) {
+ $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+ } else {
+ $start = null;
+ }
+ if ($end = $timeRangeNode->getAttribute('end')) {
+ $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+ } else {
+ $end = null;
+ }
+
+ if (!is_null($start) && !is_null($end) && $end <= $start) {
+ throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the time-range filter');
+ }
+
+ return array(
+ 'start' => $start,
+ 'end' => $end,
+ );
+
+ }
+
+ /**
+ * Parses the CALDAV:expand element
+ *
+ * @param DOMElement $parentNode
+ * @return void
+ */
+ protected function parseExpand(DOMElement $parentNode) {
+
+ $start = $parentNode->getAttribute('start');
+ if(!$start) {
+ throw new Sabre_DAV_Exception_BadRequest('The "start" attribute is required for the CALDAV:expand element');
+ }
+ $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+
+ $end = $parentNode->getAttribute('end');
+ if(!$end) {
+ throw new Sabre_DAV_Exception_BadRequest('The "end" attribute is required for the CALDAV:expand element');
+ }
+ $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+
+ if ($end <= $start) {
+ throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the expand element.');
+ }
+
+ return array(
+ 'start' => $start,
+ 'end' => $end,
+ );
+
+ }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php b/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
new file mode 100644
index 0000000000..1bb6b5d53f
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
@@ -0,0 +1,347 @@
+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 Sabre_VObject_Component $parent
+ * @param array $filters
+ * @return bool
+ */
+ protected function validateCompFilters(Sabre_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 Sabre_VObject_Component $parent
+ * @param array $filters
+ * @return bool
+ */
+ protected function validatePropFilters(Sabre_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 Sabre_VObject_Property $parent
+ * @param array $filters
+ * @return bool
+ */
+ protected function validateParamFilters(Sabre_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']] as $subParam) {
+
+ if($this->validateTextMatch($subParam,$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 Sabre_VObject_Node $parent
+ * @param array $textMatch
+ * @return bool
+ */
+ protected function validateTextMatch(Sabre_VObject_Node $parent, array $textMatch) {
+
+ $value = (string)$parent;
+
+ $isMatching = Sabre_DAV_StringUtil::textMatch($value, $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 Sabre_VObject_Node $component
+ * @param DateTime $start
+ * @param DateTime $end
+ * @return bool
+ */
+ protected function validateTimeRange(Sabre_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 Sabre_VObject_RecurrenceIterator($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;
+ foreach($expandedEvent->VALARM as $expandedAlarm) {
+ $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
+ if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
+ $firstAlarm = $effectiveTrigger;
+ }
+ if ($expandedAlarm->isInTimeRange($start, $end)) {
+ return true;
+ }
+
+ }
+ 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');
+
+ }
+
+ }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/CalendarRootNode.php b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
index 69669a9d7f..3907913cc7 100644
--- a/3rdparty/Sabre/CalDAV/CalendarRootNode.php
+++ b/3rdparty/Sabre/CalDAV/CalendarRootNode.php
@@ -1,38 +1,38 @@
server->getPlugin('acl')) {
+ $aclPlugin->checkPrivileges($uri, '{DAV:}read');
+ }
+
$this->server->httpResponse->setHeader('Content-Type','text/calendar');
$this->server->httpResponse->sendStatus(200);
- $this->server->httpResponse->sendBody($this->generateICS($this->server->tree->getChildren($uri)));
+
+ $nodes = $this->server->getPropertiesForPath($uri, array(
+ '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data',
+ ),1);
+
+ $this->server->httpResponse->sendBody($this->generateICS($nodes));
// Returning false to break the event chain
return false;
@@ -65,16 +75,20 @@ class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
}
/**
- * Merges all calendar objects, and builds one big ics export
- *
- * @param array $nodes
- * @return void
+ * Merges all calendar objects, and builds one big ics export
+ *
+ * @param array $nodes
+ * @return string
*/
public function generateICS(array $nodes) {
$calendar = new Sabre_VObject_Component('vcalendar');
$calendar->version = '2.0';
- $calendar->prodid = '-//SabreDAV//SabreDAV ' . Sabre_DAV_Version::VERSION . '//EN';
+ if (Sabre_DAV_Server::$exposeVersion) {
+ $calendar->prodid = '-//SabreDAV//SabreDAV ' . Sabre_DAV_Version::VERSION . '//EN';
+ } else {
+ $calendar->prodid = '-//SabreDAV//SabreDAV//EN';
+ }
$calendar->calscale = 'GREGORIAN';
$collectedTimezones = array();
@@ -84,7 +98,11 @@ class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
foreach($nodes as $node) {
- $nodeData = $node->get();
+ if (!isset($node[200]['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data'])) {
+ continue;
+ }
+ $nodeData = $node[200]['{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data'];
+
$nodeComp = Sabre_VObject_Reader::read($nodeData);
foreach($nodeComp->children() as $child) {
@@ -105,13 +123,10 @@ class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
$collectedTimezones[] = $child->TZID;
break;
-
}
-
}
-
}
foreach($timezones as $tz) $calendar->add($tz);
@@ -119,6 +134,6 @@ class Sabre_CalDAV_ICSExportPlugin extends Sabre_DAV_ServerPlugin {
return $calendar->serialize();
- }
+ }
}
diff --git a/3rdparty/Sabre/CalDAV/ICalendar.php b/3rdparty/Sabre/CalDAV/ICalendar.php
index 8193dff3a8..15d51ebcf7 100644
--- a/3rdparty/Sabre/CalDAV/ICalendar.php
+++ b/3rdparty/Sabre/CalDAV/ICalendar.php
@@ -4,15 +4,15 @@
* Calendar interface
*
* Implement this interface to allow a node to be recognized as an calendar.
- *
+ *
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
interface Sabre_CalDAV_ICalendar extends Sabre_DAV_ICollection {
-
+
}
diff --git a/3rdparty/Sabre/CalDAV/ICalendarObject.php b/3rdparty/Sabre/CalDAV/ICalendarObject.php
index 708300ad7b..280f982a31 100644
--- a/3rdparty/Sabre/CalDAV/ICalendarObject.php
+++ b/3rdparty/Sabre/CalDAV/ICalendarObject.php
@@ -1,20 +1,20 @@
registerXPathNameSpace('cal','urn:ietf:params:xml:ns:xcal');
-
- // Check if there's only 1 component
- $components = array('vevent','vtodo','vjournal','vfreebusy');
- $componentsFound = array();
-
- foreach($components as $component) {
- $test = $xcal->xpath('/cal:iCalendar/cal:vcalendar/cal:' . $component);
- if (is_array($test)) $componentsFound = array_merge($componentsFound, $test);
- }
- if (count($componentsFound)<1) {
- throw new Sabre_CalDAV_Exception_InvalidICalendarObject('One VEVENT, VTODO, VJOURNAL or VFREEBUSY must be specified. 0 found.');
- }
- $component = $componentsFound[0];
-
- if (is_null($allowedComponents)) return true;
-
- // Check if the component is allowed
- $name = $component->getName();
- if (!in_array(strtoupper($name),$allowedComponents)) {
- throw new Sabre_CalDAV_Exception_InvalidICalendarObject(strtoupper($name) . ' is not allowed in this calendar.');
- }
-
- if (count($xcal->xpath('/cal:iCalendar/cal:vcalendar/cal:method'))>0) {
- throw new Sabre_CalDAV_Exception_InvalidICalendarObject('The METHOD property is not allowed in calendar objects');
- }
-
- return true;
-
- }
-
- /**
- * Converts ICalendar data to XML.
- *
- * Properties are converted to lowercase xml elements. Parameters are;
- * converted to attributes. BEGIN:VEVENT is converted to and
- * END:VEVENT as well as other components.
- *
- * It's a very loose parser. If any line does not conform to the spec, it
- * will simply be ignored. It will try to detect if \r\n or \n line endings
- * are used.
- *
- * @todo Currently quoted attributes are not parsed correctly.
- * @see http://tools.ietf.org/html/draft-royer-calsch-xcal-03
- * @param string $icalData
- * @return string.
- */
- static function toXCAL($icalData) {
-
- // Detecting line endings
- $lb="\r\n";
- if (strpos($icalData,"\r\n")!==false) $lb = "\r\n";
- elseif (strpos($icalData,"\n")!==false) $lb = "\n";
-
- // Splitting up items per line
- $lines = explode($lb,$icalData);
-
- // Properties can be folded over 2 lines. In this case the second
- // line will be preceeded by a space or tab.
- $lines2 = array();
- foreach($lines as $line) {
-
- if (!$line) continue;
- if ($line[0]===" " || $line[0]==="\t") {
- $lines2[count($lines2)-1].=substr($line,1);
- continue;
- }
-
- $lines2[]=$line;
-
- }
-
- $xml = '' . "\n";
- $xml.= "\n";
-
- $spaces = 2;
- foreach($lines2 as $line) {
-
- $matches = array();
- // This matches PROPERTYNAME;ATTRIBUTES:VALUE
- if (!preg_match('/^([^:^;]*)(?:;([^:]*))?:(.*)$/',$line,$matches))
- continue;
-
- $propertyName = strtolower($matches[1]);
- $attributes = $matches[2];
- $value = $matches[3];
-
- // If the line was in the format BEGIN:COMPONENT or END:COMPONENT, we need to special case it.
- if ($propertyName === 'begin') {
- $xml.=str_repeat(" ",$spaces);
- $xml.='<' . strtolower($value) . ">\n";
- $spaces+=2;
- continue;
- } elseif ($propertyName === 'end') {
- $spaces-=2;
- $xml.=str_repeat(" ",$spaces);
- $xml.='\n";
- continue;
- }
-
- $xml.=str_repeat(" ",$spaces);
- $xml.='<' . $propertyName;
- if ($attributes) {
- // There can be multiple attributes
- $attributes = explode(';',$attributes);
- foreach($attributes as $att) {
-
- list($attName,$attValue) = explode('=',$att,2);
- $attName = strtolower($attName);
- if ($attName === 'language') $attName='xml:lang';
- $xml.=' ' . $attName . '="' . htmlspecialchars($attValue) . '"';
-
- }
- }
-
- $xml.='>'. htmlspecialchars(trim($value)) . '\n";
-
- }
- $xml.="";
- return $xml;
-
- }
-
-}
-
diff --git a/3rdparty/Sabre/CalDAV/Plugin.php b/3rdparty/Sabre/CalDAV/Plugin.php
index 02747c8395..d7d1d97051 100644
--- a/3rdparty/Sabre/CalDAV/Plugin.php
+++ b/3rdparty/Sabre/CalDAV/Plugin.php
@@ -8,8 +8,8 @@
*
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
@@ -18,7 +18,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
* This is the official CalDAV namespace
*/
const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
-
+
/**
* This is the namespace for the proprietary calendarserver extensions
*/
@@ -41,21 +41,48 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
const CALENDAR_ROOT = 'calendars';
/**
- * Reference to server object
- *
- * @var Sabre_DAV_Server
+ * Reference to server object
+ *
+ * @var Sabre_DAV_Server
*/
private $server;
+ /**
+ * The email handler for invites and other scheduling messages.
+ *
+ * @var Sabre_CalDAV_Schedule_IMip
+ */
+ protected $imipHandler;
+
+ /**
+ * Sets the iMIP handler.
+ *
+ * iMIP = The email transport of iCalendar scheduling messages. Setting
+ * this is optional, but if you want the server to allow invites to be sent
+ * out, you must set a handler.
+ *
+ * Specifically iCal will plain assume that the server supports this. If
+ * the server doesn't, iCal will display errors when inviting people to
+ * events.
+ *
+ * @param Sabre_CalDAV_Schedule_IMip $imipHandler
+ * @return void
+ */
+ public function setIMipHandler(Sabre_CalDAV_Schedule_IMip $imipHandler) {
+
+ $this->imipHandler = $imipHandler;
+
+ }
+
/**
* 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
+ * This method is passed a uri. It should only return HTTP methods that are
* available for the specified uri.
*
* @param string $uri
- * @return array
+ * @return array
*/
public function getHTTPMethods($uri) {
@@ -68,7 +95,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
if ($node instanceof Sabre_DAV_IExtendedCollection) {
try {
$node->getChild($name);
- } catch (Sabre_DAV_Exception_FileNotFound $e) {
+ } catch (Sabre_DAV_Exception_NotFound $e) {
return array('MKCALENDAR');
}
}
@@ -77,9 +104,9 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
}
/**
- * Returns a list of features for the DAV: HTTP header.
- *
- * @return array
+ * Returns a list of features for the DAV: HTTP header.
+ *
+ * @return array
*/
public function getFeatures() {
@@ -89,11 +116,11 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
/**
* Returns a plugin name.
- *
+ *
* Using this name other plugins will be able to access other plugins
- * using Sabre_DAV_Server::getPlugin
- *
- * @return string
+ * using Sabre_DAV_Server::getPlugin
+ *
+ * @return string
*/
public function getPluginName() {
@@ -105,38 +132,46 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
* Returns a list of reports this plugin supports.
*
* This will be used in the {DAV:}supported-report-set property.
- * Note that you still need to subscribe to the 'report' event to actually
- * implement them
- *
+ * Note that you still need to subscribe to the 'report' event to actually
+ * implement them
+ *
* @param string $uri
- * @return array
+ * @return array
*/
public function getSupportedReportSet($uri) {
$node = $this->server->tree->getNodeForPath($uri);
+
+ $reports = array();
if ($node instanceof Sabre_CalDAV_ICalendar || $node instanceof Sabre_CalDAV_ICalendarObject) {
- return array(
- '{' . self::NS_CALDAV . '}calendar-multiget',
- '{' . self::NS_CALDAV . '}calendar-query',
- );
+ $reports[] = '{' . self::NS_CALDAV . '}calendar-multiget';
+ $reports[] = '{' . self::NS_CALDAV . '}calendar-query';
}
- return array();
+ if ($node instanceof Sabre_CalDAV_ICalendar) {
+ $reports[] = '{' . self::NS_CALDAV . '}free-busy-query';
+ }
+ return $reports;
}
/**
- * Initializes the plugin
- *
- * @param Sabre_DAV_Server $server
+ * Initializes the plugin
+ *
+ * @param Sabre_DAV_Server $server
* @return void
*/
public function initialize(Sabre_DAV_Server $server) {
$this->server = $server;
+
$server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
//$server->subscribeEvent('unknownMethod',array($this,'unknownMethod2'),1000);
$server->subscribeEvent('report',array($this,'report'));
$server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
+ $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
+ $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
+ $server->subscribeEvent('beforeWriteContent', array($this, 'beforeWriteContent'));
+ $server->subscribeEvent('beforeCreateFile', array($this, 'beforeCreateFile'));
$server->xmlNamespaces[self::NS_CALDAV] = 'cal';
$server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
@@ -144,6 +179,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
$server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre_CalDAV_Property_SupportedCalendarComponentSet';
$server->resourceTypeMapping['Sabre_CalDAV_ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
+ $server->resourceTypeMapping['Sabre_CalDAV_Schedule_IOutbox'] = '{urn:ietf:params:xml:ns:caldav}schedule-outbox';
$server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
$server->resourceTypeMapping['Sabre_CalDAV_Principal_ProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
@@ -161,7 +197,10 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
'{' . self::NS_CALDAV . '}calendar-data',
// scheduling extension
+ '{' . self::NS_CALDAV . '}schedule-inbox-URL',
+ '{' . self::NS_CALDAV . '}schedule-outbox-URL',
'{' . self::NS_CALDAV . '}calendar-user-address-set',
+ '{' . self::NS_CALDAV . '}calendar-user-type',
// CalendarServer extensions
'{' . self::NS_CALENDARSERVER . '}getctag',
@@ -173,36 +212,55 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
/**
* This function handles support for the MKCALENDAR method
- *
- * @param string $method
- * @return bool
+ *
+ * @param string $method
+ * @param string $uri
+ * @return bool
*/
public function unknownMethod($method, $uri) {
- if ($method!=='MKCALENDAR') return;
+ switch ($method) {
+ case 'MKCALENDAR' :
+ $this->httpMkCalendar($uri);
+ // false is returned to stop the propagation of the
+ // unknownMethod event.
+ return false;
+ case 'POST' :
+ // Checking if we're talking to an outbox
+ try {
+ $node = $this->server->tree->getNodeForPath($uri);
+ } catch (Sabre_DAV_Exception_NotFound $e) {
+ return;
+ }
+ if (!$node instanceof Sabre_CalDAV_Schedule_IOutbox)
+ return;
- $this->httpMkCalendar($uri);
- // false is returned to stop the unknownMethod event
- return false;
+ $this->outboxRequest($node);
+ return false;
+
+ }
}
/**
- * This functions handles REPORT requests specific to CalDAV
- *
- * @param string $reportName
- * @param DOMNode $dom
- * @return bool
+ * This functions handles REPORT requests specific to CalDAV
+ *
+ * @param string $reportName
+ * @param DOMNode $dom
+ * @return bool
*/
public function report($reportName,$dom) {
- switch($reportName) {
+ switch($reportName) {
case '{'.self::NS_CALDAV.'}calendar-multiget' :
$this->calendarMultiGetReport($dom);
return false;
case '{'.self::NS_CALDAV.'}calendar-query' :
$this->calendarQueryReport($dom);
return false;
+ case '{'.self::NS_CALDAV.'}free-busy-query' :
+ $this->freeBusyQueryReport($dom);
+ return false;
}
@@ -212,9 +270,9 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
/**
* This function handles the MKCALENDAR HTTP method, which creates
* a new calendar.
- *
+ *
* @param string $uri
- * @return void
+ * @return void
*/
public function httpMkCalendar($uri) {
@@ -238,7 +296,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
foreach(Sabre_DAV_XMLUtil::parseProperties($child,$this->server->propertyMap) as $k=>$prop) {
$properties[$k] = $prop;
}
-
+
}
}
@@ -254,9 +312,9 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
* beforeGetProperties
*
* This method handler is invoked before any after properties for a
- * resource are fetched. This allows us to add in any CalDAV specific
- * properties.
- *
+ * resource are fetched. This allows us to add in any CalDAV specific
+ * properties.
+ *
* @param string $path
* @param Sabre_DAV_INode $node
* @param array $requestedProperties
@@ -270,12 +328,21 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
// calendar-home-set property
$calHome = '{' . self::NS_CALDAV . '}calendar-home-set';
if (in_array($calHome,$requestedProperties)) {
- $principalId = $node->getName();
+ $principalId = $node->getName();
$calendarHomePath = self::CALENDAR_ROOT . '/' . $principalId . '/';
unset($requestedProperties[$calHome]);
$returnedProperties[200][$calHome] = new Sabre_DAV_Property_Href($calendarHomePath);
}
+ // schedule-outbox-URL property
+ $scheduleProp = '{' . self::NS_CALDAV . '}schedule-outbox-URL';
+ if (in_array($scheduleProp,$requestedProperties)) {
+ $principalId = $node->getName();
+ $outboxPath = self::CALENDAR_ROOT . '/' . $principalId . '/outbox';
+ unset($requestedProperties[$scheduleProp]);
+ $returnedProperties[200][$scheduleProp] = new Sabre_DAV_Property_Href($outboxPath);
+ }
+
// calendar-user-address-set property
$calProp = '{' . self::NS_CALDAV . '}calendar-user-address-set';
if (in_array($calProp,$requestedProperties)) {
@@ -287,7 +354,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
}
- // These two properties are shortcuts for ical to easily find
+ // These two properties are shortcuts for ical to easily find
// other principals this principal has access to.
$propRead = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for';
$propWrite = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for';
@@ -301,8 +368,8 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
$groupNode = $this->server->tree->getNodeForPath($group);
- // If the node is either ap proxy-read or proxy-write
- // group, we grab the parent principal and add it to the
+ // If the node is either ap proxy-read or proxy-write
+ // group, we grab the parent principal and add it to the
// list.
if ($groupNode instanceof Sabre_CalDAV_Principal_ProxyRead) {
list($readList[]) = Sabre_DAV_URLUtil::splitPath($group);
@@ -327,8 +394,8 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
if ($node instanceof Sabre_CalDAV_ICalendarObject) {
- // The calendar-data property is not supposed to be a 'real'
- // property, but in large chunks of the spec it does act as such.
+ // The calendar-data property is not supposed to be a 'real'
+ // property, but in large chunks of the spec it does act as such.
// Therefore we simply expose it as a property.
$calDataProp = '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}calendar-data';
if (in_array($calDataProp, $requestedProperties)) {
@@ -350,18 +417,52 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
*
* This report is used by the client to fetch the content of a series
* of urls. Effectively avoiding a lot of redundant requests.
- *
- * @param DOMNode $dom
+ *
+ * @param DOMNode $dom
* @return void
*/
public function calendarMultiGetReport($dom) {
$properties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
-
$hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
+
+ $xpath = new DOMXPath($dom);
+ $xpath->registerNameSpace('cal',Sabre_CalDAV_Plugin::NS_CALDAV);
+ $xpath->registerNameSpace('dav','urn:DAV');
+
+ $expand = $xpath->query('/cal:calendar-multiget/dav:prop/cal:calendar-data/cal:expand');
+ if ($expand->length>0) {
+ $expandElem = $expand->item(0);
+ $start = $expandElem->getAttribute('start');
+ $end = $expandElem->getAttribute('end');
+ if(!$start || !$end) {
+ throw new Sabre_DAV_Exception_BadRequest('The "start" and "end" attributes are required for the CALDAV:expand element');
+ }
+ $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+ $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
+
+ if ($end <= $start) {
+ throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the expand element.');
+ }
+
+ $expand = true;
+
+ } else {
+
+ $expand = false;
+
+ }
+
foreach($hrefElems as $elem) {
$uri = $this->server->calculateUri($elem->nodeValue);
list($objProps) = $this->server->getPropertiesForPath($uri,$properties);
+
+ if ($expand && isset($objProps[200]['{' . self::NS_CALDAV . '}calendar-data'])) {
+ $vObject = Sabre_VObject_Reader::read($objProps[200]['{' . self::NS_CALDAV . '}calendar-data']);
+ $vObject->expand($start, $end);
+ $objProps[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
+ }
+
$propertyList[]=$objProps;
}
@@ -377,48 +478,57 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
*
* This report is used by clients to request calendar objects based on
* complex conditions.
- *
- * @param DOMNode $dom
+ *
+ * @param DOMNode $dom
* @return void
*/
public function calendarQueryReport($dom) {
- $requestedProperties = array_keys(Sabre_DAV_XMLUtil::parseProperties($dom->firstChild));
-
- $filterNode = $dom->getElementsByTagNameNS('urn:ietf:params:xml:ns:caldav','filter');
- if ($filterNode->length!==1) {
- throw new Sabre_DAV_Exception_BadRequest('The calendar-query report must have a filter element');
- }
- $filters = Sabre_CalDAV_XMLUtil::parseCalendarQueryFilters($filterNode->item(0));
+ $parser = new Sabre_CalDAV_CalendarQueryParser($dom);
+ $parser->parse();
$requestedCalendarData = true;
+ $requestedProperties = $parser->requestedProperties;
if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
+
// We always retrieve calendar-data, as we need it for filtering.
$requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
- // If calendar-data wasn't explicitly requested, we need to remove
+ // If calendar-data wasn't explicitly requested, we need to remove
// it after processing.
$requestedCalendarData = false;
}
// These are the list of nodes that potentially match the requirement
- $candidateNodes = $this->server->getPropertiesForPath($this->server->getRequestUri(),$requestedProperties,$this->server->getHTTPDepth(0));
+ $candidateNodes = $this->server->getPropertiesForPath(
+ $this->server->getRequestUri(),
+ $requestedProperties,
+ $this->server->getHTTPDepth(0)
+ );
$verifiedNodes = array();
+ $validator = new Sabre_CalDAV_CalendarQueryValidator();
+
foreach($candidateNodes as $node) {
// If the node didn't have a calendar-data property, it must not be a calendar object
- if (!isset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'])) continue;
+ if (!isset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']))
+ continue;
+
+ $vObject = Sabre_VObject_Reader::read($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+ if ($validator->validate($vObject,$parser->filters)) {
- if ($this->validateFilters($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'],$filters)) {
-
if (!$requestedCalendarData) {
unset($node[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
}
+ if ($parser->expand) {
+ $vObject->expand($parser->expand['start'], $parser->expand['end']);
+ $node[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
+ }
$verifiedNodes[] = $node;
- }
+ }
}
@@ -428,360 +538,291 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
}
-
/**
- * Verify if a list of filters applies to the calendar data object
+ * This method is responsible for parsing the request and generating the
+ * response for the CALDAV:free-busy-query REPORT.
*
- * The calendarData object must be a valid iCalendar blob. The list of
- * filters must be formatted as parsed by Sabre_CalDAV_Plugin::parseCalendarQueryFilters
- *
- * @param string $calendarData
- * @param array $filters
- * @return bool
- */
- public function validateFilters($calendarData,$filters) {
-
- // We are converting the calendar object to an XML structure
- // This makes it far easier to parse
- $xCalendarData = Sabre_CalDAV_ICalendarUtil::toXCal($calendarData);
- $xml = simplexml_load_string($xCalendarData);
- $xml->registerXPathNamespace('c','urn:ietf:params:xml:ns:xcal');
-
- foreach($filters as $xpath=>$filter) {
-
- // if-not-defined comes first
- if (isset($filter['is-not-defined'])) {
- if (!$xml->xpath($xpath))
- continue;
- else
- return false;
-
- }
-
- $elem = $xml->xpath($xpath);
-
- if (!$elem) return false;
- $elem = $elem[0];
-
- if (isset($filter['time-range'])) {
-
- switch($elem->getName()) {
- case 'vevent' :
- $result = $this->validateTimeRangeFilterForEvent($xml,$xpath,$filter);
- if ($result===false) return false;
- break;
- case 'vtodo' :
- $result = $this->validateTimeRangeFilterForTodo($xml,$xpath,$filter);
- if ($result===false) return false;
- break;
- case 'vjournal' :
- case 'vfreebusy' :
- case 'valarm' :
- // TODO: not implemented
- break;
-
- /*
-
- case 'vjournal' :
- $result = $this->validateTimeRangeFilterForJournal($xml,$xpath,$filter);
- if ($result===false) return false;
- break;
- case 'vfreebusy' :
- $result = $this->validateTimeRangeFilterForFreeBusy($xml,$xpath,$filter);
- if ($result===false) return false;
- break;
- case 'valarm' :
- $result = $this->validateTimeRangeFilterForAlarm($xml,$xpath,$filter);
- if ($result===false) return false;
- break;
-
- */
-
- }
-
- }
-
- if (isset($filter['text-match'])) {
- $currentString = (string)$elem;
-
- $isMatching = Sabre_DAV_StringUtil::textMatch($currentString, $filter['text-match']['value'], $filter['text-match']['collation']);
- if ($filter['text-match']['negate-condition'] && $isMatching) return false;
- if (!$filter['text-match']['negate-condition'] && !$isMatching) return false;
-
- }
-
- }
- return true;
-
- }
-
- /**
- * Checks whether a time-range filter matches an event.
- *
- * @param SimpleXMLElement $xml Event as xml object
- * @param string $currentXPath XPath to check
- * @param array $currentFilter Filter information
+ * @param DOMNode $dom
* @return void
*/
- private function validateTimeRangeFilterForEvent(SimpleXMLElement $xml,$currentXPath,array $currentFilter) {
+ protected function freeBusyQueryReport(DOMNode $dom) {
- // Grabbing the DTSTART property
- $xdtstart = $xml->xpath($currentXPath.'/c:dtstart');
- if (!count($xdtstart)) {
- throw new Sabre_DAV_Exception_BadRequest('DTSTART property missing from calendar object');
- }
+ $start = null;
+ $end = null;
- // The dtstart can be both a date, or datetime property
- if ((string)$xdtstart[0]['value']==='DATE' || strlen((string)$xdtstart[0])===8) {
- $isDateTime = false;
- } else {
- $isDateTime = true;
- }
+ foreach($dom->firstChild->childNodes as $childNode) {
- // Determining the timezone
- if ($tzid = (string)$xdtstart[0]['tzid']) {
- $tz = new DateTimeZone($tzid);
- } else {
- $tz = null;
- }
- if ($isDateTime) {
- $dtstart = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdtstart[0],$tz);
- } else {
- $dtstart = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdtstart[0]);
- }
-
-
- // Grabbing the DTEND property
- $xdtend = $xml->xpath($currentXPath.'/c:dtend');
- $dtend = null;
-
- if (count($xdtend)) {
- // Determining the timezone
- if ($tzid = (string)$xdtend[0]['tzid']) {
- $tz = new DateTimeZone($tzid);
- } else {
- $tz = null;
+ $clark = Sabre_DAV_XMLUtil::toClarkNotation($childNode);
+ if ($clark == '{' . self::NS_CALDAV . '}time-range') {
+ $start = $childNode->getAttribute('start');
+ $end = $childNode->getAttribute('end');
+ break;
}
- // Since the VALUE prameter of both DTSTART and DTEND must be the same
- // we can assume we don't need to check the VALUE paramter of DTEND.
- if ($isDateTime) {
- $dtend = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdtend[0],$tz);
- } else {
- $dtend = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdtend[0],$tz);
- }
-
- }
-
- if (is_null($dtend)) {
- // The DTEND property was not found. We will first see if the event has a duration
- // property
-
- $xduration = $xml->xpath($currentXPath.'/c:duration');
- if (count($xduration)) {
- $duration = Sabre_CalDAV_XMLUtil::parseICalendarDuration((string)$xduration[0]);
-
- // Making sure that the duration is bigger than 0 seconds.
- $tempDT = clone $dtstart;
- $tempDT->modify($duration);
- if ($tempDT > $dtstart) {
-
- // use DTEND = DTSTART + DURATION
- $dtend = $tempDT;
- } else {
- // use DTEND = DTSTART
- $dtend = $dtstart;
- }
-
- }
+ }
+ if ($start) {
+ $start = Sabre_VObject_DateTimeParser::parseDateTime($start);
+ }
+ if ($end) {
+ $end = Sabre_VObject_DateTimeParser::parseDateTime($end);
}
- if (is_null($dtend)) {
- if ($isDateTime) {
- // DTEND = DTSTART
- $dtend = $dtstart;
- } else {
- // DTEND = DTSTART + 1 DAY
- $dtend = clone $dtstart;
- $dtend->modify('+1 day');
- }
+ if (!$start && !$end) {
+ throw new Sabre_DAV_Exception_BadRequest('The freebusy report must have a time-range filter');
}
- // TODO: we need to properly parse RRULE's, but it's very difficult.
- // For now, we're always returning events if they have an RRULE at all.
- $rrule = $xml->xpath($currentXPath.'/c:rrule');
- $hasRrule = (count($rrule))>0;
-
- if (!is_null($currentFilter['time-range']['start']) && $currentFilter['time-range']['start'] >= $dtend) return false;
- if (!is_null($currentFilter['time-range']['end']) && $currentFilter['time-range']['end'] <= $dtstart && !$hasRrule) return false;
- return true;
-
+ $acl = $this->server->getPlugin('acl');
+
+ if (!$acl) {
+ throw new Sabre_DAV_Exception('The ACL plugin must be loaded for free-busy queries to work');
+ }
+ $uri = $this->server->getRequestUri();
+ $acl->checkPrivileges($uri,'{' . self::NS_CALDAV . '}read-free-busy');
+
+ $calendar = $this->server->tree->getNodeForPath($uri);
+ if (!$calendar instanceof Sabre_CalDAV_ICalendar) {
+ throw new Sabre_DAV_Exception_NotImplemented('The free-busy-query REPORT is only implemented on calendars');
+ }
+
+ $objects = array_map(function($child) {
+ $obj = $child->get();
+ if (is_resource($obj)) {
+ $obj = stream_get_contents($obj);
+ }
+ return $obj;
+ }, $calendar->getChildren());
+
+ $generator = new Sabre_VObject_FreeBusyGenerator();
+ $generator->setObjects($objects);
+ $generator->setTimeRange($start, $end);
+ $result = $generator->getResult();
+ $result = $result->serialize();
+
+ $this->server->httpResponse->sendStatus(200);
+ $this->server->httpResponse->setHeader('Content-Type', 'text/calendar');
+ $this->server->httpResponse->setHeader('Content-Length', strlen($result));
+ $this->server->httpResponse->sendBody($result);
+
}
- private function validateTimeRangeFilterForTodo(SimpleXMLElement $xml,$currentXPath,array $filter) {
+ /**
+ * This method is triggered before a file gets updated with new content.
+ *
+ * This plugin uses this method to ensure that CalDAV objects receive
+ * valid calendar data.
+ *
+ * @param string $path
+ * @param Sabre_DAV_IFile $node
+ * @param resource $data
+ * @return void
+ */
+ public function beforeWriteContent($path, Sabre_DAV_IFile $node, &$data) {
- // Gathering all relevant elements
+ if (!$node instanceof Sabre_CalDAV_ICalendarObject)
+ return;
- $dtStart = null;
- $duration = null;
- $due = null;
- $completed = null;
- $created = null;
+ $this->validateICalendar($data);
- $xdt = $xml->xpath($currentXPath.'/c:dtstart');
- if (count($xdt)) {
- // The dtstart can be both a date, or datetime property
- if ((string)$xdt[0]['value']==='DATE') {
- $isDateTime = false;
- } else {
- $isDateTime = true;
- }
+ }
- // Determining the timezone
- if ($tzid = (string)$xdt[0]['tzid']) {
- $tz = new DateTimeZone($tzid);
- } else {
- $tz = null;
- }
- if ($isDateTime) {
- $dtStart = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0],$tz);
- } else {
- $dtStart = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdt[0]);
- }
+ /**
+ * This method is triggered before a new file is created.
+ *
+ * This plugin uses this method to ensure that newly created calendar
+ * objects contain valid calendar data.
+ *
+ * @param string $path
+ * @param resource $data
+ * @param Sabre_DAV_ICollection $parentNode
+ * @return void
+ */
+ public function beforeCreateFile($path, &$data, Sabre_DAV_ICollection $parentNode) {
+
+ if (!$parentNode instanceof Sabre_CalDAV_Calendar)
+ return;
+
+ $this->validateICalendar($data);
+
+ }
+
+ /**
+ * Checks if the submitted iCalendar data is in fact, valid.
+ *
+ * An exception is thrown if it's not.
+ *
+ * @param resource|string $data
+ * @return void
+ */
+ protected function validateICalendar(&$data) {
+
+ // If it's a stream, we convert it to a string first.
+ if (is_resource($data)) {
+ $data = stream_get_contents($data);
}
- // Only need to grab duration if dtStart is set
- if (!is_null($dtStart)) {
+ // Converting the data to unicode, if needed.
+ $data = Sabre_DAV_StringUtil::ensureUTF8($data);
- $xduration = $xml->xpath($currentXPath.'/c:duration');
- if (count($xduration)) {
- $duration = Sabre_CalDAV_XMLUtil::parseICalendarDuration((string)$xduration[0]);
- }
+ try {
+
+ $vobj = Sabre_VObject_Reader::read($data);
+
+ } catch (Sabre_VObject_ParseException $e) {
+
+ throw new Sabre_DAV_Exception_UnsupportedMediaType('This resource only supports valid iCalendar 2.0 data. Parse error: ' . $e->getMessage());
}
- if (!is_null($dtStart) && !is_null($duration)) {
+ }
- // Comparision from RFC 4791:
- // (start <= DTSTART+DURATION) AND ((end > DTSTART) OR (end >= DTSTART+DURATION))
+ /**
+ * This method handles POST requests to the schedule-outbox
+ *
+ * @param Sabre_CalDAV_Schedule_IOutbox $outboxNode
+ * @return void
+ */
+ public function outboxRequest(Sabre_CalDAV_Schedule_IOutbox $outboxNode) {
- $end = clone $dtStart;
- $end->modify($duration);
+ $originator = $this->server->httpRequest->getHeader('Originator');
+ $recipients = $this->server->httpRequest->getHeader('Recipient');
- if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $end) &&
- (is_null($filter['time-range']['end']) || $filter['time-range']['end'] > $dtStart || $filter['time-range']['end'] >= $end) ) {
- return true;
- } else {
- return false;
+ if (!$originator) {
+ throw new Sabre_DAV_Exception_BadRequest('The Originator: header must be specified when making POST requests');
+ }
+ if (!$recipients) {
+ throw new Sabre_DAV_Exception_BadRequest('The Recipient: header must be specified when making POST requests');
+ }
+
+ if (!preg_match('/^mailto:(.*)@(.*)$/', $originator)) {
+ throw new Sabre_DAV_Exception_BadRequest('Originator must start with mailto: and must be valid email address');
+ }
+ $originator = substr($originator,7);
+
+ $recipients = explode(',',$recipients);
+ foreach($recipients as $k=>$recipient) {
+
+ $recipient = trim($recipient);
+ if (!preg_match('/^mailto:(.*)@(.*)$/', $recipient)) {
+ throw new Sabre_DAV_Exception_BadRequest('Recipients must start with mailto: and must be valid email address');
}
-
+ $recipient = substr($recipient, 7);
+ $recipients[$k] = $recipient;
}
- // Need to grab the DUE property
- $xdt = $xml->xpath($currentXPath.'/c:due');
- if (count($xdt)) {
- // The due property can be both a date, or datetime property
- if ((string)$xdt[0]['value']==='DATE') {
- $isDateTime = false;
- } else {
- $isDateTime = true;
- }
- // Determining the timezone
- if ($tzid = (string)$xdt[0]['tzid']) {
- $tz = new DateTimeZone($tzid);
- } else {
- $tz = null;
- }
- if ($isDateTime) {
- $due = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0],$tz);
- } else {
- $due = Sabre_CalDAV_XMLUtil::parseICalendarDate((string)$xdt[0]);
- }
+ // We need to make sure that 'originator' matches one of the email
+ // addresses of the selected principal.
+ $principal = $outboxNode->getOwner();
+ $props = $this->server->getProperties($principal,array(
+ '{' . self::NS_CALDAV . '}calendar-user-address-set',
+ ));
+
+ $addresses = array();
+ if (isset($props['{' . self::NS_CALDAV . '}calendar-user-address-set'])) {
+ $addresses = $props['{' . self::NS_CALDAV . '}calendar-user-address-set']->getHrefs();
}
- if (!is_null($dtStart) && !is_null($due)) {
-
- // Comparision from RFC 4791:
- // ((start < DUE) OR (start <= DTSTART)) AND ((end > DTSTART) OR (end >= DUE))
-
- if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] < $due || $filter['time-range']['start'] < $dtstart) &&
- (is_null($filter['time-range']['end']) || $filter['time-range']['end'] >= $due) ) {
- return true;
- } else {
- return false;
- }
-
+ if (!in_array('mailto:' . $originator, $addresses)) {
+ throw new Sabre_DAV_Exception_Forbidden('The addresses specified in the Originator header did not match any addresses in the owners calendar-user-address-set header');
}
- if (!is_null($dtStart)) {
-
- // Comparision from RFC 4791
- // (start <= DTSTART) AND (end > DTSTART)
- if ( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $dtStart) &&
- (is_null($filter['time-range']['end']) || $filter['time-range']['end'] > $dtStart) ) {
- return true;
- } else {
- return false;
- }
-
+ try {
+ $vObject = Sabre_VObject_Reader::read($this->server->httpRequest->getBody(true));
+ } catch (Sabre_VObject_ParseException $e) {
+ throw new Sabre_DAV_Exception_BadRequest('The request body must be a valid iCalendar object. Parse error: ' . $e->getMessage());
}
- if (!is_null($due)) {
-
- // Comparison from RFC 4791
- // (start < DUE) AND (end >= DUE)
- if ( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] < $due) &&
- (is_null($filter['time-range']['end']) || $filter['time-range']['end'] >= $due) ) {
- return true;
- } else {
- return false;
- }
-
- }
- // Need to grab the COMPLETED property
- $xdt = $xml->xpath($currentXPath.'/c:completed');
- if (count($xdt)) {
- $completed = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0]);
- }
- // Need to grab the CREATED property
- $xdt = $xml->xpath($currentXPath.'/c:created');
- if (count($xdt)) {
- $created = Sabre_CalDAV_XMLUtil::parseICalendarDateTime((string)$xdt[0]);
- }
-
- if (!is_null($completed) && !is_null($created)) {
- // Comparison from RFC 4791
- // ((start <= CREATED) OR (start <= COMPLETED)) AND ((end >= CREATED) OR (end >= COMPLETED))
- if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $created || $filter['time-range']['start'] <= $completed) &&
- (is_null($filter['time-range']['end']) || $filter['time-range']['end'] >= $created || $filter['time-range']['end'] >= $completed)) {
- return true;
- } else {
- return false;
+ // Checking for the object type
+ $componentType = null;
+ foreach($vObject->getComponents() as $component) {
+ if ($component->name !== 'VTIMEZONE') {
+ $componentType = $component->name;
+ break;
}
}
-
- if (!is_null($completed)) {
- // Comparison from RFC 4791
- // (start <= COMPLETED) AND (end >= COMPLETED)
- if( (is_null($filter['time-range']['start']) || $filter['time-range']['start'] <= $completed) &&
- (is_null($filter['time-range']['end']) || $filter['time-range']['end'] >= $completed)) {
- return true;
- } else {
- return false;
- }
+ if (is_null($componentType)) {
+ throw new Sabre_DAV_Exception_BadRequest('We expected at least one VTODO, VJOURNAL, VFREEBUSY or VEVENT component');
}
- if (!is_null($created)) {
- // Comparison from RFC 4791
- // (end > CREATED)
- if( (is_null($filter['time-range']['end']) || $filter['time-range']['end'] > $created) ) {
- return true;
- } else {
- return false;
- }
+ // Validating the METHOD
+ $method = strtoupper((string)$vObject->METHOD);
+ if (!$method) {
+ throw new Sabre_DAV_Exception_BadRequest('A METHOD property must be specified in iTIP messages');
}
- // Everything else is TRUE
- return true;
+ if (in_array($method, array('REQUEST','REPLY','ADD','CANCEL')) && $componentType==='VEVENT') {
+ $this->iMIPMessage($originator, $recipients, $vObject);
+ $this->server->httpResponse->sendStatus(200);
+ $this->server->httpResponse->sendBody('Messages sent');
+ } else {
+ throw new Sabre_DAV_Exception_NotImplemented('This iTIP method is currently not implemented');
+ }
+
+ }
+
+ /**
+ * Sends an iMIP message by email.
+ *
+ * @param string $originator
+ * @param array $recipients
+ * @param Sabre_VObject_Component $vObject
+ * @return void
+ */
+ protected function iMIPMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
+
+ if (!$this->imipHandler) {
+ throw new Sabre_DAV_Exception_NotImplemented('No iMIP handler is setup on this server.');
+ }
+ $this->imipHandler->sendMessage($originator, $recipients, $vObject);
+
+ }
+
+ /**
+ * This method is used to generate HTML output for the
+ * Sabre_DAV_Browser_Plugin. This allows us to generate an interface users
+ * can use to create new calendars.
+ *
+ * @param Sabre_DAV_INode $node
+ * @param string $output
+ * @return bool
+ */
+ public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
+
+ if (!$node instanceof Sabre_CalDAV_UserCalendars)
+ return;
+
+ $output.= '
+
';
+
+ return false;
+
+ }
+
+ /**
+ * This method allows us to intercept the 'mkcalendar' sabreAction. This
+ * action enables the user to create new calendars from the browser plugin.
+ *
+ * @param string $uri
+ * @param string $action
+ * @param array $postVars
+ * @return bool
+ */
+ public function browserPostAction($uri, $action, array $postVars) {
+
+ if ($action!=='mkcalendar')
+ return;
+
+ $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
+ $properties = array();
+ if (isset($postVars['{DAV:}displayname'])) {
+ $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
+ }
+ $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
+ return false;
}
diff --git a/3rdparty/Sabre/CalDAV/Principal/Collection.php b/3rdparty/Sabre/CalDAV/Principal/Collection.php
index 13435b2448..abbefa5567 100644
--- a/3rdparty/Sabre/CalDAV/Principal/Collection.php
+++ b/3rdparty/Sabre/CalDAV/Principal/Collection.php
@@ -4,23 +4,23 @@
* Principal collection
*
* This is an alternative collection to the standard ACL principal collection.
- * This collection adds support for the calendar-proxy-read and
- * calendar-proxy-write sub-principals, as defined by the caldav-proxy
+ * This collection adds support for the calendar-proxy-read and
+ * calendar-proxy-write sub-principals, as defined by the caldav-proxy
* specification.
*
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_CalDAV_Principal_Collection extends Sabre_DAVACL_AbstractPrincipalCollection {
/**
- * Returns a child object based on principal information
- *
- * @param array $principalInfo
- * @return Sabre_CalDAV_Principal_User
+ * Returns a child object based on principal information
+ *
+ * @param array $principalInfo
+ * @return Sabre_CalDAV_Principal_User
*/
public function getChildForPrincipal(array $principalInfo) {
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
index f531d85d1f..4b3f035634 100644
--- a/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
+++ b/3rdparty/Sabre/CalDAV/Principal/ProxyRead.php
@@ -4,38 +4,38 @@
* ProxyRead principal
*
* This class represents a principal group, hosted under the main principal.
- * This is needed to implement 'Calendar delegation' support. This class is
+ * This is needed to implement 'Calendar delegation' support. This class is
* instantiated by Sabre_CalDAV_Principal_User.
- *
+ *
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
/**
- * Principal information from the parent principal.
- *
- * @var array
+ * Principal information from the parent principal.
+ *
+ * @var array
*/
protected $principalInfo;
/**
- * Principal backend
- *
- * @var Sabre_DAVACL_IPrincipalBackend
+ * Principal backend
+ *
+ * @var Sabre_DAVACL_IPrincipalBackend
*/
protected $principalBackend;
/**
* Creates the object.
*
- * Note that you MUST supply the parent principal information.
- *
- * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
- * @param array $principalInfo
+ * Note that you MUST supply the parent principal information.
+ *
+ * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+ * @param array $principalInfo
*/
public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
@@ -46,8 +46,8 @@ class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
/**
* Returns this principals name.
- *
- * @return string
+ *
+ * @return string
*/
public function getName() {
@@ -56,13 +56,13 @@ class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
}
/**
- * Returns the last modification time
+ * Returns the last modification time
*
- * @return null
+ * @return null
*/
public function getLastModified() {
- return null;
+ return null;
}
@@ -70,7 +70,7 @@ class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
* Deletes the current node
*
* @throws Sabre_DAV_Exception_Forbidden
- * @return void
+ * @return void
*/
public function delete() {
@@ -80,7 +80,7 @@ class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
/**
* Renames the node
- *
+ *
* @throws Sabre_DAV_Exception_Forbidden
* @param string $name The new name
* @return void
@@ -93,11 +93,11 @@ class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
/**
- * Returns a list of altenative urls for a principal
- *
+ * Returns a list of alternative urls for a principal
+ *
* This can for example be an email address, or ldap url.
- *
- * @return array
+ *
+ * @return array
*/
public function getAlternateUriSet() {
@@ -106,41 +106,41 @@ class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
}
/**
- * Returns the full principal url
- *
- * @return string
+ * Returns the full principal url
+ *
+ * @return string
*/
public function getPrincipalUrl() {
- return $this->principalInfo['uri'] . '/' . $this->getName();
+ return $this->principalInfo['uri'] . '/' . $this->getName();
}
/**
* Returns the list of group members
- *
+ *
* If this principal is a group, this function should return
- * all member principal uri's for the group.
- *
+ * all member principal uri's for the group.
+ *
* @return array
*/
public function getGroupMemberSet() {
- return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
+ return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
}
/**
* Returns the list of groups this principal is member of
- *
+ *
* If this principal is a member of a (list of) groups, this function
- * should return a list of principal uri's for it's members.
- *
- * @return array
+ * should return a list of principal uri's for it's members.
+ *
+ * @return array
*/
public function getGroupMembership() {
- return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
+ return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
}
@@ -149,11 +149,11 @@ class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
*
* If this principal is a group, this method sets all the group members.
* The list of members is always overwritten, never appended to.
- *
- * This method should throw an exception if the members could not be set.
- *
- * @param array $principals
- * @return void
+ *
+ * This method should throw an exception if the members could not be set.
+ *
+ * @param array $principals
+ * @return void
*/
public function setGroupMemberSet(array $principals) {
@@ -165,9 +165,9 @@ class Sabre_CalDAV_Principal_ProxyRead implements Sabre_DAVACL_IPrincipal {
* Returns the displayname
*
* This should be a human readable name for the principal.
- * If none is available, return the nodename.
- *
- * @return string
+ * If none is available, return the nodename.
+ *
+ * @return string
*/
public function getDisplayName() {
diff --git a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
index 4d8face206..dd0c2e86ed 100644
--- a/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
+++ b/3rdparty/Sabre/CalDAV/Principal/ProxyWrite.php
@@ -4,38 +4,38 @@
* ProxyWrite principal
*
* This class represents a principal group, hosted under the main principal.
- * This is needed to implement 'Calendar delegation' support. This class is
+ * This is needed to implement 'Calendar delegation' support. This class is
* instantiated by Sabre_CalDAV_Principal_User.
- *
+ *
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
/**
- * Parent principal information
- *
- * @var array
+ * Parent principal information
+ *
+ * @var array
*/
protected $principalInfo;
/**
- * Principal Backend
- *
- * @var Sabre_DAVACL_IPrincipalBackend
+ * Principal Backend
+ *
+ * @var Sabre_DAVACL_IPrincipalBackend
*/
protected $principalBackend;
/**
* Creates the object
*
- * Note that you MUST supply the parent principal information.
- *
- * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
- * @param array $principalInfo
+ * Note that you MUST supply the parent principal information.
+ *
+ * @param Sabre_DAVACL_IPrincipalBackend $principalBackend
+ * @param array $principalInfo
*/
public function __construct(Sabre_DAVACL_IPrincipalBackend $principalBackend, array $principalInfo) {
@@ -46,8 +46,8 @@ class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
/**
* Returns this principals name.
- *
- * @return string
+ *
+ * @return string
*/
public function getName() {
@@ -56,13 +56,13 @@ class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
}
/**
- * Returns the last modification time
+ * Returns the last modification time
*
- * @return null
+ * @return null
*/
public function getLastModified() {
- return null;
+ return null;
}
@@ -70,7 +70,7 @@ class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
* Deletes the current node
*
* @throws Sabre_DAV_Exception_Forbidden
- * @return void
+ * @return void
*/
public function delete() {
@@ -80,7 +80,7 @@ class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
/**
* Renames the node
- *
+ *
* @throws Sabre_DAV_Exception_Forbidden
* @param string $name The new name
* @return void
@@ -93,11 +93,11 @@ class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
/**
- * Returns a list of altenative urls for a principal
- *
+ * Returns a list of alternative urls for a principal
+ *
* This can for example be an email address, or ldap url.
- *
- * @return array
+ *
+ * @return array
*/
public function getAlternateUriSet() {
@@ -106,41 +106,41 @@ class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
}
/**
- * Returns the full principal url
- *
- * @return string
+ * Returns the full principal url
+ *
+ * @return string
*/
public function getPrincipalUrl() {
- return $this->principalInfo['uri'] . '/' . $this->getName();
+ return $this->principalInfo['uri'] . '/' . $this->getName();
}
/**
* Returns the list of group members
- *
+ *
* If this principal is a group, this function should return
- * all member principal uri's for the group.
- *
+ * all member principal uri's for the group.
+ *
* @return array
*/
public function getGroupMemberSet() {
- return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
+ return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
}
/**
* Returns the list of groups this principal is member of
- *
+ *
* If this principal is a member of a (list of) groups, this function
- * should return a list of principal uri's for it's members.
- *
- * @return array
+ * should return a list of principal uri's for it's members.
+ *
+ * @return array
*/
public function getGroupMembership() {
- return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
+ return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
}
@@ -149,11 +149,11 @@ class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
*
* If this principal is a group, this method sets all the group members.
* The list of members is always overwritten, never appended to.
- *
- * This method should throw an exception if the members could not be set.
- *
- * @param array $principals
- * @return void
+ *
+ * This method should throw an exception if the members could not be set.
+ *
+ * @param array $principals
+ * @return void
*/
public function setGroupMemberSet(array $principals) {
@@ -165,9 +165,9 @@ class Sabre_CalDAV_Principal_ProxyWrite implements Sabre_DAVACL_IPrincipal {
* Returns the displayname
*
* This should be a human readable name for the principal.
- * If none is available, return the nodename.
- *
- * @return string
+ * If none is available, return the nodename.
+ *
+ * @return string
*/
public function getDisplayName() {
diff --git a/3rdparty/Sabre/CalDAV/Principal/User.php b/3rdparty/Sabre/CalDAV/Principal/User.php
index 034629b89b..8453b877a7 100644
--- a/3rdparty/Sabre/CalDAV/Principal/User.php
+++ b/3rdparty/Sabre/CalDAV/Principal/User.php
@@ -1,25 +1,25 @@
principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/' . $name);
+ if (!$principal) {
+ throw new Sabre_DAV_Exception_NotFound('Node with name ' . $name . ' was not found');
+ }
if ($name === 'calendar-proxy-read')
return new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
if ($name === 'calendar-proxy-write')
return new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
- throw new Sabre_DAV_Exception_FileNotFound('Node with name ' . $name . ' was not found');
+ throw new Sabre_DAV_Exception_NotFound('Node with name ' . $name . ' was not found');
}
/**
- * Returns an array with all the child nodes
- *
- * @return Sabre_DAV_INode[]
+ * Returns an array with all the child nodes
+ *
+ * @return Sabre_DAV_INode[]
*/
public function getChildren() {
- return array(
- new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties),
- new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties),
- );
+ $r = array();
+ if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-read')) {
+ $r[] = new Sabre_CalDAV_Principal_ProxyRead($this->principalBackend, $this->principalProperties);
+ }
+ if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-write')) {
+ $r[] = new Sabre_CalDAV_Principal_ProxyWrite($this->principalBackend, $this->principalProperties);
+ }
+
+ return $r;
}
/**
- * Checks if a child-node with the specified name exists
- *
- * @return bool
+ * Returns whether or not the child node exists
+ *
+ * @param string $name
+ * @return bool
*/
public function childExists($name) {
- return $name === 'calendar-proxy-read' || $name === 'calendar-proxy-write';
+ try {
+ $this->getChild($name);
+ return true;
+ } catch (Sabre_DAV_Exception_NotFound $e) {
+ return false;
+ }
}
@@ -89,33 +104,28 @@ class Sabre_CalDAV_Principal_User extends Sabre_DAVACL_Principal implements Sabr
* Returns a list of ACE's for this node.
*
* Each ACE has the following properties:
- * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+ * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
* currently the only supported privileges
* * 'principal', a url to the principal who owns the node
- * * 'protected' (optional), indicating that this ACE is not allowed to
- * be updated.
- *
- * @return array
+ * * 'protected' (optional), indicating that this ACE is not allowed to
+ * be updated.
+ *
+ * @return array
*/
public function getACL() {
- return array(
- array(
- 'privilege' => '{DAV:}read',
- 'principal' => $this->principalProperties['uri'],
- 'protected' => true,
- ),
- array(
- 'privilege' => '{DAV:}read',
- 'principal' => $this->principalProperties['uri'] . '/calendar-proxy-read',
- 'protected' => true,
- ),
- array(
- 'privilege' => '{DAV:}read',
- 'principal' => $this->principalProperties['uri'] . '/calendar-proxy-write',
- 'protected' => true,
- ),
+ $acl = parent::getACL();
+ $acl[] = array(
+ 'privilege' => '{DAV:}read',
+ 'principal' => $this->principalProperties['uri'] . '/calendar-proxy-read',
+ 'protected' => true,
);
+ $acl[] = array(
+ 'privilege' => '{DAV:}read',
+ 'principal' => $this->principalProperties['uri'] . '/calendar-proxy-write',
+ 'protected' => true,
+ );
+ return $acl;
}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
index 1bbaca6b8a..2ea078d7da 100644
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
@@ -3,40 +3,40 @@
/**
* Supported component set property
*
- * This property is a representation of the supported-calendar_component-set
+ * This property is a representation of the supported-calendar_component-set
* property in the CalDAV namespace. It simply requires an array of components,
* such as VEVENT, VTODO
*
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Property {
/**
- * List of supported components, such as "VEVENT, VTODO"
- *
- * @var array
+ * List of supported components, such as "VEVENT, VTODO"
+ *
+ * @var array
*/
private $components;
/**
- * Creates the property
- *
- * @param array $components
+ * Creates the property
+ *
+ * @param array $components
*/
public function __construct(array $components) {
- $this->components = $components;
+ $this->components = $components;
}
/**
- * Returns the list of supported components
- *
- * @return array
+ * Returns the list of supported components
+ *
+ * @return array
*/
public function getValue() {
@@ -45,10 +45,10 @@ class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Prop
}
/**
- * Serializes the property in a DOMDocument
- *
- * @param Sabre_DAV_Server $server
- * @param DOMElement $node
+ * Serializes the property in a DOMDocument
+ *
+ * @param Sabre_DAV_Server $server
+ * @param DOMElement $node
* @return void
*/
public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
@@ -58,7 +58,7 @@ class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Prop
$xcomp = $doc->createElement('cal:comp');
$xcomp->setAttribute('name',$component);
- $node->appendChild($xcomp);
+ $node->appendChild($xcomp);
}
@@ -66,9 +66,9 @@ class Sabre_CalDAV_Property_SupportedCalendarComponentSet extends Sabre_DAV_Prop
/**
* Unserializes the DOMElement back into a Property class.
- *
- * @param DOMElement $node
- * @return void
+ *
+ * @param DOMElement $node
+ * @return Sabre_CalDAV_Property_SupportedCalendarComponentSet
*/
static function unserialize(DOMElement $node) {
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
index 5010ee6d52..1d848dd5cf 100644
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCalendarData.php
@@ -9,17 +9,17 @@
*
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_CalDAV_Property_SupportedCalendarData extends Sabre_DAV_Property {
/**
- * Serializes the property in a DOMDocument
- *
- * @param Sabre_DAV_Server $server
- * @param DOMElement $node
+ * Serializes the property in a DOMDocument
+ *
+ * @param Sabre_DAV_Server $server
+ * @param DOMElement $node
* @return void
*/
public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
@@ -32,7 +32,7 @@ class Sabre_CalDAV_Property_SupportedCalendarData extends Sabre_DAV_Property {
$caldata->setAttribute('content-type','text/calendar');
$caldata->setAttribute('version','2.0');
- $node->appendChild($caldata);
+ $node->appendChild($caldata);
}
}
diff --git a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
index e585e9db3d..24e84d4c17 100644
--- a/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
+++ b/3rdparty/Sabre/CalDAV/Property/SupportedCollationSet.php
@@ -4,27 +4,27 @@
* supported-collation-set property
*
* This property is a representation of the supported-collation-set property
- * in the CalDAV namespace.
+ * in the CalDAV namespace.
*
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_CalDAV_Property_SupportedCollationSet extends Sabre_DAV_Property {
/**
- * Serializes the property in a DOM document
- *
- * @param Sabre_DAV_Server $server
- * @param DOMElement $node
+ * Serializes the property in a DOM document
+ *
+ * @param Sabre_DAV_Server $server
+ * @param DOMElement $node
* @return void
*/
public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
$doc = $node->ownerDocument;
-
+
$prefix = $node->lookupPrefix('urn:ietf:params:xml:ns:caldav');
if (!$prefix) $prefix = 'cal';
diff --git a/3rdparty/Sabre/CalDAV/Schedule/IMip.php b/3rdparty/Sabre/CalDAV/Schedule/IMip.php
new file mode 100644
index 0000000000..37e75fcc4a
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Schedule/IMip.php
@@ -0,0 +1,104 @@
+senderEmail = $senderEmail;
+
+ }
+
+ /**
+ * Sends one or more iTip messages through email.
+ *
+ * @param string $originator
+ * @param array $recipients
+ * @param Sabre_VObject_Component $vObject
+ * @return void
+ */
+ public function sendMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
+
+ foreach($recipients as $recipient) {
+
+ $to = $recipient;
+ $replyTo = $originator;
+ $subject = 'SabreDAV iTIP message';
+
+ switch(strtoupper($vObject->METHOD)) {
+ case 'REPLY' :
+ $subject = 'Response for: ' . $vObject->VEVENT->SUMMARY;
+ break;
+ case 'REQUEST' :
+ $subject = 'Invitation for: ' .$vObject->VEVENT->SUMMARY;
+ break;
+ case 'CANCEL' :
+ $subject = 'Cancelled event: ' . $vObject->VEVENT->SUMMARY;
+ break;
+ }
+
+ $headers = array();
+ $headers[] = 'Reply-To: ' . $replyTo;
+ $headers[] = 'From: ' . $this->senderEmail;
+ $headers[] = 'Content-Type: text/calendar; method=' . (string)$vObject->method . '; charset=utf-8';
+ if (Sabre_DAV_Server::$exposeVersion) {
+ $headers[] = 'X-Sabre-Version: ' . Sabre_DAV_Version::VERSION . '-' . Sabre_DAV_Version::STABILITY;
+ }
+
+ $vcalBody = $vObject->serialize();
+
+ $this->mail($to, $subject, $vcalBody, $headers);
+
+ }
+
+ }
+
+ /**
+ * This function is reponsible for sending the actual email.
+ *
+ * @param string $to Recipient email address
+ * @param string $subject Subject of the email
+ * @param string $body iCalendar body
+ * @param array $headers List of headers
+ * @return void
+ */
+ protected function mail($to, $subject, $body, array $headers) {
+
+ mail($to, $subject, $body, implode("\r\n", $headers));
+
+ }
+
+
+}
+
+?>
diff --git a/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php b/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
new file mode 100644
index 0000000000..46d77514bc
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/Schedule/IOutbox.php
@@ -0,0 +1,16 @@
+principalUri = $principalUri;
+
+ }
+
+ /**
+ * Returns the name of the node.
+ *
+ * This is used to generate the url.
+ *
+ * @return string
+ */
+ public function getName() {
+
+ return 'outbox';
+
+ }
+
+ /**
+ * Returns an array with all the child nodes
+ *
+ * @return Sabre_DAV_INode[]
+ */
+ public function getChildren() {
+
+ return array();
+
+ }
+
+ /**
+ * Returns the owner principal
+ *
+ * This must be a url to a principal, or null if there's no owner
+ *
+ * @return string|null
+ */
+ public function getOwner() {
+
+ return $this->principalUri;
+
+ }
+
+ /**
+ * Returns a group principal
+ *
+ * This must be a url to a principal, or null if there's no owner
+ *
+ * @return string|null
+ */
+ public function getGroup() {
+
+ return null;
+
+ }
+
+ /**
+ * Returns a list of ACE's for this node.
+ *
+ * Each ACE has the following properties:
+ * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+ * currently the only supported privileges
+ * * 'principal', a url to the principal who owns the node
+ * * 'protected' (optional), indicating that this ACE is not allowed to
+ * be updated.
+ *
+ * @return array
+ */
+ public function getACL() {
+
+ return array(
+ array(
+ 'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}schedule-query-freebusy',
+ 'principal' => $this->getOwner(),
+ 'protected' => true,
+ ),
+ array(
+ 'privilege' => '{DAV:}read',
+ 'principal' => $this->getOwner(),
+ 'protected' => true,
+ ),
+ );
+
+ }
+
+ /**
+ * Updates the ACL
+ *
+ * This method will receive a list of new ACE's.
+ *
+ * @param array $acl
+ * @return void
+ */
+ public function setACL(array $acl) {
+
+ throw new Sabre_DAV_Exception_MethodNotAllowed('You\'re not allowed to update the ACL');
+
+ }
+
+ /**
+ * Returns the list of supported privileges for this node.
+ *
+ * The returned data structure is a list of nested privileges.
+ * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+ * standard structure.
+ *
+ * If null is returned from this method, the default privilege set is used,
+ * which is fine for most common usecases.
+ *
+ * @return array|null
+ */
+ public function getSupportedPrivilegeSet() {
+
+ $default = Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet();
+ $default['aggregates'][] = array(
+ 'privilege' => '{' . Sabre_CalDAV_Plugin::NS_CALDAV . '}schedule-query-freebusy',
+ );
+
+ return $default;
+
+ }
+
+}
diff --git a/3rdparty/Sabre/CalDAV/Server.php b/3rdparty/Sabre/CalDAV/Server.php
index 969d69c627..325e3d80a7 100644
--- a/3rdparty/Sabre/CalDAV/Server.php
+++ b/3rdparty/Sabre/CalDAV/Server.php
@@ -3,17 +3,20 @@
/**
* CalDAV server
*
+ * Deprecated! Warning: This class is now officially deprecated
+ *
* This script is a convenience script. It quickly sets up a WebDAV server
* with caldav and ACL support, and it creates the root 'principals' and
* 'calendars' collections.
*
- * Note that if you plan to do anything moderately complex, you are advised to
- * not subclass this server, but use Sabre_DAV_Server directly instead. This
+ * Note that if you plan to do anything moderately complex, you are advised to
+ * not subclass this server, but use Sabre_DAV_Server directly instead. This
* class is nothing more than an 'easy setup'.
- *
+ *
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @deprecated Don't use this class anymore, it will be removed in version 1.7.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -22,17 +25,17 @@ class Sabre_CalDAV_Server extends Sabre_DAV_Server {
/**
* The authentication realm
*
- * Note that if this changes, the hashes in the auth backend must also
- * be recalculated.
- *
+ * Note that if this changes, the hashes in the auth backend must also
+ * be recalculated.
+ *
* @var string
*/
public $authRealm = 'SabreDAV';
/**
* Sets up the object. A PDO object must be passed to setup all the backends.
- *
- * @param PDO $pdo
+ *
+ * @param PDO $pdo
*/
public function __construct(PDO $pdo) {
diff --git a/3rdparty/Sabre/CalDAV/UserCalendars.php b/3rdparty/Sabre/CalDAV/UserCalendars.php
index f52d65e9a7..b8d3f0573f 100644
--- a/3rdparty/Sabre/CalDAV/UserCalendars.php
+++ b/3rdparty/Sabre/CalDAV/UserCalendars.php
@@ -1,68 +1,68 @@
principalBackend = $principalBackend;
$this->caldavBackend = $caldavBackend;
$this->principalInfo = $principalBackend->getPrincipalByPath($userUri);
-
+
}
/**
- * Returns the name of this object
- *
+ * Returns the name of this object
+ *
* @return string
*/
public function getName() {
-
+
list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalInfo['uri']);
- return $name;
+ return $name;
}
/**
- * Updates the name of this object
- *
- * @param string $name
+ * Updates the name of this object
+ *
+ * @param string $name
* @return void
*/
public function setName($name) {
@@ -72,8 +72,8 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
}
/**
- * Deletes this object
- *
+ * Deletes this object
+ *
* @return void
*/
public function delete() {
@@ -83,13 +83,13 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
}
/**
- * Returns the last modification date
- *
- * @return int
+ * Returns the last modification date
+ *
+ * @return int
*/
public function getLastModified() {
- return null;
+ return null;
}
@@ -97,9 +97,9 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
* Creates a new file under this object.
*
* This is currently not allowed
- *
- * @param string $filename
- * @param resource $data
+ *
+ * @param string $filename
+ * @param resource $data
* @return void
*/
public function createFile($filename, $data=null) {
@@ -112,8 +112,8 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
* Creates a new directory under this object.
*
* This is currently not allowed.
- *
- * @param string $filename
+ *
+ * @param string $filename
* @return void
*/
public function createDirectory($filename) {
@@ -123,11 +123,11 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
}
/**
- * Returns a single calendar, by name
- *
+ * Returns a single calendar, by name
+ *
* @param string $name
* @todo needs optimizing
- * @return Sabre_CalDAV_Calendar
+ * @return Sabre_CalDAV_Calendar
*/
public function getChild($name) {
@@ -136,22 +136,22 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
return $child;
}
- throw new Sabre_DAV_Exception_FileNotFound('Calendar with name \'' . $name . '\' could not be found');
+ throw new Sabre_DAV_Exception_NotFound('Calendar with name \'' . $name . '\' could not be found');
}
/**
* Checks if a calendar exists.
- *
+ *
* @param string $name
* @todo needs optimizing
- * @return bool
+ * @return bool
*/
public function childExists($name) {
foreach($this->getChildren() as $child) {
if ($name==$child->getName())
- return true;
+ return true;
}
return false;
@@ -160,8 +160,8 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
/**
* Returns a list of calendars
- *
- * @return array
+ *
+ * @return array
*/
public function getChildren() {
@@ -170,15 +170,17 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
foreach($calendars as $calendar) {
$objs[] = new Sabre_CalDAV_Calendar($this->principalBackend, $this->caldavBackend, $calendar);
}
+ $objs[] = new Sabre_CalDAV_Schedule_Outbox($this->principalInfo['uri']);
return $objs;
}
/**
* Creates a new calendar
- *
- * @param string $name
- * @param string $properties
+ *
+ * @param string $name
+ * @param array $resourceType
+ * @param array $properties
* @return void
*/
public function createExtendedCollection($name, array $resourceType, array $properties) {
@@ -193,8 +195,8 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
/**
* Returns the owner principal
*
- * This must be a url to a principal, or null if there's no owner
- *
+ * This must be a url to a principal, or null if there's no owner
+ *
* @return string|null
*/
public function getOwner() {
@@ -207,8 +209,8 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
* Returns a group principal
*
* This must be a url to a principal, or null if there's no owner
- *
- * @return string|null
+ *
+ * @return string|null
*/
public function getGroup() {
@@ -220,13 +222,13 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
* Returns a list of ACE's for this node.
*
* Each ACE has the following properties:
- * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+ * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
* currently the only supported privileges
* * 'principal', a url to the principal who owns the node
- * * 'protected' (optional), indicating that this ACE is not allowed to
- * be updated.
- *
- * @return array
+ * * 'protected' (optional), indicating that this ACE is not allowed to
+ * be updated.
+ *
+ * @return array
*/
public function getACL() {
@@ -264,9 +266,9 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
/**
* Updates the ACL
*
- * This method will receive a list of new ACE's.
- *
- * @param array $acl
+ * This method will receive a list of new ACE's.
+ *
+ * @param array $acl
* @return void
*/
public function setACL(array $acl) {
@@ -275,6 +277,22 @@ class Sabre_CalDAV_UserCalendars implements Sabre_DAV_IExtendedCollection, Sabre
}
+ /**
+ * Returns the list of supported privileges for this node.
+ *
+ * The returned data structure is a list of nested privileges.
+ * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+ * standard structure.
+ *
+ * If null is returned from this method, the default privilege set is used,
+ * which is fine for most common usecases.
+ *
+ * @return array|null
+ */
+ public function getSupportedPrivilegeSet() {
+ return null;
+
+ }
}
diff --git a/3rdparty/Sabre/CalDAV/Version.php b/3rdparty/Sabre/CalDAV/Version.php
index df8fe1f6bd..939e903c89 100644
--- a/3rdparty/Sabre/CalDAV/Version.php
+++ b/3rdparty/Sabre/CalDAV/Version.php
@@ -2,10 +2,10 @@
/**
* This class contains the Sabre_CalDAV version constants.
- *
+ *
* @package Sabre
* @subpackage CalDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -14,7 +14,7 @@ class Sabre_CalDAV_Version {
/**
* Full version number
*/
- const VERSION = '1.5.3';
+ const VERSION = '1.6.2';
/**
* Stability : alpha, beta, stable
diff --git a/3rdparty/Sabre/CalDAV/XMLUtil.php b/3rdparty/Sabre/CalDAV/XMLUtil.php
deleted file mode 100644
index bf349a36aa..0000000000
--- a/3rdparty/Sabre/CalDAV/XMLUtil.php
+++ /dev/null
@@ -1,208 +0,0 @@
-childNodes as $child) {
-
- switch(Sabre_DAV_XMLUtil::toClarkNotation($child)) {
-
- case '{urn:ietf:params:xml:ns:caldav}comp-filter' :
- case '{urn:ietf:params:xml:ns:caldav}prop-filter' :
-
- $filterName = $basePath . '/' . 'c:' . strtolower($child->getAttribute('name'));
- $filters[$filterName] = array();
-
- self::parseCalendarQueryFilters($child, $filterName,$filters);
- break;
-
- case '{urn:ietf:params:xml:ns:caldav}time-range' :
-
- if ($start = $child->getAttribute('start')) {
- $start = self::parseICalendarDateTime($start);
- } else {
- $start = null;
- }
- if ($end = $child->getAttribute('end')) {
- $end = self::parseICalendarDateTime($end);
- } else {
- $end = null;
- }
-
- if (!is_null($start) && !is_null($end) && $end <= $start) {
- throw new Sabre_DAV_Exception_BadRequest('The end-date must be larger than the start-date in the time-range filter');
- }
-
- $filters[$basePath]['time-range'] = array(
- 'start' => $start,
- 'end' => $end
- );
- break;
-
- case '{urn:ietf:params:xml:ns:caldav}is-not-defined' :
- $filters[$basePath]['is-not-defined'] = true;
- break;
-
- case '{urn:ietf:params:xml:ns:caldav}param-filter' :
-
- $filterName = $basePath . '/@' . strtolower($child->getAttribute('name'));
- $filters[$filterName] = array();
- self::parseCalendarQueryFilters($child, $filterName, $filters);
- break;
-
- case '{urn:ietf:params:xml:ns:caldav}text-match' :
-
- $collation = $child->getAttribute('collation');
- if (!$collation) $collation = 'i;ascii-casemap';
-
- $filters[$basePath]['text-match'] = array(
- 'collation' => ($collation == 'default'?'i;ascii-casemap':$collation),
- 'negate-condition' => $child->getAttribute('negate-condition')==='yes',
- 'value' => $child->nodeValue,
- );
- break;
-
- }
-
- }
-
- return $filters;
-
- }
-
- /**
- * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
- *
- * Specifying a reference timezone is optional. It will only be used
- * if the non-UTC format is used. The argument is used as a reference, the
- * returned DateTime object will still be in the UTC timezone.
- *
- * @param string $dt
- * @param DateTimeZone $tz
- * @return DateTime
- */
- static public function parseICalendarDateTime($dt,DateTimeZone $tz = null) {
-
- // Format is YYYYMMDD + "T" + hhmmss
- $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/',$dt,$matches);
-
- if (!$result) {
- throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar datetime value is incorrect: ' . $dt);
- }
-
- if ($matches[7]==='Z' || is_null($tz)) {
- $tz = new DateTimeZone('UTC');
- }
- $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] .':' . $matches[6], $tz);
-
- // Still resetting the timezone, to normalize everything to UTC
- $date->setTimeZone(new DateTimeZone('UTC'));
- return $date;
-
- }
-
- /**
- * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
- *
- * @param string $date
- * @param DateTimeZone $tz
- * @return DateTime
- */
- static public function parseICalendarDate($date) {
-
- // Format is YYYYMMDD
- $result = preg_match('/^([1-3][0-9]{3})([0-1][0-9])([0-3][0-9])$/',$date,$matches);
-
- if (!$result) {
- throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar date value is incorrect: ' . $date);
- }
-
- $date = new DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3], new DateTimeZone('UTC'));
- return $date;
-
- }
-
- /**
- * Parses an iCalendar (RFC5545) formatted duration and returns a string suitable
- * for strtotime or DateTime::modify.
- *
- * NOTE: When we require PHP 5.3 this can be replaced by the DateTimeInterval object, which
- * supports ISO 8601 Intervals, which is a superset of ICalendar durations.
- *
- * For now though, we're just gonna live with this messy system
- *
- * @param string $duration
- * @return string
- */
- static public function parseICalendarDuration($duration) {
-
- $result = preg_match('/^(?P\+|-)?P((?P\d+)W)?((?P\d+)D)?(T((?P\d+)H)?((?P\d+)M)?((?P\d+)S)?)?$/', $duration, $matches);
- if (!$result) {
- throw new Sabre_DAV_Exception_BadRequest('The supplied iCalendar duration value is incorrect: ' . $duration);
- }
-
- $parts = array(
- 'week',
- 'day',
- 'hour',
- 'minute',
- 'second',
- );
-
- $newDur = '';
- foreach($parts as $part) {
- if (isset($matches[$part]) && $matches[$part]) {
- $newDur.=' '.$matches[$part] . ' ' . $part . 's';
- }
- }
-
- $newDur = ($matches['plusminus']==='-'?'-':'+') . trim($newDur);
- return $newDur;
-
- }
-
-}
diff --git a/3rdparty/Sabre/CalDAV/includes.php b/3rdparty/Sabre/CalDAV/includes.php
new file mode 100644
index 0000000000..1ecb870a0e
--- /dev/null
+++ b/3rdparty/Sabre/CalDAV/includes.php
@@ -0,0 +1,43 @@
+carddavBackend = $carddavBackend;
$this->addressBookInfo = $addressBookInfo;
@@ -42,9 +41,9 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
}
/**
- * Returns the name of the addressbook
- *
- * @return string
+ * Returns the name of the addressbook
+ *
+ * @return string
*/
public function getName() {
@@ -55,21 +54,21 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
/**
* Returns a card
*
- * @param string $name
+ * @param string $name
* @return Sabre_DAV_Card
*/
public function getChild($name) {
$obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
- if (!$obj) throw new Sabre_DAV_Exception_FileNotFound('Card not found');
+ if (!$obj) throw new Sabre_DAV_Exception_NotFound('Card not found');
return new Sabre_CardDAV_Card($this->carddavBackend,$this->addressBookInfo,$obj);
}
/**
* Returns the full list of cards
- *
- * @return array
+ *
+ * @return array
*/
public function getChildren() {
@@ -85,9 +84,9 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
/**
* Creates a new directory
*
- * We actually block this, as subdirectories are not allowed in addressbooks.
- *
- * @param string $name
+ * We actually block this, as subdirectories are not allowed in addressbooks.
+ *
+ * @param string $name
* @return void
*/
public function createDirectory($name) {
@@ -99,11 +98,13 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
/**
* Creates a new file
*
- * The contents of the new file must be a valid VCARD
- *
- * @param string $name
- * @param resource $vcardData
- * @return void
+ * The contents of the new file must be a valid VCARD.
+ *
+ * This method may return an ETag.
+ *
+ * @param string $name
+ * @param resource $vcardData
+ * @return void|null
*/
public function createFile($name,$vcardData = null) {
@@ -111,13 +112,13 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
// Converting to UTF-8, if needed
$vcardData = Sabre_DAV_StringUtil::ensureUTF8($vcardData);
- $this->carddavBackend->createCard($this->addressBookInfo['id'],$name,$vcardData);
+ return $this->carddavBackend->createCard($this->addressBookInfo['id'],$name,$vcardData);
}
/**
- * Deletes the entire addressbook.
- *
+ * Deletes the entire addressbook.
+ *
* @return void
*/
public function delete() {
@@ -128,8 +129,8 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
/**
* Renames the addressbook
- *
- * @param string $newName
+ *
+ * @param string $newName
* @return void
*/
public function setName($newName) {
@@ -140,7 +141,7 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
/**
* Returns the last modification date as a unix timestamp.
- *
+ *
* @return void
*/
public function getLastModified() {
@@ -162,7 +163,7 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
* If the operation was successful, true can be returned.
* If the operation failed, false can be returned.
*
- * Deletion of a non-existant property is always succesful.
+ * Deletion of a non-existent property is always successful.
*
* Lastly, it is optional to return detailed information about any
* failures. In this case an array should be returned with the following
@@ -177,16 +178,16 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
* )
* )
*
- * In this example it was forbidden to update {DAV:}displayname.
+ * In this example it was forbidden to update {DAV:}displayname.
* (403 Forbidden), which in turn also caused {DAV:}owner to fail
* (424 Failed Dependency) because the request needs to be atomic.
*
- * @param array $mutations
- * @return bool|array
+ * @param array $mutations
+ * @return bool|array
*/
public function updateProperties($mutations) {
- return $this->carddavBackend->updateAddressBook($this->addressBookInfo['id'], $mutations);
+ return $this->carddavBackend->updateAddressBook($this->addressBookInfo['id'], $mutations);
}
@@ -198,8 +199,8 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
*
* If the array is empty, it means 'all properties' were requested.
*
- * @param array $properties
- * @return void
+ * @param array $properties
+ * @return array
*/
public function getProperties($properties) {
@@ -221,8 +222,8 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
/**
* Returns the owner principal
*
- * This must be a url to a principal, or null if there's no owner
- *
+ * This must be a url to a principal, or null if there's no owner
+ *
* @return string|null
*/
public function getOwner() {
@@ -235,8 +236,8 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
* Returns a group principal
*
* This must be a url to a principal, or null if there's no owner
- *
- * @return string|null
+ *
+ * @return string|null
*/
public function getGroup() {
@@ -248,13 +249,13 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
* Returns a list of ACE's for this node.
*
* Each ACE has the following properties:
- * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+ * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
* currently the only supported privileges
* * 'principal', a url to the principal who owns the node
- * * 'protected' (optional), indicating that this ACE is not allowed to
- * be updated.
- *
- * @return array
+ * * 'protected' (optional), indicating that this ACE is not allowed to
+ * be updated.
+ *
+ * @return array
*/
public function getACL() {
@@ -277,9 +278,9 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
/**
* Updates the ACL
*
- * This method will receive a list of new ACE's.
- *
- * @param array $acl
+ * This method will receive a list of new ACE's.
+ *
+ * @param array $acl
* @return void
*/
public function setACL(array $acl) {
@@ -288,6 +289,22 @@ class Sabre_CardDAV_AddressBook extends Sabre_DAV_Collection implements Sabre_Ca
}
+ /**
+ * Returns the list of supported privileges for this node.
+ *
+ * The returned data structure is a list of nested privileges.
+ * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+ * standard structure.
+ *
+ * If null is returned from this method, the default privilege set is used,
+ * which is fine for most common usecases.
+ *
+ * @return array|null
+ */
+ public function getSupportedPrivilegeSet() {
+ return null;
+
+ }
}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
index 08adc3b815..85a4963127 100644
--- a/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
+++ b/3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
@@ -3,12 +3,12 @@
/**
* Parses the addressbook-query report request body.
*
- * Whoever designed this format, and the CalDAV equavalent even more so,
+ * Whoever designed this format, and the CalDAV equivalent even more so,
* has no feel for design.
- *
+ *
* @package Sabre
* @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -19,8 +19,8 @@ class Sabre_CardDAV_AddressBookQueryParser {
/**
* List of requested properties the client wanted
- *
- * @var array
+ *
+ * @var array
*/
public $requestedProperties;
@@ -28,44 +28,43 @@ class Sabre_CardDAV_AddressBookQueryParser {
* The number of results the client wants
*
* null means it wasn't specified, which in most cases means 'all results'.
- *
- * @var int|null
+ *
+ * @var int|null
*/
public $limit;
/**
* List of property filters.
*
- * @var array
+ * @var array
*/
public $filters;
/**
* Either TEST_ANYOF or TEST_ALLOF
- *
- * @var string
+ *
+ * @var string
*/
public $test;
/**
* DOM Document
- *
- * @var DOMDocument
+ *
+ * @var DOMDocument
*/
protected $dom;
/**
- * DOM XPath object
- *
- * @var DOMXPath
+ * DOM XPath object
+ *
+ * @var DOMXPath
*/
protected $xpath;
/**
* Creates the parser
- *
- * @param DOMNode $dom
- * @return void
+ *
+ * @param DOMDocument $dom
*/
public function __construct(DOMDocument $dom) {
@@ -77,15 +76,14 @@ class Sabre_CardDAV_AddressBookQueryParser {
}
/**
- * Parses the request.
- *
- * @param DOMNode $dom
+ * Parses the request.
+ *
* @return void
*/
public function parse() {
$filterNode = null;
-
+
$limit = $this->xpath->evaluate('number(/card:addressbook-query/card:limit/card:nresults)');
if (is_nan($limit)) $limit = null;
@@ -120,9 +118,9 @@ class Sabre_CardDAV_AddressBookQueryParser {
/**
* Parses the prop-filter xml element
- *
- * @param DOMElement $propFilterNode
- * @return array
+ *
+ * @param DOMElement $propFilterNode
+ * @return array
*/
protected function parsePropFilterNode(DOMElement $propFilterNode) {
@@ -157,13 +155,13 @@ class Sabre_CardDAV_AddressBookQueryParser {
}
/**
- * Parses the param-filter element
- *
- * @param DOMElement $paramFilterNode
- * @return array
+ * Parses the param-filter element
+ *
+ * @param DOMElement $paramFilterNode
+ * @return array
*/
public function parseParamFilterNode(DOMElement $paramFilterNode) {
-
+
$paramFilter = array();
$paramFilter['name'] = $paramFilterNode->getAttribute('name');
$paramFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $paramFilterNode)->length>0;
@@ -174,15 +172,15 @@ class Sabre_CardDAV_AddressBookQueryParser {
$paramFilter['text-match'] = $this->parseTextMatchNode($textMatch->item(0));
}
- return $paramFilter;
+ return $paramFilter;
}
/**
* Text match
- *
- * @param DOMElement $textMatchNode
- * @return void
+ *
+ * @param DOMElement $textMatchNode
+ * @return array
*/
public function parseTextMatchNode(DOMElement $textMatchNode) {
@@ -204,8 +202,8 @@ class Sabre_CardDAV_AddressBookQueryParser {
'match-type' => $matchType,
'value' => $textMatchNode->nodeValue
);
-
- }
+
+ }
}
diff --git a/3rdparty/Sabre/CardDAV/AddressBookRoot.php b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
index 1a80efba35..9d37b15f08 100644
--- a/3rdparty/Sabre/CardDAV/AddressBookRoot.php
+++ b/3rdparty/Sabre/CardDAV/AddressBookRoot.php
@@ -1,45 +1,45 @@
pdo = $pdo;
$this->addressBooksTableName = $addressBooksTableName;
- $this->cardsTableName = $cardsTableName;
+ $this->cardsTableName = $cardsTableName;
}
/**
- * Returns the list of addressbooks for a specific user.
- *
- * @param string $principalUri
- * @return array
+ * Returns the list of addressbooks for a specific user.
+ *
+ * @param string $principalUri
+ * @return array
*/
public function getAddressBooksForUser($principalUri) {
- $stmt = $this->pdo->prepare('SELECT id, uri, displayname, principaluri, description, ctag FROM `'.$this->addressBooksTableName.'` WHERE principaluri = ?');
- $result = $stmt->execute(array($principalUri));
+ $stmt = $this->pdo->prepare('SELECT id, uri, displayname, principaluri, description, ctag FROM '.$this->addressBooksTableName.' WHERE principaluri = ?');
+ $stmt->execute(array($principalUri));
$addressBooks = array();
@@ -65,7 +67,7 @@ class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
'{DAV:}displayname' => $row['displayname'],
'{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
'{http://calendarserver.org/ns/}getctag' => $row['ctag'],
- '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}supported-address-data' =>
+ '{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}supported-address-data' =>
new Sabre_CardDAV_Property_SupportedAddressData(),
);
@@ -79,8 +81,8 @@ class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
/**
* Updates an addressbook's properties
*
- * See Sabre_DAV_IProperties for a description of the mutations array, as
- * well as the return value.
+ * See Sabre_DAV_IProperties for a description of the mutations array, as
+ * well as the return value.
*
* @param mixed $addressBookId
* @param array $mutations
@@ -88,7 +90,7 @@ class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
* @return bool|array
*/
public function updateAddressBook($addressBookId, array $mutations) {
-
+
$updates = array();
foreach($mutations as $property=>$newValue) {
@@ -101,7 +103,7 @@ class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
$updates['description'] = $newValue;
break;
default :
- // If any unsupported values were being updated, we must
+ // If any unsupported values were being updated, we must
// let the entire request fail.
return false;
}
@@ -113,7 +115,7 @@ class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
return false;
}
- $query = 'UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 ';
+ $query = 'UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 ';
foreach($updates as $key=>$value) {
$query.=', `' . $key . '` = :' . $key . ' ';
}
@@ -129,11 +131,11 @@ class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
}
/**
- * Creates a new address book
+ * Creates a new address book
*
- * @param string $principalUri
- * @param string $url Just the 'basename' of the url.
- * @param array $properties
+ * @param string $principalUri
+ * @param string $url Just the 'basename' of the url.
+ * @param array $properties
* @return void
*/
public function createAddressBook($principalUri, $url, array $properties) {
@@ -160,7 +162,7 @@ class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
}
- $query = 'INSERT INTO `' . $this->addressBooksTableName . '` (uri, displayname, description, principaluri, ctag) VALUES (:uri, :displayname, :description, :principaluri, 1)';
+ $query = 'INSERT INTO ' . $this->addressBooksTableName . ' (uri, displayname, description, principaluri, ctag) VALUES (:uri, :displayname, :description, :principaluri, 1)';
$stmt = $this->pdo->prepare($query);
$stmt->execute($values);
@@ -169,44 +171,61 @@ class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
/**
* Deletes an entire addressbook and all its contents
*
- * @param int $addressBookId
+ * @param int $addressBookId
* @return void
*/
public function deleteAddressBook($addressBookId) {
- $stmt = $this->pdo->prepare('DELETE FROM `' . $this->cardsTableName . '` WHERE addressbookid = ?');
+ $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
$stmt->execute(array($addressBookId));
- $stmt = $this->pdo->prepare('DELETE FROM `' . $this->addressBooksTableName . '` WHERE id = ?');
+ $stmt = $this->pdo->prepare('DELETE FROM ' . $this->addressBooksTableName . ' WHERE id = ?');
$stmt->execute(array($addressBookId));
}
/**
- * Returns all cards for a specific addressbook id.
- *
- * @param mixed $addressbookId
- * @return array
+ * Returns all cards for a specific addressbook id.
+ *
+ * This method should return the following properties for each card:
+ * * carddata - raw vcard data
+ * * uri - Some unique url
+ * * lastmodified - A unix timestamp
+ *
+ * It's recommended to also return the following properties:
+ * * etag - A unique etag. This must change every time the card changes.
+ * * size - The size of the card in bytes.
+ *
+ * If these last two properties are provided, less time will be spent
+ * calculating them. If they are specified, you can also ommit carddata.
+ * This may speed up certain requests, especially with large cards.
+ *
+ * @param mixed $addressbookId
+ * @return array
*/
public function getCards($addressbookId) {
- $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM `' . $this->cardsTableName . '` WHERE addressbookid = ?');
+ $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
$stmt->execute(array($addressbookId));
return $stmt->fetchAll(PDO::FETCH_ASSOC);
-
+
}
+
/**
- * Returns a specfic card
- *
- * @param mixed $addressBookId
- * @param string $cardUri
- * @return array
+ * Returns a specfic card.
+ *
+ * The same set of properties must be returned as with getCards. The only
+ * exception is that 'carddata' is absolutely required.
+ *
+ * @param mixed $addressBookId
+ * @param string $cardUri
+ * @return array
*/
public function getCard($addressBookId, $cardUri) {
- $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM `' . $this->cardsTableName . '` WHERE addressbookid = ? AND uri = ? LIMIT 1');
+ $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ? LIMIT 1');
$stmt->execute(array($addressBookId, $cardUri));
$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
@@ -216,59 +235,93 @@ class Sabre_CardDAV_Backend_PDO extends Sabre_CardDAV_Backend_Abstract {
}
/**
- * Creates a new card
- *
- * @param mixed $addressBookId
- * @param string $cardUri
- * @param string $cardData
- * @return bool
+ * Creates a new card.
+ *
+ * The addressbook id will be passed as the first argument. This is the
+ * same id as it is returned from the getAddressbooksForUser method.
+ *
+ * The cardUri is a base uri, and doesn't include the full path. The
+ * cardData argument is the vcard body, and is passed as a string.
+ *
+ * It is possible to return an ETag from this method. This ETag is for the
+ * newly created resource, and must be enclosed with double quotes (that
+ * is, the string itself must contain the double quotes).
+ *
+ * You should only return the ETag if you store the carddata as-is. If a
+ * subsequent GET request on the same card does not have the same body,
+ * byte-by-byte and you did return an ETag here, clients tend to get
+ * confused.
+ *
+ * If you don't return an ETag, you can just return null.
+ *
+ * @param mixed $addressBookId
+ * @param string $cardUri
+ * @param string $cardData
+ * @return string|null
*/
public function createCard($addressBookId, $cardUri, $cardData) {
- $stmt = $this->pdo->prepare('INSERT INTO `' . $this->cardsTableName . '` (carddata, uri, lastmodified, addressbookid) VALUES (?, ?, ?, ?)');
+ $stmt = $this->pdo->prepare('INSERT INTO ' . $this->cardsTableName . ' (carddata, uri, lastmodified, addressbookid) VALUES (?, ?, ?, ?)');
$result = $stmt->execute(array($cardData, $cardUri, time(), $addressBookId));
- $stmt2 = $this->pdo->prepare('UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 WHERE id = ?');
+ $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
$stmt2->execute(array($addressBookId));
- return $result;
+ return '"' . md5($cardData) . '"';
}
/**
- * Updates a card
- *
- * @param mixed $addressBookId
- * @param string $cardUri
- * @param string $cardData
- * @return bool
+ * Updates a card.
+ *
+ * The addressbook id will be passed as the first argument. This is the
+ * same id as it is returned from the getAddressbooksForUser method.
+ *
+ * The cardUri is a base uri, and doesn't include the full path. The
+ * cardData argument is the vcard body, and is passed as a string.
+ *
+ * It is possible to return an ETag from this method. This ETag should
+ * match that of the updated resource, and must be enclosed with double
+ * quotes (that is: the string itself must contain the actual quotes).
+ *
+ * You should only return the ETag if you store the carddata as-is. If a
+ * subsequent GET request on the same card does not have the same body,
+ * byte-by-byte and you did return an ETag here, clients tend to get
+ * confused.
+ *
+ * If you don't return an ETag, you can just return null.
+ *
+ * @param mixed $addressBookId
+ * @param string $cardUri
+ * @param string $cardData
+ * @return string|null
*/
public function updateCard($addressBookId, $cardUri, $cardData) {
- $stmt = $this->pdo->prepare('UPDATE `' . $this->cardsTableName . '` SET carddata = ?, lastmodified = ? WHERE uri = ? AND addressbookid =?');
- $result = $stmt->execute(array($cardData, time(), $cardUri, $addressBookId));
+ $stmt = $this->pdo->prepare('UPDATE ' . $this->cardsTableName . ' SET carddata = ?, lastmodified = ? WHERE uri = ? AND addressbookid =?');
+ $stmt->execute(array($cardData, time(), $cardUri, $addressBookId));
- $stmt2 = $this->pdo->prepare('UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 WHERE id = ?');
+ $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
$stmt2->execute(array($addressBookId));
- return $stmt->rowCount()===1;
+ return '"' . md5($cardData) . '"';
}
/**
* Deletes a card
- *
- * @param mixed $addressBookId
- * @param string $cardUri
- * @return bool
+ *
+ * @param mixed $addressBookId
+ * @param string $cardUri
+ * @return bool
*/
public function deleteCard($addressBookId, $cardUri) {
- $stmt = $this->pdo->prepare('DELETE FROM `' . $this->cardsTableName . '` WHERE addressbookid = ? AND uri = ?');
+ $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ?');
$stmt->execute(array($addressBookId, $cardUri));
- $stmt2 = $this->pdo->prepare('UPDATE `' . $this->addressBooksTableName . '` SET ctag = ctag + 1 WHERE id = ?');
+ $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
$stmt2->execute(array($addressBookId));
return $stmt->rowCount()===1;
diff --git a/3rdparty/Sabre/CardDAV/Card.php b/3rdparty/Sabre/CardDAV/Card.php
index 2844eaf7ed..d7c6633383 100644
--- a/3rdparty/Sabre/CardDAV/Card.php
+++ b/3rdparty/Sabre/CardDAV/Card.php
@@ -2,10 +2,10 @@
/**
* The Card object represents a single Card from an addressbook
- *
+ *
* @package Sabre
* @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -13,29 +13,29 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
/**
* CardDAV backend
- *
- * @var Sabre_CardDAV_Backend_Abstract
+ *
+ * @var Sabre_CardDAV_Backend_Abstract
*/
private $carddavBackend;
/**
* Array with information about this Card
- *
- * @var array
+ *
+ * @var array
*/
private $cardData;
/**
- * Array with information about the containing addressbook
- *
- * @var array
+ * Array with information about the containing addressbook
+ *
+ * @var array
*/
private $addressBookInfo;
/**
- * Constructor
- *
- * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+ * Constructor
+ *
+ * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
* @param array $addressBookInfo
* @param array $cardData
*/
@@ -48,9 +48,9 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
}
/**
- * Returns the uri for this object
- *
- * @return string
+ * Returns the uri for this object
+ *
+ * @return string
*/
public function getName() {
@@ -59,25 +59,26 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
}
/**
- * Returns the VCard-formatted object
- *
- * @return string
+ * Returns the VCard-formatted object
+ *
+ * @return string
*/
public function get() {
- $cardData = $this->cardData['carddata'];
- $s = fopen('php://temp','r+');
- fwrite($s, $cardData);
- rewind($s);
- return $s;
+ // Pre-populating 'carddata' is optional. If we don't yet have it
+ // already, we fetch it from the backend.
+ if (!isset($this->cardData['carddata'])) {
+ $this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
+ }
+ return $this->cardData['carddata'];
}
/**
- * Updates the VCard-formatted object
- *
- * @param string $cardData
- * @return void
+ * Updates the VCard-formatted object
+ *
+ * @param string $cardData
+ * @return void
*/
public function put($cardData) {
@@ -87,14 +88,17 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
// Converting to UTF-8, if needed
$cardData = Sabre_DAV_StringUtil::ensureUTF8($cardData);
- $this->carddavBackend->updateCard($this->addressBookInfo['id'],$this->cardData['uri'],$cardData);
+ $etag = $this->carddavBackend->updateCard($this->addressBookInfo['id'],$this->cardData['uri'],$cardData);
$this->cardData['carddata'] = $cardData;
+ $this->cardData['etag'] = $etag;
+
+ return $etag;
}
/**
* Deletes the card
- *
+ *
* @return void
*/
public function delete() {
@@ -104,9 +108,9 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
}
/**
- * Returns the mime content-type
- *
- * @return string
+ * Returns the mime content-type
+ *
+ * @return string
*/
public function getContentType() {
@@ -115,20 +119,24 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
}
/**
- * Returns an ETag for this object
- *
- * @return string
+ * Returns an ETag for this object
+ *
+ * @return string
*/
public function getETag() {
- return '"' . md5($this->cardData['carddata']) . '"';
+ if (isset($this->cardData['etag'])) {
+ return $this->cardData['etag'];
+ } else {
+ return '"' . md5($this->get()) . '"';
+ }
}
/**
* Returns the last modification date as a unix timestamp
- *
- * @return time
+ *
+ * @return time
*/
public function getLastModified() {
@@ -137,21 +145,25 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
}
/**
- * Returns the size of this object in bytes
- *
+ * Returns the size of this object in bytes
+ *
* @return int
*/
public function getSize() {
- return strlen($this->cardData['carddata']);
+ if (array_key_exists('size', $this->cardData)) {
+ return $this->cardData['size'];
+ } else {
+ return strlen($this->get());
+ }
}
/**
* Returns the owner principal
*
- * This must be a url to a principal, or null if there's no owner
- *
+ * This must be a url to a principal, or null if there's no owner
+ *
* @return string|null
*/
public function getOwner() {
@@ -164,8 +176,8 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
* Returns a group principal
*
* This must be a url to a principal, or null if there's no owner
- *
- * @return string|null
+ *
+ * @return string|null
*/
public function getGroup() {
@@ -177,13 +189,13 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
* Returns a list of ACE's for this node.
*
* Each ACE has the following properties:
- * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+ * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
* currently the only supported privileges
* * 'principal', a url to the principal who owns the node
- * * 'protected' (optional), indicating that this ACE is not allowed to
- * be updated.
- *
- * @return array
+ * * 'protected' (optional), indicating that this ACE is not allowed to
+ * be updated.
+ *
+ * @return array
*/
public function getACL() {
@@ -205,9 +217,9 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
/**
* Updates the ACL
*
- * This method will receive a list of new ACE's.
- *
- * @param array $acl
+ * This method will receive a list of new ACE's.
+ *
+ * @param array $acl
* @return void
*/
public function setACL(array $acl) {
@@ -216,5 +228,23 @@ class Sabre_CardDAV_Card extends Sabre_DAV_File implements Sabre_CardDAV_ICard,
}
+ /**
+ * Returns the list of supported privileges for this node.
+ *
+ * The returned data structure is a list of nested privileges.
+ * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+ * standard structure.
+ *
+ * If null is returned from this method, the default privilege set is used,
+ * which is fine for most common usecases.
+ *
+ * @return array|null
+ */
+ public function getSupportedPrivilegeSet() {
+
+ return null;
+
+ }
+
}
diff --git a/3rdparty/Sabre/CardDAV/IAddressBook.php b/3rdparty/Sabre/CardDAV/IAddressBook.php
index a0dffb30ae..2bc275bcf7 100644
--- a/3rdparty/Sabre/CardDAV/IAddressBook.php
+++ b/3rdparty/Sabre/CardDAV/IAddressBook.php
@@ -4,15 +4,15 @@
* AddressBook interface
*
* Implement this interface to allow a node to be recognized as an addressbook.
- *
+ *
* @package Sabre
* @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
interface Sabre_CardDAV_IAddressBook extends Sabre_DAV_ICollection {
-
+
}
diff --git a/3rdparty/Sabre/CardDAV/ICard.php b/3rdparty/Sabre/CardDAV/ICard.php
index 25bcc551b7..a17299316c 100644
--- a/3rdparty/Sabre/CardDAV/ICard.php
+++ b/3rdparty/Sabre/CardDAV/ICard.php
@@ -1,18 +1,18 @@
subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
+ $server->subscribeEvent('updateProperties', array($this, 'updateProperties'));
$server->subscribeEvent('report', array($this,'report'));
+ $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
+ $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
/* Namespaces */
$server->xmlNamespaces[self::NS_CARDDAV] = 'card';
@@ -56,11 +59,14 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
/* Mapping Interfaces to {DAV:}resourcetype values */
$server->resourceTypeMapping['Sabre_CardDAV_IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
$server->resourceTypeMapping['Sabre_CardDAV_IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
-
+
/* Adding properties that may never be changed */
$server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-address-data';
$server->protectedProperties[] = '{' . self::NS_CARDDAV . '}max-resource-size';
+ $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}addressbook-home-set';
+ $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-collation-set';
+ $server->propertyMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre_DAV_Property_Href';
$this->server = $server;
@@ -69,7 +75,7 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
/**
* Returns a list of supported features.
*
- * This is used in the DAV: header in the OPTIONS and PROPFIND requests.
+ * This is used in the DAV: header in the OPTIONS and PROPFIND requests.
*
* @return array
*/
@@ -83,11 +89,11 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
* Returns a list of reports this plugin supports.
*
* This will be used in the {DAV:}supported-report-set property.
- * Note that you still need to subscribe to the 'report' event to actually
- * implement them
+ * Note that you still need to subscribe to the 'report' event to actually
+ * implement them
*
* @param string $uri
- * @return array
+ * @return array
*/
public function getSupportedReportSet($uri) {
@@ -104,22 +110,22 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
/**
- * Adds all CardDAV-specific properties
+ * Adds all CardDAV-specific properties
*
* @param string $path
- * @param Sabre_DAV_INode $node
+ * @param Sabre_DAV_INode $node
* @param array $requestedProperties
- * @param array $returnedProperties
+ * @param array $returnedProperties
* @return void
*/
- public function beforeGetProperties($path, Sabre_DAV_INode $node, array &$requestedProperties, array &$returnedProperties) {
+ public function beforeGetProperties($path, Sabre_DAV_INode $node, array &$requestedProperties, array &$returnedProperties) {
if ($node instanceof Sabre_DAVACL_IPrincipal) {
// calendar-home-set property
$addHome = '{' . self::NS_CARDDAV . '}addressbook-home-set';
if (in_array($addHome,$requestedProperties)) {
- $principalId = $node->getName();
+ $principalId = $node->getName();
$addressbookHomePath = self::ADDRESSBOOK_ROOT . '/' . $principalId . '/';
unset($requestedProperties[array_search($addHome, $requestedProperties)]);
$returnedProperties[200][$addHome] = new Sabre_DAV_Property_Href($addressbookHomePath);
@@ -135,8 +141,8 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
if ($node instanceof Sabre_CardDAV_ICard) {
- // The address-data property is not supposed to be a 'real'
- // property, but in large chunks of the spec it does act as such.
+ // The address-data property is not supposed to be a 'real'
+ // property, but in large chunks of the spec it does act as such.
// Therefore we simply expose it as a property.
$addressDataProp = '{' . self::NS_CARDDAV . '}address-data';
if (in_array($addressDataProp, $requestedProperties)) {
@@ -151,24 +157,95 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
}
}
+ if ($node instanceof Sabre_CardDAV_UserAddressBooks) {
+
+ $meCardProp = '{http://calendarserver.org/ns/}me-card';
+ if (in_array($meCardProp, $requestedProperties)) {
+
+ $props = $this->server->getProperties($node->getOwner(), array('{http://sabredav.org/ns}vcard-url'));
+ if (isset($props['{http://sabredav.org/ns}vcard-url'])) {
+
+ $returnedProperties[200][$meCardProp] = new Sabre_DAV_Property_Href(
+ $props['{http://sabredav.org/ns}vcard-url']
+ );
+ $pos = array_search($meCardProp, $requestedProperties);
+ unset($requestedProperties[$pos]);
+
+ }
+
+ }
+
+ }
+
}
/**
- * This functions handles REPORT requests specific to CardDAV
+ * This event is triggered when a PROPPATCH method is executed
*
- * @param string $reportName
+ * @param array $mutations
+ * @param array $result
+ * @param Sabre_DAV_INode $node
+ * @return void
+ */
+ public function updateProperties(&$mutations, &$result, $node) {
+
+ if (!$node instanceof Sabre_CardDAV_UserAddressBooks) {
+ return true;
+ }
+
+ $meCard = '{http://calendarserver.org/ns/}me-card';
+
+ // The only property we care about
+ if (!isset($mutations[$meCard]))
+ return true;
+
+ $value = $mutations[$meCard];
+ unset($mutations[$meCard]);
+
+ if ($value instanceof Sabre_DAV_Property_IHref) {
+ $value = $value->getHref();
+ $value = $this->server->calculateUri($value);
+ } elseif (!is_null($value)) {
+ $result[400][$meCard] = null;
+ return false;
+ }
+
+ $innerResult = $this->server->updateProperties(
+ $node->getOwner(),
+ array(
+ '{http://sabredav.org/ns}vcard-url' => $value,
+ )
+ );
+
+ $closureResult = false;
+ foreach($innerResult as $status => $props) {
+ if (is_array($props) && array_key_exists('{http://sabredav.org/ns}vcard-url', $props)) {
+ $result[$status][$meCard] = null;
+ $closureResult = ($status>=200 && $status<300);
+ }
+
+ }
+
+ return $result;
+
+ }
+
+ /**
+ * This functions handles REPORT requests specific to CardDAV
+ *
+ * @param string $reportName
* @param DOMNode $dom
- * @return bool
+ * @return bool
*/
public function report($reportName,$dom) {
- switch($reportName) {
+ switch($reportName) {
case '{'.self::NS_CARDDAV.'}addressbook-multiget' :
$this->addressbookMultiGetReport($dom);
return false;
case '{'.self::NS_CARDDAV.'}addressbook-query' :
$this->addressBookQueryReport($dom);
- return false;
+ return false;
default :
return;
@@ -256,7 +333,8 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
$result = array();
foreach($validNodes as $validNode) {
- if ($depth==0) {
+
+ if ($depth==0) {
$href = $this->server->getRequestUri();
} else {
$href = $this->server->getRequestUri() . '/' . $validNode->getName();
@@ -265,7 +343,7 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
list($result[]) = $this->server->getPropertiesForPath($href, $query->requestedProperties, 0);
}
-
+
$this->server->httpResponse->sendStatus(207);
$this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
$this->server->httpResponse->sendBody($this->server->generateMultiStatus($result));
@@ -274,17 +352,15 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
/**
* Validates if a vcard makes it throught a list of filters.
- *
- * @param string $vcardData
- * @param array $filters
- * @param string $test anyof or allof (which means OR or AND)
- * @return bool
+ *
+ * @param string $vcardData
+ * @param array $filters
+ * @param string $test anyof or allof (which means OR or AND)
+ * @return bool
*/
public function validateFilters($vcardData, array $filters, $test) {
$vcard = Sabre_VObject_Reader::read($vcardData);
-
- $success = true;
foreach($filters as $filter) {
@@ -299,10 +375,10 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
// We only need to check for existence
$success = $isDefined;
-
+
} else {
- $vProperties = $vcard->select($filter['name']);
+ $vProperties = $vcard->select($filter['name']);
$results = array();
if ($filter['param-filters']) {
@@ -328,7 +404,7 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
} // else
- // There are two conditions where we can already determine wether
+ // There are two conditions where we can already determine whether
// or not this filter succeeds.
if ($test==='anyof' && $success) {
return true;
@@ -339,29 +415,28 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
} // foreach
- // If we got all the way here, it means we haven't been able to
+ // If we got all the way here, it means we haven't been able to
// determine early if the test failed or not.
//
- // This implies for 'anyof' that the test failed, and for 'allof' that
+ // This implies for 'anyof' that the test failed, and for 'allof' that
// we succeeded. Sounds weird, but makes sense.
return $test==='allof';
}
/**
- * Validates if a param-filter can be applied to a specific property.
- *
- * @todo currently we're only validating the first parameter of the passed
+ * Validates if a param-filter can be applied to a specific property.
+ *
+ * @todo currently we're only validating the first parameter of the passed
* property. Any subsequence parameters with the same name are
* ignored.
- * @param Sabre_VObject_Property $vProperty
- * @param array $filters
- * @param string $test
- * @return bool
+ * @param array $vProperties
+ * @param array $filters
+ * @param string $test
+ * @return bool
*/
protected function validateParamFilters(array $vProperties, array $filters, $test) {
- $success = false;
foreach($filters as $filter) {
$isDefined = false;
@@ -377,17 +452,16 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
$success = true;
}
- // If there's no text-match, we can just check for existence
+ // If there's no text-match, we can just check for existence
} elseif (!$filter['text-match'] || !$isDefined) {
$success = $isDefined;
-
+
} else {
- $texts = array();
$success = false;
foreach($vProperties as $vProperty) {
- // If we got all the way here, we'll need to validate the
+ // If we got all the way here, we'll need to validate the
// text-match filter.
$success = Sabre_DAV_StringUtil::textMatch($vProperty[$filter['name']]->value, $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
if ($success) break;
@@ -398,7 +472,7 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
} // else
- // There are two conditions where we can already determine wether
+ // There are two conditions where we can already determine whether
// or not this filter succeeds.
if ($test==='anyof' && $success) {
return true;
@@ -407,24 +481,24 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
return false;
}
- }
+ }
- // If we got all the way here, it means we haven't been able to
+ // If we got all the way here, it means we haven't been able to
// determine early if the test failed or not.
//
- // This implies for 'anyof' that the test failed, and for 'allof' that
+ // This implies for 'anyof' that the test failed, and for 'allof' that
// we succeeded. Sounds weird, but makes sense.
return $test==='allof';
}
/**
- * Validates if a text-filter can be applied to a specific property.
- *
+ * Validates if a text-filter can be applied to a specific property.
+ *
* @param array $texts
- * @param array $filters
- * @param string $test
- * @return bool
+ * @param array $filters
+ * @param string $test
+ * @return bool
*/
protected function validateTextMatches(array $texts, array $filters, $test) {
@@ -440,7 +514,7 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
if ($filter['negate-condition']) {
$success = !$success;
}
-
+
if ($success && $test==='anyof')
return true;
@@ -450,14 +524,64 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
}
- // If we got all the way here, it means we haven't been able to
+ // If we got all the way here, it means we haven't been able to
// determine early if the test failed or not.
//
- // This implies for 'anyof' that the test failed, and for 'allof' that
+ // This implies for 'anyof' that the test failed, and for 'allof' that
// we succeeded. Sounds weird, but makes sense.
return $test==='allof';
}
+ /**
+ * This method is used to generate HTML output for the
+ * Sabre_DAV_Browser_Plugin. This allows us to generate an interface users
+ * can use to create new calendars.
+ *
+ * @param Sabre_DAV_INode $node
+ * @param string $output
+ * @return bool
+ */
+ public function htmlActionsPanel(Sabre_DAV_INode $node, &$output) {
+
+ if (!$node instanceof Sabre_CardDAV_UserAddressBooks)
+ return;
+
+ $output.= '
+
';
+
+ return false;
+
+ }
+
+ /**
+ * This method allows us to intercept the 'mkcalendar' sabreAction. This
+ * action enables the user to create new calendars from the browser plugin.
+ *
+ * @param string $uri
+ * @param string $action
+ * @param array $postVars
+ * @return bool
+ */
+ public function browserPostAction($uri, $action, array $postVars) {
+
+ if ($action!=='mkaddressbook')
+ return;
+
+ $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:carddav}addressbook');
+ $properties = array();
+ if (isset($postVars['{DAV:}displayname'])) {
+ $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
+ }
+ $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
+ return false;
+
+ }
}
diff --git a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
index d57d3a6e7b..36d9306e7a 100644
--- a/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
+++ b/3rdparty/Sabre/CardDAV/Property/SupportedAddressData.php
@@ -4,11 +4,11 @@
* Supported-address-data property
*
* This property is a representation of the supported-address-data property
- * in the CardDAV namespace.
+ * in the CardDAV namespace.
*
* @package Sabre
* @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -16,15 +16,15 @@ class Sabre_CardDAV_Property_SupportedAddressData extends Sabre_DAV_Property {
/**
* supported versions
- *
- * @var array
+ *
+ * @var array
*/
protected $supportedData = array();
-
+
/**
- * Creates the property
- *
- * @param array $components
+ * Creates the property
+ *
+ * @param array|null $supportedData
*/
public function __construct(array $supportedData = null) {
@@ -35,22 +35,22 @@ class Sabre_CardDAV_Property_SupportedAddressData extends Sabre_DAV_Property {
);
}
- $this->supportedData = $supportedData;
+ $this->supportedData = $supportedData;
}
-
+
/**
- * Serializes the property in a DOMDocument
- *
- * @param Sabre_DAV_Server $server
- * @param DOMElement $node
+ * Serializes the property in a DOMDocument
+ *
+ * @param Sabre_DAV_Server $server
+ * @param DOMElement $node
* @return void
*/
public function serialize(Sabre_DAV_Server $server,DOMElement $node) {
$doc = $node->ownerDocument;
- $prefix =
+ $prefix =
isset($server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV]) ?
$server->xmlNamespaces[Sabre_CardDAV_Plugin::NS_CARDDAV] :
'card';
diff --git a/3rdparty/Sabre/CardDAV/UserAddressBooks.php b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
index e9f2de7f74..3f11fb1123 100644
--- a/3rdparty/Sabre/CardDAV/UserAddressBooks.php
+++ b/3rdparty/Sabre/CardDAV/UserAddressBooks.php
@@ -7,7 +7,7 @@
*
* @package Sabre
* @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -15,47 +15,47 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
/**
* Principal uri
- *
- * @var array
+ *
+ * @var array
*/
protected $principalUri;
/**
- * carddavBackend
- *
- * @var Sabre_CardDAV_Backend_Abstract
+ * carddavBackend
+ *
+ * @var Sabre_CardDAV_Backend_Abstract
*/
protected $carddavBackend;
/**
- * Constructor
- *
- * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
- * @param string $principalUri
+ * Constructor
+ *
+ * @param Sabre_CardDAV_Backend_Abstract $carddavBackend
+ * @param string $principalUri
*/
public function __construct(Sabre_CardDAV_Backend_Abstract $carddavBackend, $principalUri) {
$this->carddavBackend = $carddavBackend;
$this->principalUri = $principalUri;
-
+
}
/**
- * Returns the name of this object
- *
+ * Returns the name of this object
+ *
* @return string
*/
public function getName() {
-
+
list(,$name) = Sabre_DAV_URLUtil::splitPath($this->principalUri);
- return $name;
+ return $name;
}
/**
- * Updates the name of this object
- *
- * @param string $name
+ * Updates the name of this object
+ *
+ * @param string $name
* @return void
*/
public function setName($name) {
@@ -65,8 +65,8 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
}
/**
- * Deletes this object
- *
+ * Deletes this object
+ *
* @return void
*/
public function delete() {
@@ -76,13 +76,13 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
}
/**
- * Returns the last modification date
- *
- * @return int
+ * Returns the last modification date
+ *
+ * @return int
*/
public function getLastModified() {
- return null;
+ return null;
}
@@ -90,9 +90,9 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
* Creates a new file under this object.
*
* This is currently not allowed
- *
- * @param string $filename
- * @param resource $data
+ *
+ * @param string $filename
+ * @param resource $data
* @return void
*/
public function createFile($filename, $data=null) {
@@ -105,8 +105,8 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
* Creates a new directory under this object.
*
* This is currently not allowed.
- *
- * @param string $filename
+ *
+ * @param string $filename
* @return void
*/
public function createDirectory($filename) {
@@ -116,8 +116,8 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
}
/**
- * Returns a single calendar, by name
- *
+ * Returns a single calendar, by name
+ *
* @param string $name
* @todo needs optimizing
* @return Sabre_CardDAV_AddressBook
@@ -129,14 +129,14 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
return $child;
}
- throw new Sabre_DAV_Exception_FileNotFound('Addressbook with name \'' . $name . '\' could not be found');
+ throw new Sabre_DAV_Exception_NotFound('Addressbook with name \'' . $name . '\' could not be found');
}
/**
- * Returns a list of addressbooks
- *
- * @return array
+ * Returns a list of addressbooks
+ *
+ * @return array
*/
public function getChildren() {
@@ -150,11 +150,11 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
}
/**
- * Creates a new addressbook
- *
+ * Creates a new addressbook
+ *
* @param string $name
- * @param array $resourceType
- * @param array $properties
+ * @param array $resourceType
+ * @param array $properties
* @return void
*/
public function createExtendedCollection($name, array $resourceType, array $properties) {
@@ -169,8 +169,8 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
/**
* Returns the owner principal
*
- * This must be a url to a principal, or null if there's no owner
- *
+ * This must be a url to a principal, or null if there's no owner
+ *
* @return string|null
*/
public function getOwner() {
@@ -183,8 +183,8 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
* Returns a group principal
*
* This must be a url to a principal, or null if there's no owner
- *
- * @return string|null
+ *
+ * @return string|null
*/
public function getGroup() {
@@ -196,13 +196,13 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
* Returns a list of ACE's for this node.
*
* Each ACE has the following properties:
- * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+ * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
* currently the only supported privileges
* * 'principal', a url to the principal who owns the node
- * * 'protected' (optional), indicating that this ACE is not allowed to
- * be updated.
- *
- * @return array
+ * * 'protected' (optional), indicating that this ACE is not allowed to
+ * be updated.
+ *
+ * @return array
*/
public function getACL() {
@@ -225,9 +225,9 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
/**
* Updates the ACL
*
- * This method will receive a list of new ACE's.
- *
- * @param array $acl
+ * This method will receive a list of new ACE's.
+ *
+ * @param array $acl
* @return void
*/
public function setACL(array $acl) {
@@ -236,5 +236,22 @@ class Sabre_CardDAV_UserAddressBooks extends Sabre_DAV_Collection implements Sab
}
+ /**
+ * Returns the list of supported privileges for this node.
+ *
+ * The returned data structure is a list of nested privileges.
+ * See Sabre_DAVACL_Plugin::getDefaultSupportedPrivilegeSet for a simple
+ * standard structure.
+ *
+ * If null is returned from this method, the default privilege set is used,
+ * which is fine for most common usecases.
+ *
+ * @return array|null
+ */
+ public function getSupportedPrivilegeSet() {
+
+ return null;
+
+ }
}
diff --git a/3rdparty/Sabre/CardDAV/Version.php b/3rdparty/Sabre/CardDAV/Version.php
index 900fbf5e75..811b929e39 100644
--- a/3rdparty/Sabre/CardDAV/Version.php
+++ b/3rdparty/Sabre/CardDAV/Version.php
@@ -4,10 +4,10 @@
* Version Class
*
* This class contains the Sabre_CardDAV version information
- *
+ *
* @package Sabre
* @subpackage CardDAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -16,7 +16,7 @@ class Sabre_CardDAV_Version {
/**
* Full version number
*/
- const VERSION = '1.5.3';
+ const VERSION = '1.6.1';
/**
* Stability : alpha, beta, stable
diff --git a/3rdparty/Sabre/CardDAV/includes.php b/3rdparty/Sabre/CardDAV/includes.php
new file mode 100644
index 0000000000..c3b8c04b07
--- /dev/null
+++ b/3rdparty/Sabre/CardDAV/includes.php
@@ -0,0 +1,32 @@
+setHTTPRequest($server->httpRequest);
@@ -75,5 +79,5 @@ abstract class Sabre_DAV_Auth_Backend_AbstractBasic implements Sabre_DAV_Auth_IB
}
-}
+}
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
index 5bdc72753e..9833928b97 100644
--- a/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
+++ b/3rdparty/Sabre/DAV/Auth/Backend/AbstractDigest.php
@@ -4,12 +4,12 @@
* HTTP Digest authentication backend class
*
* This class can be used by authentication objects wishing to use HTTP Digest
- * Most of the digest logic is handled, implementors just need to worry about
- * the getDigestHash method
+ * Most of the digest logic is handled, implementors just need to worry about
+ * the getDigestHash method
*
* @package Sabre
* @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -17,7 +17,7 @@ abstract class Sabre_DAV_Auth_Backend_AbstractDigest implements Sabre_DAV_Auth_I
/**
* This variable holds the currently logged in username.
- *
+ *
* @var array|null
*/
protected $currentUser;
@@ -25,24 +25,26 @@ abstract class Sabre_DAV_Auth_Backend_AbstractDigest implements Sabre_DAV_Auth_I
/**
* Returns a users digest hash based on the username and realm.
*
- * If the user was not known, null must be returned.
- *
+ * If the user was not known, null must be returned.
+ *
* @param string $realm
- * @param string $username
- * @return string|null
+ * @param string $username
+ * @return string|null
*/
- abstract public function getDigestHash($realm,$username);
+ abstract public function getDigestHash($realm, $username);
/**
* Authenticates the user based on the current request.
*
- * If authentication is succesful, true must be returned.
+ * If authentication is successful, true must be returned.
* If authentication fails, an exception must be thrown.
*
+ * @param Sabre_DAV_Server $server
+ * @param string $realm
* @throws Sabre_DAV_Exception_NotAuthenticated
- * @return bool
+ * @return bool
*/
- public function authenticate(Sabre_DAV_Server $server,$realm) {
+ public function authenticate(Sabre_DAV_Server $server, $realm) {
$digest = new Sabre_HTTP_DigestAuth();
@@ -83,9 +85,9 @@ abstract class Sabre_DAV_Auth_Backend_AbstractDigest implements Sabre_DAV_Auth_I
}
/**
- * Returns the currently logged in username.
- *
- * @return string|null
+ * Returns the currently logged in username.
+ *
+ * @return string|null
*/
public function getCurrentUser() {
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
index 6bcd76bdcb..d4294ea4d8 100644
--- a/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
+++ b/3rdparty/Sabre/DAV/Auth/Backend/Apache.php
@@ -4,34 +4,36 @@
* Apache authenticator
*
* This authentication backend assumes that authentication has been
- * conifgured in apache, rather than within SabreDAV.
+ * configured in apache, rather than within SabreDAV.
*
* Make sure apache is properly configured for this to work.
*
* @package Sabre
* @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_DAV_Auth_Backend_Apache implements Sabre_DAV_Auth_IBackend {
/**
- * Current apache user
- *
- * @var string
+ * Current apache user
+ *
+ * @var string
*/
protected $remoteUser;
-
+
/**
* Authenticates the user based on the current request.
*
- * If authentication is succesful, true must be returned.
+ * If authentication is successful, true must be returned.
* If authentication fails, an exception must be thrown.
*
- * @return bool
+ * @param Sabre_DAV_Server $server
+ * @param string $realm
+ * @return bool
*/
- public function authenticate(Sabre_DAV_Server $server,$realm) {
+ public function authenticate(Sabre_DAV_Server $server, $realm) {
$remoteUser = $server->httpRequest->getRawServerValue('REMOTE_USER');
if (is_null($remoteUser)) {
@@ -47,7 +49,7 @@ class Sabre_DAV_Auth_Backend_Apache implements Sabre_DAV_Auth_IBackend {
* Returns information about the currently logged in user.
*
* If nobody is currently logged in, this method should return null.
- *
+ *
* @return array|null
*/
public function getCurrentUser() {
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/File.php b/3rdparty/Sabre/DAV/Auth/Backend/File.php
index db1f04c477..de308d64a6 100644
--- a/3rdparty/Sabre/DAV/Auth/Backend/File.php
+++ b/3rdparty/Sabre/DAV/Auth/Backend/File.php
@@ -4,29 +4,28 @@
* This is an authentication backend that uses a file to manage passwords.
*
* The backend file must conform to Apache's htdigest format
- *
+ *
* @package Sabre
* @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest {
/**
- * List of users
- *
+ * List of users
+ *
* @var array
*/
protected $users = array();
/**
- * Creates the backend object.
+ * Creates the backend object.
*
* If the filename argument is passed in, it will parse out the specified file fist.
- *
- * @param string $filename
- * @return void
+ *
+ * @param string|null $filename
*/
public function __construct($filename=null) {
@@ -38,22 +37,22 @@ class Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest
/**
* Loads an htdigest-formatted file. This method can be called multiple times if
* more than 1 file is used.
- *
- * @param string $filename
+ *
+ * @param string $filename
* @return void
*/
public function loadFile($filename) {
foreach(file($filename,FILE_IGNORE_NEW_LINES) as $line) {
- if (substr_count($line, ":") !== 2)
+ if (substr_count($line, ":") !== 2)
throw new Sabre_DAV_Exception('Malformed htdigest file. Every line should contain 2 colons');
-
+
list($username,$realm,$A1) = explode(':',$line);
if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1))
throw new Sabre_DAV_Exception('Malformed htdigest file. Invalid md5 hash');
-
+
$this->users[$realm . ':' . $username] = $A1;
}
@@ -62,10 +61,10 @@ class Sabre_DAV_Auth_Backend_File extends Sabre_DAV_Auth_Backend_AbstractDigest
/**
* Returns a users' information
- *
- * @param string $realm
- * @param string $username
- * @return string
+ *
+ * @param string $realm
+ * @param string $username
+ * @return string
*/
public function getDigestHash($realm, $username) {
diff --git a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
index 0301503601..eac18a23fb 100644
--- a/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
+++ b/3rdparty/Sabre/DAV/Auth/Backend/PDO.php
@@ -4,38 +4,37 @@
* This is an authentication backend that uses a file to manage passwords.
*
* The backend file must conform to Apache's htdigest format
- *
+ *
* @package Sabre
* @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_DAV_Auth_Backend_PDO extends Sabre_DAV_Auth_Backend_AbstractDigest {
/**
- * Reference to PDO connection
- *
- * @var PDO
+ * Reference to PDO connection
+ *
+ * @var PDO
*/
protected $pdo;
/**
- * PDO table name we'll be using
- *
+ * PDO table name we'll be using
+ *
* @var string
*/
protected $tableName;
/**
- * Creates the backend object.
+ * Creates the backend object.
*
* If the filename argument is passed in, it will parse out the specified file fist.
- *
- * @param string $filename
- * @param string $tableName The PDO table name to use
- * @return void
+ *
+ * @param PDO $pdo
+ * @param string $tableName The PDO table name to use
*/
public function __construct(PDO $pdo, $tableName = 'users') {
@@ -45,15 +44,15 @@ class Sabre_DAV_Auth_Backend_PDO extends Sabre_DAV_Auth_Backend_AbstractDigest {
}
/**
- * Returns the digest hash for a user.
- *
- * @param string $realm
- * @param string $username
- * @return string|null
+ * Returns the digest hash for a user.
+ *
+ * @param string $realm
+ * @param string $username
+ * @return string|null
*/
public function getDigestHash($realm,$username) {
- $stmt = $this->pdo->prepare('SELECT username, digesta1 FROM `'.$this->tableName.'` WHERE username = ?');
+ $stmt = $this->pdo->prepare('SELECT username, digesta1 FROM '.$this->tableName.' WHERE username = ?');
$stmt->execute(array($username));
$result = $stmt->fetchAll();
diff --git a/3rdparty/Sabre/DAV/Auth/IBackend.php b/3rdparty/Sabre/DAV/Auth/IBackend.php
index 1f67af4c2d..5be5d1bc93 100644
--- a/3rdparty/Sabre/DAV/Auth/IBackend.php
+++ b/3rdparty/Sabre/DAV/Auth/IBackend.php
@@ -5,7 +5,7 @@
*
* @package Sabre
* @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -14,18 +14,20 @@ interface Sabre_DAV_Auth_IBackend {
/**
* Authenticates the user based on the current request.
*
- * If authentication is succesful, true must be returned.
+ * If authentication is successful, true must be returned.
* If authentication fails, an exception must be thrown.
*
- * @return bool
+ * @param Sabre_DAV_Server $server
+ * @param string $realm
+ * @return bool
*/
- function authenticate(Sabre_DAV_Server $server,$realm);
+ function authenticate(Sabre_DAV_Server $server,$realm);
/**
* Returns information about the currently logged in username.
*
* If nobody is currently logged in, this method should return null.
- *
+ *
* @return string|null
*/
function getCurrentUser();
diff --git a/3rdparty/Sabre/DAV/Auth/Plugin.php b/3rdparty/Sabre/DAV/Auth/Plugin.php
index f3718fcf46..55a4e39167 100644
--- a/3rdparty/Sabre/DAV/Auth/Plugin.php
+++ b/3rdparty/Sabre/DAV/Auth/Plugin.php
@@ -2,48 +2,47 @@
/**
* This plugin provides Authentication for a WebDAV server.
- *
+ *
* It relies on a Backend object, which provides user information.
*
* Additionally, it provides support for:
* * {DAV:}current-user-principal property from RFC5397
* * {DAV:}principal-collection-set property from RFC3744
- *
+ *
* @package Sabre
* @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
/**
- * Reference to main server object
- *
- * @var Sabre_DAV_Server
+ * Reference to main server object
+ *
+ * @var Sabre_DAV_Server
*/
private $server;
/**
* Authentication backend
- *
- * @var Sabre_DAV_Auth_Backend_Abstract
+ *
+ * @var Sabre_DAV_Auth_IBackend
*/
private $authBackend;
/**
- * The authentication realm.
- *
- * @var string
+ * The authentication realm.
+ *
+ * @var string
*/
private $realm;
/**
- * __construct
- *
- * @param Sabre_DAV_Auth_Backend_Abstract $authBackend
- * @param string $realm
- * @return void
+ * __construct
+ *
+ * @param Sabre_DAV_Auth_IBackend $authBackend
+ * @param string $realm
*/
public function __construct(Sabre_DAV_Auth_IBackend $authBackend, $realm) {
@@ -53,9 +52,9 @@ class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
}
/**
- * Initializes the plugin. This function is automatically called by the server
- *
- * @param Sabre_DAV_Server $server
+ * Initializes the plugin. This function is automatically called by the server
+ *
+ * @param Sabre_DAV_Server $server
* @return void
*/
public function initialize(Sabre_DAV_Server $server) {
@@ -67,11 +66,11 @@ class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
/**
* Returns a plugin name.
- *
+ *
* Using this name other plugins will be able to access other plugins
- * using Sabre_DAV_Server::getPlugin
- *
- * @return string
+ * using Sabre_DAV_Server::getPlugin
+ *
+ * @return string
*/
public function getPluginName() {
@@ -81,10 +80,10 @@ class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
/**
* Returns the current users' principal uri.
- *
- * If nobody is logged in, this will return null.
- *
- * @return string|null
+ *
+ * If nobody is logged in, this will return null.
+ *
+ * @return string|null
*/
public function getCurrentUser() {
@@ -97,10 +96,11 @@ class Sabre_DAV_Auth_Plugin extends Sabre_DAV_ServerPlugin {
/**
* This method is called before any HTTP method and forces users to be authenticated
- *
+ *
* @param string $method
+ * @param string $uri
* @throws Sabre_DAV_Exception_NotAuthenticated
- * @return bool
+ * @return bool
*/
public function beforeMethod($method, $uri) {
diff --git a/3rdparty/Sabre/DAV/Browser/GuessContentType.php b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
index ee8c698d78..b6c00d461c 100644
--- a/3rdparty/Sabre/DAV/Browser/GuessContentType.php
+++ b/3rdparty/Sabre/DAV/Browser/GuessContentType.php
@@ -10,10 +10,10 @@
* There's really no accurate, fast and portable way to determine the contenttype
* so this extension does what the rest of the world does, and guesses it based
* on the file extension.
- *
+ *
* @package Sabre
* @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -43,9 +43,9 @@ class Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
);
/**
- * Initializes the plugin
- *
- * @param Sabre_DAV_Server $server
+ * Initializes the plugin
+ *
+ * @param Sabre_DAV_Server $server
* @return void
*/
public function initialize(Sabre_DAV_Server $server) {
@@ -57,16 +57,16 @@ class Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
}
/**
- * Handler for teh afterGetProperties event
- *
- * @param string $path
- * @param array $properties
+ * Handler for teh afterGetProperties event
+ *
+ * @param string $path
+ * @param array $properties
* @return void
*/
public function afterGetProperties($path, &$properties) {
if (array_key_exists('{DAV:}getcontenttype', $properties[404])) {
-
+
list(, $fileName) = Sabre_DAV_URLUtil::splitPath($path);
$contentType = $this->getContentType($fileName);
@@ -81,9 +81,9 @@ class Sabre_DAV_Browser_GuessContentType extends Sabre_DAV_ServerPlugin {
/**
* Simple method to return the contenttype
- *
- * @param string $fileName
- * @return string
+ *
+ * @param string $fileName
+ * @return string
*/
protected function getContentType($fileName) {
diff --git a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
index a66b57a3a9..1588488764 100644
--- a/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
+++ b/3rdparty/Sabre/DAV/Browser/MapGetToPropFind.php
@@ -1,30 +1,30 @@
server->tree->getNodeForPath($uri);
if ($node instanceof Sabre_DAV_IFile) return;
$this->server->invokeMethod('PROPFIND',$uri);
return false;
-
+
}
}
diff --git a/3rdparty/Sabre/DAV/Browser/Plugin.php b/3rdparty/Sabre/DAV/Browser/Plugin.php
index cd5617babb..09bbdd2ae0 100644
--- a/3rdparty/Sabre/DAV/Browser/Plugin.php
+++ b/3rdparty/Sabre/DAV/Browser/Plugin.php
@@ -6,77 +6,126 @@
* This plugin provides a html representation, so that a WebDAV server may be accessed
* using a browser.
*
- * The class intercepts GET requests to collection resources and generates a simple
- * html index.
- *
+ * The class intercepts GET requests to collection resources and generates a simple
+ * html index.
+ *
* @package Sabre
* @subpackage DAV
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. All rights reserved.
+ * @copyright Copyright (C) 2007-2012 Rooftop Solutions. All rights reserved.
* @author Evert Pot (http://www.rooftopsolutions.nl/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
/**
- * reference to server class
- *
- * @var Sabre_DAV_Server
+ * List of default icons for nodes.
+ *
+ * This is an array with class / interface names as keys, and asset names
+ * as values.
+ *
+ * The evaluation order is reversed. The last item in the list gets
+ * precendence.
+ *
+ * @var array
+ */
+ public $iconMap = array(
+ 'Sabre_DAV_IFile' => 'icons/file',
+ 'Sabre_DAV_ICollection' => 'icons/collection',
+ 'Sabre_DAVACL_IPrincipal' => 'icons/principal',
+ 'Sabre_CalDAV_ICalendar' => 'icons/calendar',
+ 'Sabre_CardDAV_IAddressBook' => 'icons/addressbook',
+ 'Sabre_CardDAV_ICard' => 'icons/card',
+ );
+
+ /**
+ * The file extension used for all icons
+ *
+ * @var string
+ */
+ public $iconExtension = '.png';
+
+ /**
+ * reference to server class
+ *
+ * @var Sabre_DAV_Server
*/
protected $server;
/**
- * enableEditing
- *
- * @var bool
+ * enablePost turns on the 'actions' panel, which allows people to create
+ * folders and upload files straight from a browser.
+ *
+ * @var bool
*/
protected $enablePost = true;
+ /**
+ * By default the browser plugin will generate a favicon and other images.
+ * To turn this off, set this property to false.
+ *
+ * @var bool
+ */
+ protected $enableAssets = true;
+
/**
* Creates the object.
*
* By default it will allow file creation and uploads.
* Specify the first argument as false to disable this
- *
- * @param bool $enablePost
- * @return void
+ *
+ * @param bool $enablePost
+ * @param bool $enableAssets
*/
- public function __construct($enablePost=true) {
+ public function __construct($enablePost=true, $enableAssets = true) {
- $this->enablePost = $enablePost;
+ $this->enablePost = $enablePost;
+ $this->enableAssets = $enableAssets;
}
/**
- * Initializes the plugin and subscribes to events
- *
- * @param Sabre_DAV_Server $server
+ * Initializes the plugin and subscribes to events
+ *
+ * @param Sabre_DAV_Server $server
* @return void
*/
public function initialize(Sabre_DAV_Server $server) {
$this->server = $server;
$this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
+ $this->server->subscribeEvent('onHTMLActionsPanel', array($this, 'htmlActionsPanel'),200);
if ($this->enablePost) $this->server->subscribeEvent('unknownMethod',array($this,'httpPOSTHandler'));
}
/**
- * This method intercepts GET requests to collections and returns the html
- *
- * @param string $method
- * @return bool
+ * This method intercepts GET requests to collections and returns the html
+ *
+ * @param string $method
+ * @param string $uri
+ * @return bool
*/
public function httpGetInterceptor($method, $uri) {
- if ($method!='GET') return true;
+ if ($method !== 'GET') return true;
- try {
+ // We're not using straight-up $_GET, because we want everything to be
+ // unit testable.
+ $getVars = array();
+ parse_str($this->server->httpRequest->getQueryString(), $getVars);
+
+ if (isset($getVars['sabreAction']) && $getVars['sabreAction'] === 'asset' && isset($getVars['assetName'])) {
+ $this->serveAsset($getVars['assetName']);
+ return false;
+ }
+
+ try {
$node = $this->server->tree->getNodeForPath($uri);
- } catch (Sabre_DAV_Exception_FileNotFound $e) {
- // We're simply stopping when the file isn't found to not interfere
+ } catch (Sabre_DAV_Exception_NotFound $e) {
+ // We're simply stopping when the file isn't found to not interfere
// with other plugins.
return;
}
- if ($node instanceof Sabre_DAV_IFile)
+ if ($node instanceof Sabre_DAV_IFile)
return;
$this->server->httpResponse->sendStatus(200);
@@ -87,57 +136,71 @@ class Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
);
return false;
-
+
}
/**
- * Handles POST requests for tree operations
- *
- * This method is not yet used.
- *
- * @param string $method
+ * Handles POST requests for tree operations.
+ *
+ * @param string $method
+ * @param string $uri
* @return bool
*/
public function httpPOSTHandler($method, $uri) {
- if ($method!='POST') return true;
- if (isset($_POST['sabreAction'])) switch($_POST['sabreAction']) {
+ if ($method!='POST') return;
+ $contentType = $this->server->httpRequest->getHeader('Content-Type');
+ list($contentType) = explode(';', $contentType);
+ if ($contentType !== 'application/x-www-form-urlencoded' &&
+ $contentType !== 'multipart/form-data') {
+ return;
+ }
+ $postVars = $this->server->httpRequest->getPostVars();
- case 'mkcol' :
- if (isset($_POST['name']) && trim($_POST['name'])) {
- // Using basename() because we won't allow slashes
- list(, $folderName) = Sabre_DAV_URLUtil::splitPath(trim($_POST['name']));
- $this->server->createDirectory($uri . '/' . $folderName);
- }
- break;
- case 'put' :
- if ($_FILES) $file = current($_FILES);
- else break;
- $newName = trim($file['name']);
- list(, $newName) = Sabre_DAV_URLUtil::splitPath(trim($file['name']));
- if (isset($_POST['name']) && trim($_POST['name']))
- $newName = trim($_POST['name']);
+ if (!isset($postVars['sabreAction']))
+ return;
- // Making sure we only have a 'basename' component
- list(, $newName) = Sabre_DAV_URLUtil::splitPath($newName);
-
-
- if (is_uploaded_file($file['tmp_name'])) {
- $parent = $this->server->tree->getNodeForPath(trim($uri,'/'));
- $parent->createFile($newName,fopen($file['tmp_name'],'r'));
- }
+ if ($this->server->broadcastEvent('onBrowserPostAction', array($uri, $postVars['sabreAction'], $postVars))) {
+
+ switch($postVars['sabreAction']) {
+
+ case 'mkcol' :
+ if (isset($postVars['name']) && trim($postVars['name'])) {
+ // Using basename() because we won't allow slashes
+ list(, $folderName) = Sabre_DAV_URLUtil::splitPath(trim($postVars['name']));
+ $this->server->createDirectory($uri . '/' . $folderName);
+ }
+ break;
+ case 'put' :
+ if ($_FILES) $file = current($_FILES);
+ else break;
+
+ list(, $newName) = Sabre_DAV_URLUtil::splitPath(trim($file['name']));
+ if (isset($postVars['name']) && trim($postVars['name']))
+ $newName = trim($postVars['name']);
+
+ // Making sure we only have a 'basename' component
+ list(, $newName) = Sabre_DAV_URLUtil::splitPath($newName);
+
+ if (is_uploaded_file($file['tmp_name'])) {
+ $this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'],'r'));
+ }
+ break;
+
+ }
}
$this->server->httpResponse->setHeader('Location',$this->server->httpRequest->getUri());
+ $this->server->httpResponse->sendStatus(302);
return false;
}
/**
- * Escapes a string for html.
- *
- * @param string $value
- * @return void
+ * Escapes a string for html.
+ *
+ * @param string $value
+ * @return string
*/
public function escapeHTML($value) {
@@ -146,118 +209,199 @@ class Sabre_DAV_Browser_Plugin extends Sabre_DAV_ServerPlugin {
}
/**
- * Generates the html directory index for a given url
+ * Generates the html directory index for a given url
*
- * @param string $path
- * @return string
+ * @param string $path
+ * @return string
*/
public function generateDirectoryIndex($path) {
+ $version = '';
+ if (Sabre_DAV_Server::$exposeVersion) {
+ $version = Sabre_DAV_Version::VERSION ."-". Sabre_DAV_Version::STABILITY;
+ }
+
$html = "
- Index for " . $this->escapeHTML($path) . "/ - SabreDAV " . Sabre_DAV_Version::VERSION . "
-
-
+ Index for " . $this->escapeHTML($path) . "/ - SabreDAV " . $version . "
+
+ ";
+
+ if ($this->enableAssets) {
+ $html.='';
+ }
+
+ $html .= "
";
+
}
- // If no resourcetype was found, we attempt to use
- // the contenttype property
- if (!$type && isset($file[200]['{DAV:}getcontenttype'])) {
- $type = $file[200]['{DAV:}getcontenttype'];
+ $html.= "