Dolibarr / dolibarr

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/AbstractBearer.php

Indentation +98 added lines, -98 removed lines

@@ -23,108 +23,108 @@
  */
 abstract class AbstractBearer implements BackendInterface
 {
-    /**
-     * Authentication Realm.
-     *
-     * The realm is often displayed by browser clients when showing the
-     * authentication dialog.
-     *
-     * @var string
-     */
-    protected $realm = 'sabre/dav';
+	/**
+	 * Authentication Realm.
+	 *
+	 * The realm is often displayed by browser clients when showing the
+	 * authentication dialog.
+	 *
+	 * @var string
+	 */
+	protected $realm = 'sabre/dav';
 
-    /**
-     * Validates a Bearer token.
-     *
-     * This method should return the full principal url, or false if the
-     * token was incorrect.
-     *
-     * @param string $bearerToken
-     *
-     * @return string|false
-     */
-    abstract protected function validateBearerToken($bearerToken);
+	/**
+	 * Validates a Bearer token.
+	 *
+	 * This method should return the full principal url, or false if the
+	 * token was incorrect.
+	 *
+	 * @param string $bearerToken
+	 *
+	 * @return string|false
+	 */
+	abstract protected function validateBearerToken($bearerToken);
 
-    /**
-     * Sets the authentication realm for this backend.
-     *
-     * @param string $realm
-     */
-    public function setRealm($realm)
-    {
-        $this->realm = $realm;
-    }
+	/**
+	 * Sets the authentication realm for this backend.
+	 *
+	 * @param string $realm
+	 */
+	public function setRealm($realm)
+	{
+		$this->realm = $realm;
+	}
 
-    /**
-     * When this method is called, the backend must check if authentication was
-     * successful.
-     *
-     * The returned value must be one of the following
-     *
-     * [true, "principals/username"]
-     * [false, "reason for failure"]
-     *
-     * If authentication was successful, it's expected that the authentication
-     * backend returns a so-called principal url.
-     *
-     * Examples of a principal url:
-     *
-     * principals/admin
-     * principals/user1
-     * principals/users/joe
-     * principals/uid/123457
-     *
-     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-     * return a string such as:
-     *
-     * principals/users/[username]
-     *
-     * @return array
-     */
-    public function check(RequestInterface $request, ResponseInterface $response)
-    {
-        $auth = new HTTP\Auth\Bearer(
-            $this->realm,
-            $request,
-            $response
-        );
+	/**
+	 * When this method is called, the backend must check if authentication was
+	 * successful.
+	 *
+	 * The returned value must be one of the following
+	 *
+	 * [true, "principals/username"]
+	 * [false, "reason for failure"]
+	 *
+	 * If authentication was successful, it's expected that the authentication
+	 * backend returns a so-called principal url.
+	 *
+	 * Examples of a principal url:
+	 *
+	 * principals/admin
+	 * principals/user1
+	 * principals/users/joe
+	 * principals/uid/123457
+	 *
+	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+	 * return a string such as:
+	 *
+	 * principals/users/[username]
+	 *
+	 * @return array
+	 */
+	public function check(RequestInterface $request, ResponseInterface $response)
+	{
+		$auth = new HTTP\Auth\Bearer(
+			$this->realm,
+			$request,
+			$response
+		);
 
-        $bearerToken = $auth->getToken($request);
-        if (!$bearerToken) {
-            return [false, "No 'Authorization: Bearer' header found. Either the client didn't send one, or the server is mis-configured"];
-        }
-        $principalUrl = $this->validateBearerToken($bearerToken);
-        if (!$principalUrl) {
-            return [false, 'Bearer token was incorrect'];
-        }
+		$bearerToken = $auth->getToken($request);
+		if (!$bearerToken) {
+			return [false, "No 'Authorization: Bearer' header found. Either the client didn't send one, or the server is mis-configured"];
+		}
+		$principalUrl = $this->validateBearerToken($bearerToken);
+		if (!$principalUrl) {
+			return [false, 'Bearer token was incorrect'];
+		}
 
-        return [true, $principalUrl];
-    }
+		return [true, $principalUrl];
+	}
 
-    /**
-     * This method is called when a user could not be authenticated, and
-     * authentication was required for the current request.
-     *
-     * This gives you the opportunity to set authentication headers. The 401
-     * status code will already be set.
-     *
-     * In this case of Bearer Auth, this would for example mean that the
-     * following header needs to be set:
-     *
-     * $response->addHeader('WWW-Authenticate', 'Bearer realm=SabreDAV');
-     *
-     * Keep in mind that in the case of multiple authentication backends, other
-     * WWW-Authenticate headers may already have been set, and you'll want to
-     * append your own WWW-Authenticate header instead of overwriting the
-     * existing one.
-     */
-    public function challenge(RequestInterface $request, ResponseInterface $response)
-    {
-        $auth = new HTTP\Auth\Bearer(
-            $this->realm,
-            $request,
-            $response
-        );
-        $auth->requireLogin();
-    }
+	/**
+	 * This method is called when a user could not be authenticated, and
+	 * authentication was required for the current request.
+	 *
+	 * This gives you the opportunity to set authentication headers. The 401
+	 * status code will already be set.
+	 *
+	 * In this case of Bearer Auth, this would for example mean that the
+	 * following header needs to be set:
+	 *
+	 * $response->addHeader('WWW-Authenticate', 'Bearer realm=SabreDAV');
+	 *
+	 * Keep in mind that in the case of multiple authentication backends, other
+	 * WWW-Authenticate headers may already have been set, and you'll want to
+	 * append your own WWW-Authenticate header instead of overwriting the
+	 * existing one.
+	 */
+	public function challenge(RequestInterface $request, ResponseInterface $response)
+	{
+		$auth = new HTTP\Auth\Bearer(
+			$this->realm,
+			$request,
+			$response
+		);
+		$auth->requireLogin();
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/PDOBasicAuth.php

Indentation +91 added lines, -91 removed lines

@@ -10,105 +10,105 @@
  */
 class PDOBasicAuth extends AbstractBasic
 {
-    /**
-     * Reference to PDO connection.
-     *
-     * @var PDO
-     */
-    protected $pdo;
+	/**
+	 * Reference to PDO connection.
+	 *
+	 * @var PDO
+	 */
+	protected $pdo;
 
-    /**
-     * PDO table name we'll be using.
-     *
-     * @var string
-     */
-    protected $tableName;
+	/**
+	 * PDO table name we'll be using.
+	 *
+	 * @var string
+	 */
+	protected $tableName;
 
-    /**
-     * PDO digest column name we'll be using
-     * (i.e. digest, password, password_hash).
-     *
-     * @var string
-     */
-    protected $digestColumn;
+	/**
+	 * PDO digest column name we'll be using
+	 * (i.e. digest, password, password_hash).
+	 *
+	 * @var string
+	 */
+	protected $digestColumn;
 
-    /**
-     * PDO uuid(unique user identifier) column name we'll be using
-     * (i.e. username, email).
-     *
-     * @var string
-     */
-    protected $uuidColumn;
+	/**
+	 * PDO uuid(unique user identifier) column name we'll be using
+	 * (i.e. username, email).
+	 *
+	 * @var string
+	 */
+	protected $uuidColumn;
 
-    /**
-     * Digest prefix:
-     * if the backend you are using for is prefixing
-     * your password hashes set this option to your prefix to
-     * cut it off before verfiying.
-     *
-     * @var string
-     */
-    protected $digestPrefix;
+	/**
+	 * Digest prefix:
+	 * if the backend you are using for is prefixing
+	 * your password hashes set this option to your prefix to
+	 * cut it off before verfiying.
+	 *
+	 * @var string
+	 */
+	protected $digestPrefix;
 
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     */
-    public function __construct(\PDO $pdo, array $options = [])
-    {
-        $this->pdo = $pdo;
-        if (isset($options['tableName'])) {
-            $this->tableName = $options['tableName'];
-        } else {
-            $this->tableName = 'users';
-        }
-        if (isset($options['digestColumn'])) {
-            $this->digestColumn = $options['digestColumn'];
-        } else {
-            $this->digestColumn = 'digest';
-        }
-        if (isset($options['uuidColumn'])) {
-            $this->uuidColumn = $options['uuidColumn'];
-        } else {
-            $this->uuidColumn = 'username';
-        }
-        if (isset($options['digestPrefix'])) {
-            $this->digestPrefix = $options['digestPrefix'];
-        }
-    }
+	/**
+	 * Creates the backend object.
+	 *
+	 * If the filename argument is passed in, it will parse out the specified file fist.
+	 */
+	public function __construct(\PDO $pdo, array $options = [])
+	{
+		$this->pdo = $pdo;
+		if (isset($options['tableName'])) {
+			$this->tableName = $options['tableName'];
+		} else {
+			$this->tableName = 'users';
+		}
+		if (isset($options['digestColumn'])) {
+			$this->digestColumn = $options['digestColumn'];
+		} else {
+			$this->digestColumn = 'digest';
+		}
+		if (isset($options['uuidColumn'])) {
+			$this->uuidColumn = $options['uuidColumn'];
+		} else {
+			$this->uuidColumn = 'username';
+		}
+		if (isset($options['digestPrefix'])) {
+			$this->digestPrefix = $options['digestPrefix'];
+		}
+	}
 
-    /**
-     * Validates a username and password.
-     *
-     * This method should return true or false depending on if login
-     * succeeded.
-     *
-     * @param string $username
-     * @param string $password
-     *
-     * @return bool
-     */
-    public function validateUserPass($username, $password)
-    {
-        $stmt = $this->pdo->prepare('SELECT '.$this->digestColumn.' FROM '.$this->tableName.' WHERE '.$this->uuidColumn.' = ?');
-        $stmt->execute([$username]);
-        $result = $stmt->fetchAll();
+	/**
+	 * Validates a username and password.
+	 *
+	 * This method should return true or false depending on if login
+	 * succeeded.
+	 *
+	 * @param string $username
+	 * @param string $password
+	 *
+	 * @return bool
+	 */
+	public function validateUserPass($username, $password)
+	{
+		$stmt = $this->pdo->prepare('SELECT '.$this->digestColumn.' FROM '.$this->tableName.' WHERE '.$this->uuidColumn.' = ?');
+		$stmt->execute([$username]);
+		$result = $stmt->fetchAll();
 
-        if (!count($result)) {
-            return false;
-        } else {
-            $digest = $result[0][$this->digestColumn];
+		if (!count($result)) {
+			return false;
+		} else {
+			$digest = $result[0][$this->digestColumn];
 
-            if (isset($this->digestPrefix)) {
-                $digest = substr($digest, strlen($this->digestPrefix));
-            }
+			if (isset($this->digestPrefix)) {
+				$digest = substr($digest, strlen($this->digestPrefix));
+			}
 
-            if (password_verify($password, $digest)) {
-                return true;
-            }
+			if (password_verify($password, $digest)) {
+				return true;
+			}
 
-            return false;
-        }
-    }
+			return false;
+		}
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/PDO.php

Indentation +35 added lines, -35 removed lines

@@ -13,43 +13,43 @@
  */
 class PDO extends AbstractDigest
 {
-    /**
-     * Reference to PDO connection.
-     *
-     * @var PDO
-     */
-    protected $pdo;
+	/**
+	 * Reference to PDO connection.
+	 *
+	 * @var PDO
+	 */
+	protected $pdo;
 
-    /**
-     * PDO table name we'll be using.
-     *
-     * @var string
-     */
-    public $tableName = 'users';
+	/**
+	 * PDO table name we'll be using.
+	 *
+	 * @var string
+	 */
+	public $tableName = 'users';
 
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     */
-    public function __construct(\PDO $pdo)
-    {
-        $this->pdo = $pdo;
-    }
+	/**
+	 * Creates the backend object.
+	 *
+	 * If the filename argument is passed in, it will parse out the specified file fist.
+	 */
+	public function __construct(\PDO $pdo)
+	{
+		$this->pdo = $pdo;
+	}
 
-    /**
-     * 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 digesta1 FROM '.$this->tableName.' WHERE username = ?');
-        $stmt->execute([$username]);
+	/**
+	 * 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 digesta1 FROM '.$this->tableName.' WHERE username = ?');
+		$stmt->execute([$username]);
 
-        return $stmt->fetchColumn() ?: null;
-    }
+		return $stmt->fetchColumn() ?: null;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Auth/Backend/IMAP.php

Indentation +59 added lines, -59 removed lines

@@ -13,70 +13,70 @@
  */
 class IMAP extends AbstractBasic
 {
-    /**
-     * IMAP server in the form {host[:port][/flag1/flag2...]}.
-     *
-     * @see http://php.net/manual/en/function.imap-open.php
-     *
-     * @var string
-     */
-    protected $mailbox;
+	/**
+	 * IMAP server in the form {host[:port][/flag1/flag2...]}.
+	 *
+	 * @see http://php.net/manual/en/function.imap-open.php
+	 *
+	 * @var string
+	 */
+	protected $mailbox;
 
-    /**
-     * Creates the backend object.
-     *
-     * @param string $mailbox
-     */
-    public function __construct($mailbox)
-    {
-        $this->mailbox = $mailbox;
-    }
+	/**
+	 * Creates the backend object.
+	 *
+	 * @param string $mailbox
+	 */
+	public function __construct($mailbox)
+	{
+		$this->mailbox = $mailbox;
+	}
 
-    /**
-     * Connects to an IMAP server and tries to authenticate.
-     *
-     * @param string $username
-     * @param string $password
-     *
-     * @return bool
-     */
-    protected function imapOpen($username, $password)
-    {
-        $success = false;
+	/**
+	 * Connects to an IMAP server and tries to authenticate.
+	 *
+	 * @param string $username
+	 * @param string $password
+	 *
+	 * @return bool
+	 */
+	protected function imapOpen($username, $password)
+	{
+		$success = false;
 
-        try {
-            $imap = imap_open($this->mailbox, $username, $password, OP_HALFOPEN | OP_READONLY, 1);
-            if ($imap) {
-                $success = true;
-            }
-        } catch (\ErrorException $e) {
-            error_log($e->getMessage());
-        }
+		try {
+			$imap = imap_open($this->mailbox, $username, $password, OP_HALFOPEN | OP_READONLY, 1);
+			if ($imap) {
+				$success = true;
+			}
+		} catch (\ErrorException $e) {
+			error_log($e->getMessage());
+		}
 
-        $errors = imap_errors();
-        if ($errors) {
-            foreach ($errors as $error) {
-                error_log($error);
-            }
-        }
+		$errors = imap_errors();
+		if ($errors) {
+			foreach ($errors as $error) {
+				error_log($error);
+			}
+		}
 
-        if (isset($imap) && $imap) {
-            imap_close($imap);
-        }
+		if (isset($imap) && $imap) {
+			imap_close($imap);
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     * Validates a username and password by trying to authenticate against IMAP.
-     *
-     * @param string $username
-     * @param string $password
-     *
-     * @return bool
-     */
-    protected function validateUserPass($username, $password)
-    {
-        return $this->imapOpen($username, $password);
-    }
+	/**
+	 * Validates a username and password by trying to authenticate against IMAP.
+	 *
+	 * @param string $username
+	 * @param string $password
+	 *
+	 * @return bool
+	 */
+	protected function validateUserPass($username, $password)
+	{
+		return $this->imapOpen($username, $password);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Sync/Plugin.php

Indentation +224 added lines, -224 removed lines

@@ -22,228 +22,228 @@
  */
 class Plugin extends DAV\ServerPlugin
 {
-    /**
-     * Reference to server object.
-     *
-     * @var DAV\Server
-     */
-    protected $server;
-
-    const SYNCTOKEN_PREFIX = 'http://sabre.io/ns/sync/';
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using \Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName()
-    {
-        return 'sync';
-    }
-
-    /**
-     * Initializes the plugin.
-     *
-     * This is when the plugin registers it's hooks.
-     */
-    public function initialize(DAV\Server $server)
-    {
-        $this->server = $server;
-        $server->xml->elementMap['{DAV:}sync-collection'] = 'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport';
-
-        $self = $this;
-
-        $server->on('report', function ($reportName, $dom, $uri) use ($self) {
-            if ('{DAV:}sync-collection' === $reportName) {
-                $this->server->transactionType = 'report-sync-collection';
-                $self->syncCollection($uri, $dom);
-
-                return false;
-            }
-        });
-
-        $server->on('propFind', [$this, 'propFind']);
-        $server->on('validateTokens', [$this, 'validateTokens']);
-    }
-
-    /**
-     * 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
-     *
-     * @param string $uri
-     *
-     * @return array
-     */
-    public function getSupportedReportSet($uri)
-    {
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof ISyncCollection && $node->getSyncToken()) {
-            return [
-                '{DAV:}sync-collection',
-            ];
-        }
-
-        return [];
-    }
-
-    /**
-     * This method handles the {DAV:}sync-collection HTTP REPORT.
-     *
-     * @param string $uri
-     */
-    public function syncCollection($uri, SyncCollectionReport $report)
-    {
-        // Getting the data
-        $node = $this->server->tree->getNodeForPath($uri);
-        if (!$node instanceof ISyncCollection) {
-            throw new DAV\Exception\ReportNotSupported('The {DAV:}sync-collection REPORT is not supported on this url.');
-        }
-        $token = $node->getSyncToken();
-        if (!$token) {
-            throw new DAV\Exception\ReportNotSupported('No sync information is available at this node');
-        }
-
-        $syncToken = $report->syncToken;
-        if (!is_null($syncToken)) {
-            // Sync-token must start with our prefix
-            if (self::SYNCTOKEN_PREFIX !== substr($syncToken, 0, strlen(self::SYNCTOKEN_PREFIX))) {
-                throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
-            }
-
-            $syncToken = substr($syncToken, strlen(self::SYNCTOKEN_PREFIX));
-        }
-        $changeInfo = $node->getChanges($syncToken, $report->syncLevel, $report->limit);
-
-        if (is_null($changeInfo)) {
-            throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
-        }
-
-        if (!array_key_exists('result_truncated', $changeInfo)) {
-            $changeInfo['result_truncated'] = false;
-        }
-
-        // Encoding the response
-        $this->sendSyncCollectionResponse(
-            $changeInfo['syncToken'],
-            $uri,
-            $changeInfo['added'],
-            $changeInfo['modified'],
-            $changeInfo['deleted'],
-            $report->properties,
-            $changeInfo['result_truncated']
-        );
-    }
-
-    /**
-     * Sends the response to a sync-collection request.
-     *
-     * @param string $syncToken
-     * @param string $collectionUrl
-     */
-    protected function sendSyncCollectionResponse($syncToken, $collectionUrl, array $added, array $modified, array $deleted, array $properties, bool $resultTruncated = false)
-    {
-        $fullPaths = [];
-
-        // Pre-fetching children, if this is possible.
-        foreach (array_merge($added, $modified) as $item) {
-            $fullPath = $collectionUrl.'/'.$item;
-            $fullPaths[] = $fullPath;
-        }
-
-        $responses = [];
-        foreach ($this->server->getPropertiesForMultiplePaths($fullPaths, $properties) as $fullPath => $props) {
-            // The 'Property_Response' class is responsible for generating a
-            // single {DAV:}response xml element.
-            $responses[] = new DAV\Xml\Element\Response($fullPath, $props);
-        }
-
-        // Deleted items also show up as 'responses'. They have no properties,
-        // and a single {DAV:}status element set as 'HTTP/1.1 404 Not Found'.
-        foreach ($deleted as $item) {
-            $fullPath = $collectionUrl.'/'.$item;
-            $responses[] = new DAV\Xml\Element\Response($fullPath, [], 404);
-        }
-        if ($resultTruncated) {
-            $responses[] = new DAV\Xml\Element\Response($collectionUrl.'/', [], 507);
-        }
-
-        $multiStatus = new DAV\Xml\Response\MultiStatus($responses, self::SYNCTOKEN_PREFIX.$syncToken);
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setBody(
-            $this->server->xml->write('{DAV:}multistatus', $multiStatus, $this->server->getBaseUri())
-        );
-    }
-
-    /**
-     * This method is triggered whenever properties are requested for a node.
-     * We intercept this to see if we must return a {DAV:}sync-token.
-     */
-    public function propFind(DAV\PropFind $propFind, DAV\INode $node)
-    {
-        $propFind->handle('{DAV:}sync-token', function () use ($node) {
-            if (!$node instanceof ISyncCollection || !$token = $node->getSyncToken()) {
-                return;
-            }
-
-            return self::SYNCTOKEN_PREFIX.$token;
-        });
-    }
-
-    /**
-     * The validateTokens event is triggered before every request.
-     *
-     * It's a moment where this plugin can check all the supplied lock tokens
-     * in the If: header, and check if they are valid.
-     *
-     * @param array $conditions
-     */
-    public function validateTokens(RequestInterface $request, &$conditions)
-    {
-        foreach ($conditions as $kk => $condition) {
-            foreach ($condition['tokens'] as $ii => $token) {
-                // Sync-tokens must always start with our designated prefix.
-                if (self::SYNCTOKEN_PREFIX !== substr($token['token'], 0, strlen(self::SYNCTOKEN_PREFIX))) {
-                    continue;
-                }
-
-                // Checking if the token is a match.
-                $node = $this->server->tree->getNodeForPath($condition['uri']);
-
-                if (
-                    $node instanceof ISyncCollection &&
-                    $node->getSyncToken() == substr($token['token'], strlen(self::SYNCTOKEN_PREFIX))
-                ) {
-                    $conditions[$kk]['tokens'][$ii]['validToken'] = true;
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo()
-    {
-        return [
-            'name' => $this->getPluginName(),
-            'description' => 'Adds support for WebDAV Collection Sync (rfc6578)',
-            'link' => 'http://sabre.io/dav/sync/',
-        ];
-    }
+	/**
+	 * Reference to server object.
+	 *
+	 * @var DAV\Server
+	 */
+	protected $server;
+
+	const SYNCTOKEN_PREFIX = 'http://sabre.io/ns/sync/';
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using \Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName()
+	{
+		return 'sync';
+	}
+
+	/**
+	 * Initializes the plugin.
+	 *
+	 * This is when the plugin registers it's hooks.
+	 */
+	public function initialize(DAV\Server $server)
+	{
+		$this->server = $server;
+		$server->xml->elementMap['{DAV:}sync-collection'] = 'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport';
+
+		$self = $this;
+
+		$server->on('report', function ($reportName, $dom, $uri) use ($self) {
+			if ('{DAV:}sync-collection' === $reportName) {
+				$this->server->transactionType = 'report-sync-collection';
+				$self->syncCollection($uri, $dom);
+
+				return false;
+			}
+		});
+
+		$server->on('propFind', [$this, 'propFind']);
+		$server->on('validateTokens', [$this, 'validateTokens']);
+	}
+
+	/**
+	 * 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
+	 *
+	 * @param string $uri
+	 *
+	 * @return array
+	 */
+	public function getSupportedReportSet($uri)
+	{
+		$node = $this->server->tree->getNodeForPath($uri);
+		if ($node instanceof ISyncCollection && $node->getSyncToken()) {
+			return [
+				'{DAV:}sync-collection',
+			];
+		}
+
+		return [];
+	}
+
+	/**
+	 * This method handles the {DAV:}sync-collection HTTP REPORT.
+	 *
+	 * @param string $uri
+	 */
+	public function syncCollection($uri, SyncCollectionReport $report)
+	{
+		// Getting the data
+		$node = $this->server->tree->getNodeForPath($uri);
+		if (!$node instanceof ISyncCollection) {
+			throw new DAV\Exception\ReportNotSupported('The {DAV:}sync-collection REPORT is not supported on this url.');
+		}
+		$token = $node->getSyncToken();
+		if (!$token) {
+			throw new DAV\Exception\ReportNotSupported('No sync information is available at this node');
+		}
+
+		$syncToken = $report->syncToken;
+		if (!is_null($syncToken)) {
+			// Sync-token must start with our prefix
+			if (self::SYNCTOKEN_PREFIX !== substr($syncToken, 0, strlen(self::SYNCTOKEN_PREFIX))) {
+				throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
+			}
+
+			$syncToken = substr($syncToken, strlen(self::SYNCTOKEN_PREFIX));
+		}
+		$changeInfo = $node->getChanges($syncToken, $report->syncLevel, $report->limit);
+
+		if (is_null($changeInfo)) {
+			throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
+		}
+
+		if (!array_key_exists('result_truncated', $changeInfo)) {
+			$changeInfo['result_truncated'] = false;
+		}
+
+		// Encoding the response
+		$this->sendSyncCollectionResponse(
+			$changeInfo['syncToken'],
+			$uri,
+			$changeInfo['added'],
+			$changeInfo['modified'],
+			$changeInfo['deleted'],
+			$report->properties,
+			$changeInfo['result_truncated']
+		);
+	}
+
+	/**
+	 * Sends the response to a sync-collection request.
+	 *
+	 * @param string $syncToken
+	 * @param string $collectionUrl
+	 */
+	protected function sendSyncCollectionResponse($syncToken, $collectionUrl, array $added, array $modified, array $deleted, array $properties, bool $resultTruncated = false)
+	{
+		$fullPaths = [];
+
+		// Pre-fetching children, if this is possible.
+		foreach (array_merge($added, $modified) as $item) {
+			$fullPath = $collectionUrl.'/'.$item;
+			$fullPaths[] = $fullPath;
+		}
+
+		$responses = [];
+		foreach ($this->server->getPropertiesForMultiplePaths($fullPaths, $properties) as $fullPath => $props) {
+			// The 'Property_Response' class is responsible for generating a
+			// single {DAV:}response xml element.
+			$responses[] = new DAV\Xml\Element\Response($fullPath, $props);
+		}
+
+		// Deleted items also show up as 'responses'. They have no properties,
+		// and a single {DAV:}status element set as 'HTTP/1.1 404 Not Found'.
+		foreach ($deleted as $item) {
+			$fullPath = $collectionUrl.'/'.$item;
+			$responses[] = new DAV\Xml\Element\Response($fullPath, [], 404);
+		}
+		if ($resultTruncated) {
+			$responses[] = new DAV\Xml\Element\Response($collectionUrl.'/', [], 507);
+		}
+
+		$multiStatus = new DAV\Xml\Response\MultiStatus($responses, self::SYNCTOKEN_PREFIX.$syncToken);
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setBody(
+			$this->server->xml->write('{DAV:}multistatus', $multiStatus, $this->server->getBaseUri())
+		);
+	}
+
+	/**
+	 * This method is triggered whenever properties are requested for a node.
+	 * We intercept this to see if we must return a {DAV:}sync-token.
+	 */
+	public function propFind(DAV\PropFind $propFind, DAV\INode $node)
+	{
+		$propFind->handle('{DAV:}sync-token', function () use ($node) {
+			if (!$node instanceof ISyncCollection || !$token = $node->getSyncToken()) {
+				return;
+			}
+
+			return self::SYNCTOKEN_PREFIX.$token;
+		});
+	}
+
+	/**
+	 * The validateTokens event is triggered before every request.
+	 *
+	 * It's a moment where this plugin can check all the supplied lock tokens
+	 * in the If: header, and check if they are valid.
+	 *
+	 * @param array $conditions
+	 */
+	public function validateTokens(RequestInterface $request, &$conditions)
+	{
+		foreach ($conditions as $kk => $condition) {
+			foreach ($condition['tokens'] as $ii => $token) {
+				// Sync-tokens must always start with our designated prefix.
+				if (self::SYNCTOKEN_PREFIX !== substr($token['token'], 0, strlen(self::SYNCTOKEN_PREFIX))) {
+					continue;
+				}
+
+				// Checking if the token is a match.
+				$node = $this->server->tree->getNodeForPath($condition['uri']);
+
+				if (
+					$node instanceof ISyncCollection &&
+					$node->getSyncToken() == substr($token['token'], strlen(self::SYNCTOKEN_PREFIX))
+				) {
+					$conditions[$kk]['tokens'][$ii]['validToken'] = true;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo()
+	{
+		return [
+			'name' => $this->getPluginName(),
+			'description' => 'Adds support for WebDAV Collection Sync (rfc6578)',
+			'link' => 'http://sabre.io/dav/sync/',
+		];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 
         $self = $this;
 
-        $server->on('report', function ($reportName, $dom, $uri) use ($self) {
+        $server->on('report', function($reportName, $dom, $uri) use ($self) {
             if ('{DAV:}sync-collection' === $reportName) {
                 $this->server->transactionType = 'report-sync-collection';
                 $self->syncCollection($uri, $dom);
@@ -188,7 +188,7 @@ 
      */
     public function propFind(DAV\PropFind $propFind, DAV\INode $node)
     {
-        $propFind->handle('{DAV:}sync-token', function () use ($node) {
+        $propFind->handle('{DAV:}sync-token', function() use ($node) {
             if (!$node instanceof ISyncCollection || !$token = $node->getSyncToken()) {
                 return;
             }

htdocs/includes/sabre/sabre/dav/lib/DAV/Xml/Service.php

Indentation +28 added lines, -28 removed lines

@@ -13,35 +13,35 @@
  */
 class Service extends \Sabre\Xml\Service
 {
-    /**
-     * This is a list of XML elements that we automatically map to PHP classes.
-     *
-     * For instance, this list may contain an entry `{DAV:}propfind` that would
-     * be mapped to Sabre\DAV\Xml\Request\PropFind
-     */
-    public $elementMap = [
-        '{DAV:}multistatus' => 'Sabre\\DAV\\Xml\\Response\\MultiStatus',
-        '{DAV:}response' => 'Sabre\\DAV\\Xml\\Element\\Response',
+	/**
+	 * This is a list of XML elements that we automatically map to PHP classes.
+	 *
+	 * For instance, this list may contain an entry `{DAV:}propfind` that would
+	 * be mapped to Sabre\DAV\Xml\Request\PropFind
+	 */
+	public $elementMap = [
+		'{DAV:}multistatus' => 'Sabre\\DAV\\Xml\\Response\\MultiStatus',
+		'{DAV:}response' => 'Sabre\\DAV\\Xml\\Element\\Response',
 
-        // Requests
-        '{DAV:}propfind' => 'Sabre\\DAV\\Xml\\Request\\PropFind',
-        '{DAV:}propertyupdate' => 'Sabre\\DAV\\Xml\\Request\\PropPatch',
-        '{DAV:}mkcol' => 'Sabre\\DAV\\Xml\\Request\\MkCol',
+		// Requests
+		'{DAV:}propfind' => 'Sabre\\DAV\\Xml\\Request\\PropFind',
+		'{DAV:}propertyupdate' => 'Sabre\\DAV\\Xml\\Request\\PropPatch',
+		'{DAV:}mkcol' => 'Sabre\\DAV\\Xml\\Request\\MkCol',
 
-        // Properties
-        '{DAV:}resourcetype' => 'Sabre\\DAV\\Xml\\Property\\ResourceType',
-    ];
+		// Properties
+		'{DAV:}resourcetype' => 'Sabre\\DAV\\Xml\\Property\\ResourceType',
+	];
 
-    /**
-     * This is a default list of namespaces.
-     *
-     * If you are defining your own custom namespace, add it here to reduce
-     * bandwidth and improve legibility of xml bodies.
-     *
-     * @var array
-     */
-    public $namespaceMap = [
-        'DAV:' => 'd',
-        'http://sabredav.org/ns' => 's',
-    ];
+	/**
+	 * This is a default list of namespaces.
+	 *
+	 * If you are defining your own custom namespace, add it here to reduce
+	 * bandwidth and improve legibility of xml bodies.
+	 *
+	 * @var array
+	 */
+	public $namespaceMap = [
+		'DAV:' => 'd',
+		'http://sabredav.org/ns' => 's',
+	];
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Xml/Element/Sharee.php

Indentation +164 added lines, -164 removed lines

@@ -22,168 +22,168 @@
  */
 class Sharee implements Element
 {
-    /**
-     * A URL. Usually a mailto: address, could also be a principal url.
-     * This uniquely identifies the sharee.
-     *
-     * @var string
-     */
-    public $href;
-
-    /**
-     * A local principal path. The server will do its best to locate the
-     * principal uri based on the given uri. If we could find a local matching
-     * principal uri, this property will contain the value.
-     *
-     * @var string|null
-     */
-    public $principal;
-
-    /**
-     * A list of WebDAV properties that describe the sharee. This might for
-     * example contain a {DAV:}displayname with the real name of the user.
-     *
-     * @var array
-     */
-    public $properties = [];
-
-    /**
-     * Share access level. One of the Sabre\DAV\Sharing\Plugin::ACCESS
-     * constants.
-     *
-     * Can be one of:
-     *
-     * ACCESS_READ
-     * ACCESS_READWRITE
-     * ACCESS_SHAREDOWNER
-     * ACCESS_NOACCESS
-     *
-     * depending on context.
-     *
-     * @var int
-     */
-    public $access;
-
-    /**
-     * When a sharee is originally invited to a share, the sharer may add
-     * a comment. This will be placed in this property.
-     *
-     * @var string
-     */
-    public $comment;
-
-    /**
-     * The status of the invite, should be one of the
-     * Sabre\DAV\Sharing\Plugin::INVITE constants.
-     *
-     * @var int
-     */
-    public $inviteStatus;
-
-    /**
-     * Creates the object.
-     *
-     * $properties will be used to populate all internal properties.
-     */
-    public function __construct(array $properties = [])
-    {
-        foreach ($properties as $k => $v) {
-            if (property_exists($this, $k)) {
-                $this->$k = $v;
-            } else {
-                throw new \InvalidArgumentException('Unknown property: '.$k);
-            }
-        }
-    }
-
-    /**
-     * The xmlSerialize method is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializable should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     */
-    public function xmlSerialize(Writer $writer)
-    {
-        $writer->write([
-            new Href($this->href),
-            '{DAV:}prop' => $this->properties,
-            '{DAV:}share-access' => new ShareAccess($this->access),
-        ]);
-        switch ($this->inviteStatus) {
-            case Plugin::INVITE_NORESPONSE:
-                $writer->writeElement('{DAV:}invite-noresponse');
-                break;
-            case Plugin::INVITE_ACCEPTED:
-                $writer->writeElement('{DAV:}invite-accepted');
-                break;
-            case Plugin::INVITE_DECLINED:
-                $writer->writeElement('{DAV:}invite-declined');
-                break;
-            case Plugin::INVITE_INVALID:
-                $writer->writeElement('{DAV:}invite-invalid');
-                break;
-        }
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statically, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Reader $reader)
-    {
-        // Temporarily override configuration
-        $reader->pushContext();
-        $reader->elementMap['{DAV:}share-access'] = 'Sabre\DAV\Xml\Property\ShareAccess';
-        $reader->elementMap['{DAV:}prop'] = 'Sabre\Xml\Deserializer\keyValue';
-
-        $elems = Deserializer\keyValue($reader, 'DAV:');
-
-        // Restore previous configuration
-        $reader->popContext();
-
-        $sharee = new self();
-        if (!isset($elems['href'])) {
-            throw new BadRequest('Every {DAV:}sharee must have a {DAV:}href child-element');
-        }
-        $sharee->href = $elems['href'];
-
-        if (isset($elems['prop'])) {
-            $sharee->properties = $elems['prop'];
-        }
-        if (isset($elems['comment'])) {
-            $sharee->comment = $elems['comment'];
-        }
-        if (!isset($elems['share-access'])) {
-            throw new BadRequest('Every {DAV:}sharee must have a {DAV:}share-access child element');
-        }
-        $sharee->access = $elems['share-access']->getValue();
-
-        return $sharee;
-    }
+	/**
+	 * A URL. Usually a mailto: address, could also be a principal url.
+	 * This uniquely identifies the sharee.
+	 *
+	 * @var string
+	 */
+	public $href;
+
+	/**
+	 * A local principal path. The server will do its best to locate the
+	 * principal uri based on the given uri. If we could find a local matching
+	 * principal uri, this property will contain the value.
+	 *
+	 * @var string|null
+	 */
+	public $principal;
+
+	/**
+	 * A list of WebDAV properties that describe the sharee. This might for
+	 * example contain a {DAV:}displayname with the real name of the user.
+	 *
+	 * @var array
+	 */
+	public $properties = [];
+
+	/**
+	 * Share access level. One of the Sabre\DAV\Sharing\Plugin::ACCESS
+	 * constants.
+	 *
+	 * Can be one of:
+	 *
+	 * ACCESS_READ
+	 * ACCESS_READWRITE
+	 * ACCESS_SHAREDOWNER
+	 * ACCESS_NOACCESS
+	 *
+	 * depending on context.
+	 *
+	 * @var int
+	 */
+	public $access;
+
+	/**
+	 * When a sharee is originally invited to a share, the sharer may add
+	 * a comment. This will be placed in this property.
+	 *
+	 * @var string
+	 */
+	public $comment;
+
+	/**
+	 * The status of the invite, should be one of the
+	 * Sabre\DAV\Sharing\Plugin::INVITE constants.
+	 *
+	 * @var int
+	 */
+	public $inviteStatus;
+
+	/**
+	 * Creates the object.
+	 *
+	 * $properties will be used to populate all internal properties.
+	 */
+	public function __construct(array $properties = [])
+	{
+		foreach ($properties as $k => $v) {
+			if (property_exists($this, $k)) {
+				$this->$k = $v;
+			} else {
+				throw new \InvalidArgumentException('Unknown property: '.$k);
+			}
+		}
+	}
+
+	/**
+	 * The xmlSerialize method is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializable should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 */
+	public function xmlSerialize(Writer $writer)
+	{
+		$writer->write([
+			new Href($this->href),
+			'{DAV:}prop' => $this->properties,
+			'{DAV:}share-access' => new ShareAccess($this->access),
+		]);
+		switch ($this->inviteStatus) {
+			case Plugin::INVITE_NORESPONSE:
+				$writer->writeElement('{DAV:}invite-noresponse');
+				break;
+			case Plugin::INVITE_ACCEPTED:
+				$writer->writeElement('{DAV:}invite-accepted');
+				break;
+			case Plugin::INVITE_DECLINED:
+				$writer->writeElement('{DAV:}invite-declined');
+				break;
+			case Plugin::INVITE_INVALID:
+				$writer->writeElement('{DAV:}invite-invalid');
+				break;
+		}
+	}
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statically, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @return mixed
+	 */
+	public static function xmlDeserialize(Reader $reader)
+	{
+		// Temporarily override configuration
+		$reader->pushContext();
+		$reader->elementMap['{DAV:}share-access'] = 'Sabre\DAV\Xml\Property\ShareAccess';
+		$reader->elementMap['{DAV:}prop'] = 'Sabre\Xml\Deserializer\keyValue';
+
+		$elems = Deserializer\keyValue($reader, 'DAV:');
+
+		// Restore previous configuration
+		$reader->popContext();
+
+		$sharee = new self();
+		if (!isset($elems['href'])) {
+			throw new BadRequest('Every {DAV:}sharee must have a {DAV:}href child-element');
+		}
+		$sharee->href = $elems['href'];
+
+		if (isset($elems['prop'])) {
+			$sharee->properties = $elems['prop'];
+		}
+		if (isset($elems['comment'])) {
+			$sharee->comment = $elems['comment'];
+		}
+		if (!isset($elems['share-access'])) {
+			throw new BadRequest('Every {DAV:}sharee must have a {DAV:}share-access child element');
+		}
+		$sharee->access = $elems['share-access']->getValue();
+
+		return $sharee;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Xml/Element/Response.php

Spacing +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
         // called. But we don't want this, because a singular element without
         // child-elements implies 'no value' in {DAV:}prop, so we want to skip
         // deserializers and just set null for those.
-        $reader->elementMap['{DAV:}prop'] = function (Reader $reader) {
+        $reader->elementMap['{DAV:}prop'] = function(Reader $reader) {
             if ($reader->isEmptyElement) {
                 $reader->next();
 

Indentation +202 added lines, -202 removed lines

@@ -21,98 +21,98 @@ 
  */
 class Response implements Element
 {
-    /**
-     * Url for the response.
-     *
-     * @var string
-     */
-    protected $href;
+	/**
+	 * Url for the response.
+	 *
+	 * @var string
+	 */
+	protected $href;
 
-    /**
-     * Propertylist, ordered by HTTP status code.
-     *
-     * @var array
-     */
-    protected $responseProperties;
+	/**
+	 * Propertylist, ordered by HTTP status code.
+	 *
+	 * @var array
+	 */
+	protected $responseProperties;
 
-    /**
-     * The HTTP status for an entire response.
-     *
-     * This is currently only used in WebDAV-Sync
-     *
-     * @var string|null
-     */
-    protected $httpStatus;
+	/**
+	 * The HTTP status for an entire response.
+	 *
+	 * This is currently only used in WebDAV-Sync
+	 *
+	 * @var string|null
+	 */
+	protected $httpStatus;
 
-    /**
-     * The href argument is a url relative to the root of the server. This
-     * class will calculate the full path.
-     *
-     * The responseProperties argument is a list of properties
-     * within an array with keys representing HTTP status codes
-     *
-     * Besides specific properties, the entire {DAV:}response element may also
-     * have a http status code.
-     * In most cases you don't need it.
-     *
-     * This is currently used by the Sync extension to indicate that a node is
-     * deleted.
-     *
-     * @param string $href
-     * @param string $httpStatus
-     */
-    public function __construct($href, array $responseProperties, $httpStatus = null)
-    {
-        $this->href = $href;
-        $this->responseProperties = $responseProperties;
-        $this->httpStatus = $httpStatus;
-    }
+	/**
+	 * The href argument is a url relative to the root of the server. This
+	 * class will calculate the full path.
+	 *
+	 * The responseProperties argument is a list of properties
+	 * within an array with keys representing HTTP status codes
+	 *
+	 * Besides specific properties, the entire {DAV:}response element may also
+	 * have a http status code.
+	 * In most cases you don't need it.
+	 *
+	 * This is currently used by the Sync extension to indicate that a node is
+	 * deleted.
+	 *
+	 * @param string $href
+	 * @param string $httpStatus
+	 */
+	public function __construct($href, array $responseProperties, $httpStatus = null)
+	{
+		$this->href = $href;
+		$this->responseProperties = $responseProperties;
+		$this->httpStatus = $httpStatus;
+	}
 
-    /**
-     * Returns the url.
-     *
-     * @return string
-     */
-    public function getHref()
-    {
-        return $this->href;
-    }
+	/**
+	 * Returns the url.
+	 *
+	 * @return string
+	 */
+	public function getHref()
+	{
+		return $this->href;
+	}
 
-    /**
-     * Returns the httpStatus value.
-     *
-     * @return string
-     */
-    public function getHttpStatus()
-    {
-        return $this->httpStatus;
-    }
+	/**
+	 * Returns the httpStatus value.
+	 *
+	 * @return string
+	 */
+	public function getHttpStatus()
+	{
+		return $this->httpStatus;
+	}
 
-    /**
-     * Returns the property list.
-     *
-     * @return array
-     */
-    public function getResponseProperties()
-    {
-        return $this->responseProperties;
-    }
+	/**
+	 * Returns the property list.
+	 *
+	 * @return array
+	 */
+	public function getResponseProperties()
+	{
+		return $this->responseProperties;
+	}
 
-    /**
-     * The serialize method is called during xml writing.
-     *
-     * It should use the $writer argument to encode this object into XML.
-     *
-     * Important note: it is not needed to create the parent element. The
-     * parent element is already created, and we only have to worry about
-     * attributes, child elements and text (if any).
-     *
-     * Important note 2: If you are writing any new elements, you are also
-     * responsible for closing them.
-     */
-    public function xmlSerialize(Writer $writer)
-    {
-        /*
+	/**
+	 * The serialize method is called during xml writing.
+	 *
+	 * It should use the $writer argument to encode this object into XML.
+	 *
+	 * Important note: it is not needed to create the parent element. The
+	 * parent element is already created, and we only have to worry about
+	 * attributes, child elements and text (if any).
+	 *
+	 * Important note 2: If you are writing any new elements, you are also
+	 * responsible for closing them.
+	 */
+	public function xmlSerialize(Writer $writer)
+	{
+		/*
          * Accordingly to the RFC the element looks like:
          * <!ELEMENT response (href, ((href*, status)|(propstat+)), error?, responsedescription? , location?) >
          *
@@ -121,30 +121,30 @@ 
          *   - EITHER a status and additional href(s)
          *     OR one or more propstat(s)
          */
-        $writer->writeElement('{DAV:}href', $writer->contextUri.\Sabre\HTTP\encodePath($this->getHref()));
+		$writer->writeElement('{DAV:}href', $writer->contextUri.\Sabre\HTTP\encodePath($this->getHref()));
 
-        $empty = true;
-        $httpStatus = $this->getHTTPStatus();
+		$empty = true;
+		$httpStatus = $this->getHTTPStatus();
 
-        // Add propstat elements
-        foreach ($this->getResponseProperties() as $status => $properties) {
-            // Skipping empty lists
-            if (!$properties || (!is_int($status) && !ctype_digit($status))) {
-                continue;
-            }
-            $empty = false;
-            $writer->startElement('{DAV:}propstat');
-            $writer->writeElement('{DAV:}prop', $properties);
-            $writer->writeElement('{DAV:}status', 'HTTP/1.1 '.$status.' '.\Sabre\HTTP\Response::$statusCodes[$status]);
-            $writer->endElement(); // {DAV:}propstat
-        }
+		// Add propstat elements
+		foreach ($this->getResponseProperties() as $status => $properties) {
+			// Skipping empty lists
+			if (!$properties || (!is_int($status) && !ctype_digit($status))) {
+				continue;
+			}
+			$empty = false;
+			$writer->startElement('{DAV:}propstat');
+			$writer->writeElement('{DAV:}prop', $properties);
+			$writer->writeElement('{DAV:}status', 'HTTP/1.1 '.$status.' '.\Sabre\HTTP\Response::$statusCodes[$status]);
+			$writer->endElement(); // {DAV:}propstat
+		}
 
-        // The WebDAV spec only allows the status element on responses _without_ a propstat
-        if ($empty) {
-            if (null !== $httpStatus) {
-                $writer->writeElement('{DAV:}status', 'HTTP/1.1 '.$httpStatus.' '.\Sabre\HTTP\Response::$statusCodes[$httpStatus]);
-            } else {
-                /*
+		// The WebDAV spec only allows the status element on responses _without_ a propstat
+		if ($empty) {
+			if (null !== $httpStatus) {
+				$writer->writeElement('{DAV:}status', 'HTTP/1.1 '.$httpStatus.' '.\Sabre\HTTP\Response::$statusCodes[$httpStatus]);
+			} else {
+				/*
                 * The WebDAV spec _requires_ at least one DAV:propstat to appear for
                 * every DAV:response if there is no status.
                 * In some circumstances however, there are no properties to encode.
@@ -152,116 +152,116 @@ 
                 * In those cases we MUST specify at least one DAV:propstat anyway, with
                 * no properties.
                 */
-                $writer->writeElement('{DAV:}propstat', [
-                    '{DAV:}prop' => [],
-                    '{DAV:}status' => 'HTTP/1.1 418 '.\Sabre\HTTP\Response::$statusCodes[418],
-                ]);
-            }
-        }
-    }
+				$writer->writeElement('{DAV:}propstat', [
+					'{DAV:}prop' => [],
+					'{DAV:}status' => 'HTTP/1.1 418 '.\Sabre\HTTP\Response::$statusCodes[418],
+				]);
+			}
+		}
+	}
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statically, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Reader $reader)
-    {
-        $reader->pushContext();
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statically, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @return mixed
+	 */
+	public static function xmlDeserialize(Reader $reader)
+	{
+		$reader->pushContext();
 
-        $reader->elementMap['{DAV:}propstat'] = 'Sabre\\Xml\\Element\\KeyValue';
+		$reader->elementMap['{DAV:}propstat'] = 'Sabre\\Xml\\Element\\KeyValue';
 
-        // We are overriding the parser for {DAV:}prop. This deserializer is
-        // almost identical to the one for Sabre\Xml\Element\KeyValue.
-        //
-        // The difference is that if there are any child-elements inside of
-        // {DAV:}prop, that have no value, normally any deserializers are
-        // called. But we don't want this, because a singular element without
-        // child-elements implies 'no value' in {DAV:}prop, so we want to skip
-        // deserializers and just set null for those.
-        $reader->elementMap['{DAV:}prop'] = function (Reader $reader) {
-            if ($reader->isEmptyElement) {
-                $reader->next();
+		// We are overriding the parser for {DAV:}prop. This deserializer is
+		// almost identical to the one for Sabre\Xml\Element\KeyValue.
+		//
+		// The difference is that if there are any child-elements inside of
+		// {DAV:}prop, that have no value, normally any deserializers are
+		// called. But we don't want this, because a singular element without
+		// child-elements implies 'no value' in {DAV:}prop, so we want to skip
+		// deserializers and just set null for those.
+		$reader->elementMap['{DAV:}prop'] = function (Reader $reader) {
+			if ($reader->isEmptyElement) {
+				$reader->next();
 
-                return [];
-            }
+				return [];
+			}
 
-            if (!$reader->read()) {
-                $reader->next();
+			if (!$reader->read()) {
+				$reader->next();
 
-                return [];
-            }
+				return [];
+			}
 
-            if (Reader::END_ELEMENT === $reader->nodeType) {
-                $reader->next();
+			if (Reader::END_ELEMENT === $reader->nodeType) {
+				$reader->next();
 
-                return [];
-            }
+				return [];
+			}
 
-            $values = [];
+			$values = [];
 
-            do {
-                if (Reader::ELEMENT === $reader->nodeType) {
-                    $clark = $reader->getClark();
+			do {
+				if (Reader::ELEMENT === $reader->nodeType) {
+					$clark = $reader->getClark();
 
-                    if ($reader->isEmptyElement) {
-                        $values[$clark] = null;
-                        $reader->next();
-                    } else {
-                        $values[$clark] = $reader->parseCurrentElement()['value'];
-                    }
-                } else {
-                    if (!$reader->read()) {
-                        break;
-                    }
-                }
-            } while (Reader::END_ELEMENT !== $reader->nodeType);
+					if ($reader->isEmptyElement) {
+						$values[$clark] = null;
+						$reader->next();
+					} else {
+						$values[$clark] = $reader->parseCurrentElement()['value'];
+					}
+				} else {
+					if (!$reader->read()) {
+						break;
+					}
+				}
+			} while (Reader::END_ELEMENT !== $reader->nodeType);
 
-            $reader->read();
+			$reader->read();
 
-            return $values;
-        };
-        $elems = $reader->parseInnerTree();
-        $reader->popContext();
+			return $values;
+		};
+		$elems = $reader->parseInnerTree();
+		$reader->popContext();
 
-        $href = null;
-        $propertyLists = [];
-        $statusCode = null;
+		$href = null;
+		$propertyLists = [];
+		$statusCode = null;
 
-        foreach ($elems as $elem) {
-            switch ($elem['name']) {
-                case '{DAV:}href':
-                    $href = $elem['value'];
-                    break;
-                case '{DAV:}propstat':
-                    $status = $elem['value']['{DAV:}status'];
-                    list(, $status) = explode(' ', $status, 3);
-                    $properties = isset($elem['value']['{DAV:}prop']) ? $elem['value']['{DAV:}prop'] : [];
-                    if ($properties) {
-                        $propertyLists[$status] = $properties;
-                    }
-                    break;
-                case '{DAV:}status':
-                    list(, $statusCode) = explode(' ', $elem['value'], 3);
-                    break;
-            }
-        }
+		foreach ($elems as $elem) {
+			switch ($elem['name']) {
+				case '{DAV:}href':
+					$href = $elem['value'];
+					break;
+				case '{DAV:}propstat':
+					$status = $elem['value']['{DAV:}status'];
+					list(, $status) = explode(' ', $status, 3);
+					$properties = isset($elem['value']['{DAV:}prop']) ? $elem['value']['{DAV:}prop'] : [];
+					if ($properties) {
+						$propertyLists[$status] = $properties;
+					}
+					break;
+				case '{DAV:}status':
+					list(, $statusCode) = explode(' ', $elem['value'], 3);
+					break;
+			}
+		}
 
-        return new self($href, $propertyLists, $statusCode);
-    }
+		return new self($href, $propertyLists, $statusCode);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Xml/Element/Prop.php

Indentation +78 added lines, -78 removed lines

@@ -21,90 +21,90 @@
  */
 class Prop implements XmlDeserializable
 {
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statically, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Reader $reader)
-    {
-        // If there's no children, we don't do anything.
-        if ($reader->isEmptyElement) {
-            $reader->next();
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statically, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @return mixed
+	 */
+	public static function xmlDeserialize(Reader $reader)
+	{
+		// If there's no children, we don't do anything.
+		if ($reader->isEmptyElement) {
+			$reader->next();
 
-            return [];
-        }
+			return [];
+		}
 
-        $values = [];
+		$values = [];
 
-        $reader->read();
-        do {
-            if (Reader::ELEMENT === $reader->nodeType) {
-                $clark = $reader->getClark();
-                $values[$clark] = self::parseCurrentElement($reader)['value'];
-            } else {
-                $reader->read();
-            }
-        } while (Reader::END_ELEMENT !== $reader->nodeType);
+		$reader->read();
+		do {
+			if (Reader::ELEMENT === $reader->nodeType) {
+				$clark = $reader->getClark();
+				$values[$clark] = self::parseCurrentElement($reader)['value'];
+			} else {
+				$reader->read();
+			}
+		} while (Reader::END_ELEMENT !== $reader->nodeType);
 
-        $reader->read();
+		$reader->read();
 
-        return $values;
-    }
+		return $values;
+	}
 
-    /**
-     * This function behaves similar to Sabre\Xml\Reader::parseCurrentElement,
-     * but instead of creating deep xml array structures, it will turn any
-     * top-level element it doesn't recognize into either a string, or an
-     * XmlFragment class.
-     *
-     * This method returns arn array with 2 properties:
-     *   * name - A clark-notation XML element name.
-     *   * value - The parsed value.
-     *
-     * @return array
-     */
-    private static function parseCurrentElement(Reader $reader)
-    {
-        $name = $reader->getClark();
+	/**
+	 * This function behaves similar to Sabre\Xml\Reader::parseCurrentElement,
+	 * but instead of creating deep xml array structures, it will turn any
+	 * top-level element it doesn't recognize into either a string, or an
+	 * XmlFragment class.
+	 *
+	 * This method returns arn array with 2 properties:
+	 *   * name - A clark-notation XML element name.
+	 *   * value - The parsed value.
+	 *
+	 * @return array
+	 */
+	private static function parseCurrentElement(Reader $reader)
+	{
+		$name = $reader->getClark();
 
-        if (array_key_exists($name, $reader->elementMap)) {
-            $deserializer = $reader->elementMap[$name];
-            if (is_subclass_of($deserializer, 'Sabre\\Xml\\XmlDeserializable')) {
-                $value = call_user_func([$deserializer, 'xmlDeserialize'], $reader);
-            } elseif (is_callable($deserializer)) {
-                $value = call_user_func($deserializer, $reader);
-            } else {
-                $type = gettype($deserializer);
-                if ('string' === $type) {
-                    $type .= ' ('.$deserializer.')';
-                } elseif ('object' === $type) {
-                    $type .= ' ('.get_class($deserializer).')';
-                }
-                throw new \LogicException('Could not use this type as a deserializer: '.$type);
-            }
-        } else {
-            $value = Complex::xmlDeserialize($reader);
-        }
+		if (array_key_exists($name, $reader->elementMap)) {
+			$deserializer = $reader->elementMap[$name];
+			if (is_subclass_of($deserializer, 'Sabre\\Xml\\XmlDeserializable')) {
+				$value = call_user_func([$deserializer, 'xmlDeserialize'], $reader);
+			} elseif (is_callable($deserializer)) {
+				$value = call_user_func($deserializer, $reader);
+			} else {
+				$type = gettype($deserializer);
+				if ('string' === $type) {
+					$type .= ' ('.$deserializer.')';
+				} elseif ('object' === $type) {
+					$type .= ' ('.get_class($deserializer).')';
+				}
+				throw new \LogicException('Could not use this type as a deserializer: '.$type);
+			}
+		} else {
+			$value = Complex::xmlDeserialize($reader);
+		}
 
-        return [
-            'name' => $name,
-            'value' => $value,
-        ];
-    }
+		return [
+			'name' => $name,
+			'value' => $value,
+		];
+	}
 }