nextcloud / server

apps/dav/lib/RootCollection.php

Indentation +74 added lines, -74 removed lines

@@ -37,86 +37,86 @@
 
 class RootCollection extends SimpleCollection {
 
-	public function __construct() {
-		$config = \OC::$server->getConfig();
-		$random = \OC::$server->getSecureRandom();
-		$userManager = \OC::$server->getUserManager();
-		$db = \OC::$server->getDatabaseConnection();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$userPrincipalBackend = new Principal(
-			$userManager,
-			\OC::$server->getGroupManager()
-		);
-		$groupPrincipalBackend = new GroupPrincipalBackend(
-			\OC::$server->getGroupManager()
-		);
-		// as soon as debug mode is enabled we allow listing of principals
-		$disableListing = !$config->getSystemValue('debug', false);
+    public function __construct() {
+        $config = \OC::$server->getConfig();
+        $random = \OC::$server->getSecureRandom();
+        $userManager = \OC::$server->getUserManager();
+        $db = \OC::$server->getDatabaseConnection();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $userPrincipalBackend = new Principal(
+            $userManager,
+            \OC::$server->getGroupManager()
+        );
+        $groupPrincipalBackend = new GroupPrincipalBackend(
+            \OC::$server->getGroupManager()
+        );
+        // as soon as debug mode is enabled we allow listing of principals
+        $disableListing = !$config->getSystemValue('debug', false);
 
-		// setup the first level of the dav tree
-		$userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
-		$userPrincipals->disableListing = $disableListing;
-		$groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
-		$groupPrincipals->disableListing = $disableListing;
-		$systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
-		$systemPrincipals->disableListing = $disableListing;
-		$filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
-		$filesCollection->disableListing = $disableListing;
-		$caldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $random, $dispatcher);
-		$calendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
-		$calendarRoot->disableListing = $disableListing;
-		$publicCalendarRoot = new PublicCalendarRoot($caldavBackend);
-		$publicCalendarRoot->disableListing = $disableListing;
+        // setup the first level of the dav tree
+        $userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
+        $userPrincipals->disableListing = $disableListing;
+        $groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
+        $groupPrincipals->disableListing = $disableListing;
+        $systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
+        $systemPrincipals->disableListing = $disableListing;
+        $filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
+        $filesCollection->disableListing = $disableListing;
+        $caldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $random, $dispatcher);
+        $calendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
+        $calendarRoot->disableListing = $disableListing;
+        $publicCalendarRoot = new PublicCalendarRoot($caldavBackend);
+        $publicCalendarRoot->disableListing = $disableListing;
 
-		$systemTagCollection = new SystemTag\SystemTagsByIdCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getUserSession(),
-			\OC::$server->getGroupManager()
-		);
-		$systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getSystemTagObjectMapper(),
-			\OC::$server->getUserSession(),
-			\OC::$server->getGroupManager(),
-			\OC::$server->getEventDispatcher()
-		);
-		$commentsCollection = new Comments\RootCollection(
-			\OC::$server->getCommentsManager(),
-			\OC::$server->getUserManager(),
-			\OC::$server->getUserSession(),
-			\OC::$server->getEventDispatcher(),
-			\OC::$server->getLogger()
-		);
+        $systemTagCollection = new SystemTag\SystemTagsByIdCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getUserSession(),
+            \OC::$server->getGroupManager()
+        );
+        $systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getSystemTagObjectMapper(),
+            \OC::$server->getUserSession(),
+            \OC::$server->getGroupManager(),
+            \OC::$server->getEventDispatcher()
+        );
+        $commentsCollection = new Comments\RootCollection(
+            \OC::$server->getCommentsManager(),
+            \OC::$server->getUserManager(),
+            \OC::$server->getUserSession(),
+            \OC::$server->getEventDispatcher(),
+            \OC::$server->getLogger()
+        );
 
-		$usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, \OC::$server->getUserManager(), $dispatcher);
-		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, 'principals/users');
-		$usersAddressBookRoot->disableListing = $disableListing;
+        $usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, \OC::$server->getUserManager(), $dispatcher);
+        $usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, 'principals/users');
+        $usersAddressBookRoot->disableListing = $disableListing;
 
-		$systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, \OC::$server->getUserManager(), $dispatcher);
-		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, 'principals/system');
-		$systemAddressBookRoot->disableListing = $disableListing;
+        $systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, \OC::$server->getUserManager(), $dispatcher);
+        $systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, 'principals/system');
+        $systemAddressBookRoot->disableListing = $disableListing;
 
-		$uploadCollection = new Upload\RootCollection($userPrincipalBackend, 'principals/users');
-		$uploadCollection->disableListing = $disableListing;
+        $uploadCollection = new Upload\RootCollection($userPrincipalBackend, 'principals/users');
+        $uploadCollection->disableListing = $disableListing;
 
-		$children = [
-				new SimpleCollection('principals', [
-						$userPrincipals,
-						$groupPrincipals,
-						$systemPrincipals]),
-				$filesCollection,
-				$calendarRoot,
-				$publicCalendarRoot,
-				new SimpleCollection('addressbooks', [
-						$usersAddressBookRoot,
-						$systemAddressBookRoot]),
-				$systemTagCollection,
-				$systemTagRelationsCollection,
-				$commentsCollection,
-				$uploadCollection,
-		];
+        $children = [
+                new SimpleCollection('principals', [
+                        $userPrincipals,
+                        $groupPrincipals,
+                        $systemPrincipals]),
+                $filesCollection,
+                $calendarRoot,
+                $publicCalendarRoot,
+                new SimpleCollection('addressbooks', [
+                        $usersAddressBookRoot,
+                        $systemAddressBookRoot]),
+                $systemTagCollection,
+                $systemTagRelationsCollection,
+                $commentsCollection,
+                $uploadCollection,
+        ];
 
-		parent::__construct('root', $children);
-	}
+        parent::__construct('root', $children);
+    }
 
 }

apps/dav/lib/Files/FilesHome.php

Indentation +25 added lines, -25 removed lines

@@ -27,33 +27,33 @@
 
 class FilesHome extends Directory {
 
-	/**
-	 * @var array
-	 */
-	private $principalInfo;
+    /**
+     * @var array
+     */
+    private $principalInfo;
 
-	/**
-	 * FilesHome constructor.
-	 *
-	 * @param array $principalInfo
-	 */
-	public function __construct($principalInfo) {
-		$this->principalInfo = $principalInfo;
-		$view = \OC\Files\Filesystem::getView();
-		$rootInfo = $view->getFileInfo('');
-		parent::__construct($view, $rootInfo);
-	}
+    /**
+     * FilesHome constructor.
+     *
+     * @param array $principalInfo
+     */
+    public function __construct($principalInfo) {
+        $this->principalInfo = $principalInfo;
+        $view = \OC\Files\Filesystem::getView();
+        $rootInfo = $view->getFileInfo('');
+        parent::__construct($view, $rootInfo);
+    }
 
-	function delete() {
-		throw new Forbidden('Permission denied to delete home folder');
-	}
+    function delete() {
+        throw new Forbidden('Permission denied to delete home folder');
+    }
 
-	function getName() {
-		list(,$name) = URLUtil::splitPath($this->principalInfo['uri']);
-		return $name;
-	}
+    function getName() {
+        list(,$name) = URLUtil::splitPath($this->principalInfo['uri']);
+        return $name;
+    }
 
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
 }

apps/dav/lib/Files/BrowserErrorPagePlugin.php

Indentation +69 added lines, -69 removed lines

@@ -31,78 +31,78 @@
 use Sabre\DAV\ServerPlugin;
 
 class BrowserErrorPagePlugin extends ServerPlugin {
-	/** @var Server */
-	private $server;
+    /** @var Server */
+    private $server;
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	function initialize(Server $server) {
-		$this->server = $server;
-		$server->on('exception', array($this, 'logException'), 1000);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     * @return void
+     */
+    function initialize(Server $server) {
+        $this->server = $server;
+        $server->on('exception', array($this, 'logException'), 1000);
+    }
 
-	/**
-	 * @param IRequest $request
-	 * @return bool
-	 */
-	public static function isBrowserRequest(IRequest $request) {
-		if ($request->getMethod() !== 'GET') {
-			return false;
-		}
-		return $request->isUserAgent([
-			Request::USER_AGENT_IE,
-			Request::USER_AGENT_MS_EDGE,
-			Request::USER_AGENT_CHROME,
-			Request::USER_AGENT_FIREFOX,
-			Request::USER_AGENT_SAFARI,
-		]);
-	}
+    /**
+     * @param IRequest $request
+     * @return bool
+     */
+    public static function isBrowserRequest(IRequest $request) {
+        if ($request->getMethod() !== 'GET') {
+            return false;
+        }
+        return $request->isUserAgent([
+            Request::USER_AGENT_IE,
+            Request::USER_AGENT_MS_EDGE,
+            Request::USER_AGENT_CHROME,
+            Request::USER_AGENT_FIREFOX,
+            Request::USER_AGENT_SAFARI,
+        ]);
+    }
 
-	/**
-	 * @param \Exception $ex
-	 */
-	public function logException(\Exception $ex) {
-		if ($ex instanceof Exception) {
-			$httpCode = $ex->getHTTPCode();
-			$headers = $ex->getHTTPHeaders($this->server);
-		} else {
-			$httpCode = 500;
-			$headers = [];
-		}
-		$this->server->httpResponse->addHeaders($headers);
-		$this->server->httpResponse->setStatus($httpCode);
-		$body = $this->generateBody();
-		$this->server->httpResponse->setBody($body);
-		$this->sendResponse();
-	}
+    /**
+     * @param \Exception $ex
+     */
+    public function logException(\Exception $ex) {
+        if ($ex instanceof Exception) {
+            $httpCode = $ex->getHTTPCode();
+            $headers = $ex->getHTTPHeaders($this->server);
+        } else {
+            $httpCode = 500;
+            $headers = [];
+        }
+        $this->server->httpResponse->addHeaders($headers);
+        $this->server->httpResponse->setStatus($httpCode);
+        $body = $this->generateBody();
+        $this->server->httpResponse->setBody($body);
+        $this->sendResponse();
+    }
 
-	/**
-	 * @codeCoverageIgnore
-	 * @return bool|string
-	 */
-	public function generateBody() {
-		$request = \OC::$server->getRequest();
-		$content = new OC_Template('dav', 'exception', 'guest');
-		$content->assign('title', $this->server->httpResponse->getStatusText());
-		$content->assign('remoteAddr', $request->getRemoteAddress());
-		$content->assign('requestID', $request->getId());
-		return $content->fetchPage();
-	}
+    /**
+     * @codeCoverageIgnore
+     * @return bool|string
+     */
+    public function generateBody() {
+        $request = \OC::$server->getRequest();
+        $content = new OC_Template('dav', 'exception', 'guest');
+        $content->assign('title', $this->server->httpResponse->getStatusText());
+        $content->assign('remoteAddr', $request->getRemoteAddress());
+        $content->assign('requestID', $request->getId());
+        return $content->fetchPage();
+    }
 
-	/**
-	 * @codeCoverageIgnore
-	 */
-	public function sendResponse() {
-		$this->server->sapi->sendResponse($this->server->httpResponse);
-		exit();
-	}
+    /**
+     * @codeCoverageIgnore
+     */
+    public function sendResponse() {
+        $this->server->sapi->sendResponse($this->server->httpResponse);
+        exit();
+    }
 }

apps/dav/lib/Files/RootCollection.php

Indentation +24 added lines, -24 removed lines

@@ -28,30 +28,30 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principalInfo
-	 * @return INode
-	 */
-	function getChildForPrincipal(array $principalInfo) {
-		list(,$name) = URLUtil::splitPath($principalInfo['uri']);
-		$user = \OC::$server->getUserSession()->getUser();
-		if (is_null($user) || $name !== $user->getUID()) {
-			// a user is only allowed to see their own home contents, so in case another collection
-			// is accessed, we return a simple empty collection for now
-			// in the future this could be considered to be used for accessing shared files
-			return new SimpleCollection($name);
-		}
-		return new FilesHome($principalInfo);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return INode
+     */
+    function getChildForPrincipal(array $principalInfo) {
+        list(,$name) = URLUtil::splitPath($principalInfo['uri']);
+        $user = \OC::$server->getUserSession()->getUser();
+        if (is_null($user) || $name !== $user->getUID()) {
+            // a user is only allowed to see their own home contents, so in case another collection
+            // is accessed, we return a simple empty collection for now
+            // in the future this could be considered to be used for accessing shared files
+            return new SimpleCollection($name);
+        }
+        return new FilesHome($principalInfo);
+    }
 
-	function getName() {
-		return 'files';
-	}
+    function getName() {
+        return 'files';
+    }
 
 }

apps/dav/lib/Files/CustomPropertiesBackend.php

Indentation +233 added lines, -233 removed lines

@@ -32,238 +32,238 @@
 
 class CustomPropertiesBackend implements BackendInterface {
 
-	/**
-	 * Ignored properties
-	 *
-	 * @var array
-	 */
-	private $ignoredProperties = array(
-		'{DAV:}getcontentlength',
-		'{DAV:}getcontenttype',
-		'{DAV:}getetag',
-		'{DAV:}quota-used-bytes',
-		'{DAV:}quota-available-bytes',
-		'{http://owncloud.org/ns}permissions',
-		'{http://owncloud.org/ns}downloadURL',
-		'{http://owncloud.org/ns}dDC',
-		'{http://owncloud.org/ns}size',
-	);
-
-	/**
-	 * @var Tree
-	 */
-	private $tree;
-
-	/**
-	 * @var IDBConnection
-	 */
-	private $connection;
-
-	/**
-	 * @var string
-	 */
-	private $user;
-
-	/**
-	 * Properties cache
-	 *
-	 * @var array
-	 */
-	private $cache = [];
-
-	/**
-	 * @param Tree $tree node tree
-	 * @param IDBConnection $connection database connection
-	 * @param IUser $user owner of the tree and properties
-	 */
-	public function __construct(
-		Tree $tree,
-		IDBConnection $connection,
-		IUser $user) {
-		$this->tree = $tree;
-		$this->connection = $connection;
-		$this->user = $user->getUID();
-	}
-
-	/**
-	 * Fetches properties for a path.
-	 *
-	 * @param string $path
-	 * @param PropFind $propFind
-	 * @return void
-	 */
-	public function propFind($path, PropFind $propFind) {
-
-		$requestedProps = $propFind->get404Properties();
-
-		// these might appear
-		$requestedProps = array_diff(
-			$requestedProps,
-			$this->ignoredProperties
-		);
-
-		if (empty($requestedProps)) {
-			return;
-		}
-
-		$props = $this->getProperties($path, $requestedProps);
-		foreach ($props as $propName => $propValue) {
-			$propFind->set($propName, $propValue);
-		}
-	}
-
-	/**
-	 * Updates properties for a path
-	 *
-	 * @param string $path
-	 * @param PropPatch $propPatch
-	 *
-	 * @return void
-	 */
-	public function propPatch($path, PropPatch $propPatch) {
-		$propPatch->handleRemaining(function($changedProps) use ($path) {
-			return $this->updateProperties($path, $changedProps);
-		});
-	}
-
-	/**
-	 * This method is called after a node is deleted.
-	 *
-	 * @param string $path path of node for which to delete properties
-	 */
-	public function delete($path) {
-		$statement = $this->connection->prepare(
-			'DELETE FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?'
-		);
-		$statement->execute(array($this->user, $path));
-		$statement->closeCursor();
-
-		unset($this->cache[$path]);
-	}
-
-	/**
-	 * This method is called after a successful MOVE
-	 *
-	 * @param string $source
-	 * @param string $destination
-	 *
-	 * @return void
-	 */
-	public function move($source, $destination) {
-		$statement = $this->connection->prepare(
-			'UPDATE `*PREFIX*properties` SET `propertypath` = ?' .
-			' WHERE `userid` = ? AND `propertypath` = ?'
-		);
-		$statement->execute(array($destination, $this->user, $source));
-		$statement->closeCursor();
-	}
-
-	/**
-	 * Returns a list of properties for this nodes.;
-	 * @param string $path
-	 * @param array $requestedProperties requested properties or empty array for "all"
-	 * @return array
-	 * @note The properties list is a list of propertynames the client
-	 * requested, encoded as xmlnamespace#tagName, for example:
-	 * http://www.example.org/namespace#author If the array is empty, all
-	 * properties should be returned
-	 */
-	private function getProperties($path, array $requestedProperties) {
-		if (isset($this->cache[$path])) {
-			return $this->cache[$path];
-		}
-
-		// TODO: chunking if more than 1000 properties
-		$sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?';
-
-		$whereValues = array($this->user, $path);
-		$whereTypes = array(null, null);
-
-		if (!empty($requestedProperties)) {
-			// request only a subset
-			$sql .= ' AND `propertyname` in (?)';
-			$whereValues[] = $requestedProperties;
-			$whereTypes[] = \Doctrine\DBAL\Connection::PARAM_STR_ARRAY;
-		}
-
-		$result = $this->connection->executeQuery(
-			$sql,
-			$whereValues,
-			$whereTypes
-		);
-
-		$props = [];
-		while ($row = $result->fetch()) {
-			$props[$row['propertyname']] = $row['propertyvalue'];
-		}
-
-		$result->closeCursor();
-
-		$this->cache[$path] = $props;
-		return $props;
-	}
-
-	/**
-	 * Update properties
-	 *
-	 * @param string $path node for which to update properties
-	 * @param array $properties array of properties to update
-	 *
-	 * @return bool
-	 */
-	private function updateProperties($path, $properties) {
-
-		$deleteStatement = 'DELETE FROM `*PREFIX*properties`' .
-			' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?';
-
-		$insertStatement = 'INSERT INTO `*PREFIX*properties`' .
-			' (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)';
-
-		$updateStatement = 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?' .
-			' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?';
-
-		// TODO: use "insert or update" strategy ?
-		$existing = $this->getProperties($path, array());
-		$this->connection->beginTransaction();
-		foreach ($properties as $propertyName => $propertyValue) {
-			// If it was null, we need to delete the property
-			if (is_null($propertyValue)) {
-				if (array_key_exists($propertyName, $existing)) {
-					$this->connection->executeUpdate($deleteStatement,
-						array(
-							$this->user,
-							$path,
-							$propertyName
-						)
-					);
-				}
-			} else {
-				if (!array_key_exists($propertyName, $existing)) {
-					$this->connection->executeUpdate($insertStatement,
-						array(
-							$this->user,
-							$path,
-							$propertyName,
-							$propertyValue
-						)
-					);
-				} else {
-					$this->connection->executeUpdate($updateStatement,
-						array(
-							$propertyValue,
-							$this->user,
-							$path,
-							$propertyName
-						)
-					);
-				}
-			}
-		}
-
-		$this->connection->commit();
-		unset($this->cache[$path]);
-
-		return true;
-	}
+    /**
+     * Ignored properties
+     *
+     * @var array
+     */
+    private $ignoredProperties = array(
+        '{DAV:}getcontentlength',
+        '{DAV:}getcontenttype',
+        '{DAV:}getetag',
+        '{DAV:}quota-used-bytes',
+        '{DAV:}quota-available-bytes',
+        '{http://owncloud.org/ns}permissions',
+        '{http://owncloud.org/ns}downloadURL',
+        '{http://owncloud.org/ns}dDC',
+        '{http://owncloud.org/ns}size',
+    );
+
+    /**
+     * @var Tree
+     */
+    private $tree;
+
+    /**
+     * @var IDBConnection
+     */
+    private $connection;
+
+    /**
+     * @var string
+     */
+    private $user;
+
+    /**
+     * Properties cache
+     *
+     * @var array
+     */
+    private $cache = [];
+
+    /**
+     * @param Tree $tree node tree
+     * @param IDBConnection $connection database connection
+     * @param IUser $user owner of the tree and properties
+     */
+    public function __construct(
+        Tree $tree,
+        IDBConnection $connection,
+        IUser $user) {
+        $this->tree = $tree;
+        $this->connection = $connection;
+        $this->user = $user->getUID();
+    }
+
+    /**
+     * Fetches properties for a path.
+     *
+     * @param string $path
+     * @param PropFind $propFind
+     * @return void
+     */
+    public function propFind($path, PropFind $propFind) {
+
+        $requestedProps = $propFind->get404Properties();
+
+        // these might appear
+        $requestedProps = array_diff(
+            $requestedProps,
+            $this->ignoredProperties
+        );
+
+        if (empty($requestedProps)) {
+            return;
+        }
+
+        $props = $this->getProperties($path, $requestedProps);
+        foreach ($props as $propName => $propValue) {
+            $propFind->set($propName, $propValue);
+        }
+    }
+
+    /**
+     * Updates properties for a path
+     *
+     * @param string $path
+     * @param PropPatch $propPatch
+     *
+     * @return void
+     */
+    public function propPatch($path, PropPatch $propPatch) {
+        $propPatch->handleRemaining(function($changedProps) use ($path) {
+            return $this->updateProperties($path, $changedProps);
+        });
+    }
+
+    /**
+     * This method is called after a node is deleted.
+     *
+     * @param string $path path of node for which to delete properties
+     */
+    public function delete($path) {
+        $statement = $this->connection->prepare(
+            'DELETE FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?'
+        );
+        $statement->execute(array($this->user, $path));
+        $statement->closeCursor();
+
+        unset($this->cache[$path]);
+    }
+
+    /**
+     * This method is called after a successful MOVE
+     *
+     * @param string $source
+     * @param string $destination
+     *
+     * @return void
+     */
+    public function move($source, $destination) {
+        $statement = $this->connection->prepare(
+            'UPDATE `*PREFIX*properties` SET `propertypath` = ?' .
+            ' WHERE `userid` = ? AND `propertypath` = ?'
+        );
+        $statement->execute(array($destination, $this->user, $source));
+        $statement->closeCursor();
+    }
+
+    /**
+     * Returns a list of properties for this nodes.;
+     * @param string $path
+     * @param array $requestedProperties requested properties or empty array for "all"
+     * @return array
+     * @note The properties list is a list of propertynames the client
+     * requested, encoded as xmlnamespace#tagName, for example:
+     * http://www.example.org/namespace#author If the array is empty, all
+     * properties should be returned
+     */
+    private function getProperties($path, array $requestedProperties) {
+        if (isset($this->cache[$path])) {
+            return $this->cache[$path];
+        }
+
+        // TODO: chunking if more than 1000 properties
+        $sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?';
+
+        $whereValues = array($this->user, $path);
+        $whereTypes = array(null, null);
+
+        if (!empty($requestedProperties)) {
+            // request only a subset
+            $sql .= ' AND `propertyname` in (?)';
+            $whereValues[] = $requestedProperties;
+            $whereTypes[] = \Doctrine\DBAL\Connection::PARAM_STR_ARRAY;
+        }
+
+        $result = $this->connection->executeQuery(
+            $sql,
+            $whereValues,
+            $whereTypes
+        );
+
+        $props = [];
+        while ($row = $result->fetch()) {
+            $props[$row['propertyname']] = $row['propertyvalue'];
+        }
+
+        $result->closeCursor();
+
+        $this->cache[$path] = $props;
+        return $props;
+    }
+
+    /**
+     * Update properties
+     *
+     * @param string $path node for which to update properties
+     * @param array $properties array of properties to update
+     *
+     * @return bool
+     */
+    private function updateProperties($path, $properties) {
+
+        $deleteStatement = 'DELETE FROM `*PREFIX*properties`' .
+            ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?';
+
+        $insertStatement = 'INSERT INTO `*PREFIX*properties`' .
+            ' (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)';
+
+        $updateStatement = 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?' .
+            ' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?';
+
+        // TODO: use "insert or update" strategy ?
+        $existing = $this->getProperties($path, array());
+        $this->connection->beginTransaction();
+        foreach ($properties as $propertyName => $propertyValue) {
+            // If it was null, we need to delete the property
+            if (is_null($propertyValue)) {
+                if (array_key_exists($propertyName, $existing)) {
+                    $this->connection->executeUpdate($deleteStatement,
+                        array(
+                            $this->user,
+                            $path,
+                            $propertyName
+                        )
+                    );
+                }
+            } else {
+                if (!array_key_exists($propertyName, $existing)) {
+                    $this->connection->executeUpdate($insertStatement,
+                        array(
+                            $this->user,
+                            $path,
+                            $propertyName,
+                            $propertyValue
+                        )
+                    );
+                } else {
+                    $this->connection->executeUpdate($updateStatement,
+                        array(
+                            $propertyValue,
+                            $this->user,
+                            $path,
+                            $propertyName
+                        )
+                    );
+                }
+            }
+        }
+
+        $this->connection->commit();
+        unset($this->cache[$path]);
+
+        return true;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -151,7 +151,7 @@ 
 	 */
 	public function move($source, $destination) {
 		$statement = $this->connection->prepare(
-			'UPDATE `*PREFIX*properties` SET `propertypath` = ?' .
+			'UPDATE `*PREFIX*properties` SET `propertypath` = ?'.
 			' WHERE `userid` = ? AND `propertypath` = ?'
 		);
 		$statement->execute(array($destination, $this->user, $source));
@@ -213,13 +213,13 @@ 
 	 */
 	private function updateProperties($path, $properties) {
 
-		$deleteStatement = 'DELETE FROM `*PREFIX*properties`' .
+		$deleteStatement = 'DELETE FROM `*PREFIX*properties`'.
 			' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?';
 
-		$insertStatement = 'INSERT INTO `*PREFIX*properties`' .
+		$insertStatement = 'INSERT INTO `*PREFIX*properties`'.
 			' (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)';
 
-		$updateStatement = 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?' .
+		$updateStatement = 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ?'.
 			' WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?';
 
 		// TODO: use "insert or update" strategy ?

apps/dav/lib/Files/Sharing/PublicLinkCheckPlugin.php

Indentation +26 added lines, -26 removed lines

@@ -32,33 +32,33 @@
  * Verify that the public link share is valid
  */
 class PublicLinkCheckPlugin extends ServerPlugin {
-	/**
-	 * @var FileInfo
-	 */
-	private $fileInfo;
+    /**
+     * @var FileInfo
+     */
+    private $fileInfo;
 
-	/**
-	 * @param FileInfo $fileInfo
-	 */
-	public function setFileInfo($fileInfo) {
-		$this->fileInfo = $fileInfo;
-	}
+    /**
+     * @param FileInfo $fileInfo
+     */
+    public function setFileInfo($fileInfo) {
+        $this->fileInfo = $fileInfo;
+    }
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('beforeMethod', [$this, 'beforeMethod']);
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->on('beforeMethod', [$this, 'beforeMethod']);
+    }
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response){
-		// verify that the owner didn't have his share permissions revoked
-		if ($this->fileInfo && !$this->fileInfo->isShareable()) {
-			throw new NotFound();
-		}
-	}
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response){
+        // verify that the owner didn't have his share permissions revoked
+        if ($this->fileInfo && !$this->fileInfo->isShareable()) {
+            throw new NotFound();
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		$server->on('beforeMethod', [$this, 'beforeMethod']);
 	}
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response){
+	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
 		// verify that the owner didn't have his share permissions revoked
 		if ($this->fileInfo && !$this->fileInfo->isShareable()) {
 			throw new NotFound();

apps/dav/lib/Files/Sharing/FilesDropPlugin.php

Indentation +38 added lines, -38 removed lines

@@ -33,52 +33,52 @@
  */
 class FilesDropPlugin extends ServerPlugin {
 
-	/** @var View */
-	private $view;
+    /** @var View */
+    private $view;
 
-	/** @var bool */
-	private $enabled = false;
+    /** @var bool */
+    private $enabled = false;
 
-	/**
-	 * @param View $view
-	 */
-	public function setView($view) {
-		$this->view = $view;
-	}
+    /**
+     * @param View $view
+     */
+    public function setView($view) {
+        $this->view = $view;
+    }
 
-	public function enable() {
-		$this->enabled = true;
-	}
+    public function enable() {
+        $this->enabled = true;
+    }
 
 
-	/**
-	 * This initializes the plugin.
-	 *
-	 * @param \Sabre\DAV\Server $server Sabre server
-	 *
-	 * @return void
-	 * @throws MethodNotAllowed
-	 */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$server->on('beforeMethod', [$this, 'beforeMethod'], 999);
-		$this->enabled = false;
-	}
+    /**
+     * This initializes the plugin.
+     *
+     * @param \Sabre\DAV\Server $server Sabre server
+     *
+     * @return void
+     * @throws MethodNotAllowed
+     */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $server->on('beforeMethod', [$this, 'beforeMethod'], 999);
+        $this->enabled = false;
+    }
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response){
+    public function beforeMethod(RequestInterface $request, ResponseInterface $response){
 
-		if (!$this->enabled) {
-			return;
-		}
+        if (!$this->enabled) {
+            return;
+        }
 
-		if ($request->getMethod() !== 'PUT') {
-			throw new MethodNotAllowed('Only PUT is allowed on files drop');
-		}
+        if ($request->getMethod() !== 'PUT') {
+            throw new MethodNotAllowed('Only PUT is allowed on files drop');
+        }
 
-		$path = explode('/', $request->getPath());
-		$path = array_pop($path);
+        $path = explode('/', $request->getPath());
+        $path = array_pop($path);
 
-		$newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
-		$url = $request->getBaseUrl() . $newName;
-		$request->setUrl($url);
-	}
+        $newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
+        $url = $request->getBaseUrl() . $newName;
+        $request->setUrl($url);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 		$this->enabled = false;
 	}
 
-	public function beforeMethod(RequestInterface $request, ResponseInterface $response){
+	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
 
 		if (!$this->enabled) {
 			return;
@@ -78,7 +78,7 @@ 
 		$path = array_pop($path);
 
 		$newName = \OC_Helper::buildNotExistingFileNameForView('/', $path, $this->view);
-		$url = $request->getBaseUrl() . $newName;
+		$url = $request->getBaseUrl().$newName;
 		$request->setUrl($url);
 	}
 }

apps/dav/lib/Upload/UploadFolder.php

Indentation +40 added lines, -40 removed lines

@@ -28,54 +28,54 @@
 
 class UploadFolder implements ICollection {
 
-	private $node;
+    private $node;
 
-	function __construct(Directory $node) {
-		$this->node = $node;
-	}
+    function __construct(Directory $node) {
+        $this->node = $node;
+    }
 
-	function createFile($name, $data = null) {
-		// TODO: verify name - should be a simple number
-		$this->node->createFile($name, $data);
-	}
+    function createFile($name, $data = null) {
+        // TODO: verify name - should be a simple number
+        $this->node->createFile($name, $data);
+    }
 
-	function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
-	}
+    function createDirectory($name) {
+        throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+    }
 
-	function getChild($name) {
-		if ($name === '.file') {
-			return new FutureFile($this->node, '.file');
-		}
-		return $this->node->getChild($name);
-	}
+    function getChild($name) {
+        if ($name === '.file') {
+            return new FutureFile($this->node, '.file');
+        }
+        return $this->node->getChild($name);
+    }
 
-	function getChildren() {
-		$children = $this->node->getChildren();
-		$children[] = new FutureFile($this->node, '.file');
-		return $children;
-	}
+    function getChildren() {
+        $children = $this->node->getChildren();
+        $children[] = new FutureFile($this->node, '.file');
+        return $children;
+    }
 
-	function childExists($name) {
-		if ($name === '.file') {
-			return true;
-		}
-		return $this->node->childExists($name);
-	}
+    function childExists($name) {
+        if ($name === '.file') {
+            return true;
+        }
+        return $this->node->childExists($name);
+    }
 
-	function delete() {
-		$this->node->delete();
-	}
+    function delete() {
+        $this->node->delete();
+    }
 
-	function getName() {
-		return $this->node->getName();
-	}
+    function getName() {
+        return $this->node->getName();
+    }
 
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
 
-	function getLastModified() {
-		return $this->node->getLastModified();
-	}
+    function getLastModified() {
+        return $this->node->getLastModified();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 	}
 
 	function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+		throw new Forbidden('Permission denied to create file (filename '.$name.')');
 	}
 
 	function getChild($name) {

apps/dav/lib/Upload/UploadHome.php

Indentation +52 added lines, -52 removed lines

@@ -29,66 +29,66 @@
 use Sabre\DAV\ICollection;
 
 class UploadHome implements ICollection {
-	/**
-	 * UploadHome constructor.
-	 *
-	 * @param array $principalInfo
-	 */
-	public function __construct($principalInfo) {
-		$this->principalInfo = $principalInfo;
-	}
+    /**
+     * UploadHome constructor.
+     *
+     * @param array $principalInfo
+     */
+    public function __construct($principalInfo) {
+        $this->principalInfo = $principalInfo;
+    }
 
-	function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
-	}
+    function createFile($name, $data = null) {
+        throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+    }
 
-	function createDirectory($name) {
-		$this->impl()->createDirectory($name);
-	}
+    function createDirectory($name) {
+        $this->impl()->createDirectory($name);
+    }
 
-	function getChild($name) {
-		return new UploadFolder($this->impl()->getChild($name));
-	}
+    function getChild($name) {
+        return new UploadFolder($this->impl()->getChild($name));
+    }
 
-	function getChildren() {
-		return array_map(function($node) {
-			return new UploadFolder($node);
-		}, $this->impl()->getChildren());
-	}
+    function getChildren() {
+        return array_map(function($node) {
+            return new UploadFolder($node);
+        }, $this->impl()->getChildren());
+    }
 
-	function childExists($name) {
-		return !is_null($this->getChild($name));
-	}
+    function childExists($name) {
+        return !is_null($this->getChild($name));
+    }
 
-	function delete() {
-		$this->impl()->delete();
-	}
+    function delete() {
+        $this->impl()->delete();
+    }
 
-	function getName() {
-		return 'uploads';
-	}
+    function getName() {
+        return 'uploads';
+    }
 
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
 
-	function getLastModified() {
-		return $this->impl()->getLastModified();
-	}
+    function getLastModified() {
+        return $this->impl()->getLastModified();
+    }
 
-	/**
-	 * @return Directory
-	 */
-	private function impl() {
-		$rootView = new View();
-		$user = \OC::$server->getUserSession()->getUser();
-		Filesystem::initMountPoints($user->getUID());
-		if (!$rootView->file_exists('/' . $user->getUID() . '/uploads')) {
-			$rootView->mkdir('/' . $user->getUID() . '/uploads');
-		}
-		$view = new View('/' . $user->getUID() . '/uploads');
-		$rootInfo = $view->getFileInfo('');
-		$impl = new Directory($view, $rootInfo);
-		return $impl;
-	}
+    /**
+     * @return Directory
+     */
+    private function impl() {
+        $rootView = new View();
+        $user = \OC::$server->getUserSession()->getUser();
+        Filesystem::initMountPoints($user->getUID());
+        if (!$rootView->file_exists('/' . $user->getUID() . '/uploads')) {
+            $rootView->mkdir('/' . $user->getUID() . '/uploads');
+        }
+        $view = new View('/' . $user->getUID() . '/uploads');
+        $rootInfo = $view->getFileInfo('');
+        $impl = new Directory($view, $rootInfo);
+        return $impl;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
 	}
 
 	function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+		throw new Forbidden('Permission denied to create file (filename '.$name.')');
 	}
 
 	function createDirectory($name) {
@@ -83,10 +83,10 @@ 
 		$rootView = new View();
 		$user = \OC::$server->getUserSession()->getUser();
 		Filesystem::initMountPoints($user->getUID());
-		if (!$rootView->file_exists('/' . $user->getUID() . '/uploads')) {
-			$rootView->mkdir('/' . $user->getUID() . '/uploads');
+		if (!$rootView->file_exists('/'.$user->getUID().'/uploads')) {
+			$rootView->mkdir('/'.$user->getUID().'/uploads');
 		}
-		$view = new View('/' . $user->getUID() . '/uploads');
+		$view = new View('/'.$user->getUID().'/uploads');
 		$rootInfo = $view->getFileInfo('');
 		$impl = new Directory($view, $rootInfo);
 		return $impl;