nextcloud / server

apps/dav/lib/DAV/Sharing/Xml/ShareRequest.php

Indentation +39 added lines, -39 removed lines

@@ -26,54 +26,54 @@
 use Sabre\Xml\XmlDeserializable;
 
 class ShareRequest implements XmlDeserializable {
-	public $set = [];
+    public $set = [];
 
-	public $remove = [];
+    public $remove = [];
 
-	/**
-	 * Constructor
-	 *
-	 * @param array $set
-	 * @param array $remove
-	 */
-	public function __construct(array $set, array $remove) {
-		$this->set = $set;
-		$this->remove = $remove;
-	}
+    /**
+     * Constructor
+     *
+     * @param array $set
+     * @param array $remove
+     */
+    public function __construct(array $set, array $remove) {
+        $this->set = $set;
+        $this->remove = $remove;
+    }
 
-	public static function xmlDeserialize(Reader $reader) {
-		$elements = $reader->parseInnerTree([
-			'{' . Plugin::NS_OWNCLOUD. '}set' => 'Sabre\\Xml\\Element\\KeyValue',
-			'{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
-		]);
+    public static function xmlDeserialize(Reader $reader) {
+        $elements = $reader->parseInnerTree([
+            '{' . Plugin::NS_OWNCLOUD. '}set' => 'Sabre\\Xml\\Element\\KeyValue',
+            '{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+        ]);
 
-		$set = [];
-		$remove = [];
+        $set = [];
+        $remove = [];
 
-		foreach ($elements as $elem) {
-			switch ($elem['name']) {
+        foreach ($elements as $elem) {
+            switch ($elem['name']) {
 
-				case '{' . Plugin::NS_OWNCLOUD . '}set':
-					$sharee = $elem['value'];
+                case '{' . Plugin::NS_OWNCLOUD . '}set':
+                    $sharee = $elem['value'];
 
-					$sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
-					$commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
+                    $sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
+                    $commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
 
-					$set[] = [
-						'href' => $sharee['{DAV:}href'],
-						'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
-						'summary' => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-						'readOnly' => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
-					];
-					break;
+                    $set[] = [
+                        'href' => $sharee['{DAV:}href'],
+                        'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
+                        'summary' => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
+                        'readOnly' => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
+                    ];
+                    break;
 
-				case '{' . Plugin::NS_OWNCLOUD . '}remove':
-					$remove[] = $elem['value']['{DAV:}href'];
-					break;
+                case '{' . Plugin::NS_OWNCLOUD . '}remove':
+                    $remove[] = $elem['value']['{DAV:}href'];
+                    break;
 
-			}
-		}
+            }
+        }
 
-		return new self($set, $remove);
-	}
+        return new self($set, $remove);
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -43,8 +43,8 @@ 
 
 	public static function xmlDeserialize(Reader $reader) {
 		$elements = $reader->parseInnerTree([
-			'{' . Plugin::NS_OWNCLOUD. '}set' => 'Sabre\\Xml\\Element\\KeyValue',
-			'{' . Plugin::NS_OWNCLOUD . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
+			'{'.Plugin::NS_OWNCLOUD.'}set' => 'Sabre\\Xml\\Element\\KeyValue',
+			'{'.Plugin::NS_OWNCLOUD.'}remove' => 'Sabre\\Xml\\Element\\KeyValue',
 		]);
 
 		$set = [];
@@ -53,21 +53,21 @@ 
 		foreach ($elements as $elem) {
 			switch ($elem['name']) {
 
-				case '{' . Plugin::NS_OWNCLOUD . '}set':
+				case '{'.Plugin::NS_OWNCLOUD.'}set':
 					$sharee = $elem['value'];
 
-					$sumElem = '{' . Plugin::NS_OWNCLOUD . '}summary';
-					$commonName = '{' . Plugin::NS_OWNCLOUD . '}common-name';
+					$sumElem = '{'.Plugin::NS_OWNCLOUD.'}summary';
+					$commonName = '{'.Plugin::NS_OWNCLOUD.'}common-name';
 
 					$set[] = [
 						'href' => $sharee['{DAV:}href'],
 						'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
 						'summary' => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-						'readOnly' => !array_key_exists('{' . Plugin::NS_OWNCLOUD . '}read-write', $sharee),
+						'readOnly' => !array_key_exists('{'.Plugin::NS_OWNCLOUD.'}read-write', $sharee),
 					];
 					break;
 
-				case '{' . Plugin::NS_OWNCLOUD . '}remove':
+				case '{'.Plugin::NS_OWNCLOUD.'}remove':
 					$remove[] = $elem['value']['{DAV:}href'];
 					break;
 

apps/dav/lib/DAV/Sharing/Backend.php

Spacing +3 added lines, -3 removed lines

@@ -191,13 +191,13 @@ 
 		foreach ($shares as $share) {
 			$acl[] = [
 				'privilege' => '{DAV:}read',
-				'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+				'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'],
 				'protected' => true,
 			];
 			if (!$share['readOnly']) {
 				$acl[] = [
 					'privilege' => '{DAV:}write',
-					'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+					'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'],
 					'protected' => true,
 				];
 			} elseif ($this->resourceType === 'calendar') {
@@ -205,7 +205,7 @@ 
 				// so users can change the visibility.
 				$acl[] = [
 					'privilege' => '{DAV:}write-properties',
-					'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+					'principal' => $share['{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}principal'],
 					'protected' => true,
 				];
 			}

Indentation +211 added lines, -211 removed lines

@@ -36,215 +36,215 @@
 
 class Backend {
 
-	/** @var IDBConnection */
-	private $db;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var Principal */
-	private $principalBackend;
-	/** @var string */
-	private $resourceType;
-
-	public const ACCESS_OWNER = 1;
-	public const ACCESS_READ_WRITE = 2;
-	public const ACCESS_READ = 3;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param Principal $principalBackend
-	 * @param string $resourceType
-	 */
-	public function __construct(IDBConnection $db, IUserManager $userManager, IGroupManager $groupManager, Principal $principalBackend, $resourceType) {
-		$this->db = $db;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->principalBackend = $principalBackend;
-		$this->resourceType = $resourceType;
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param string[] $add
-	 * @param string[] $remove
-	 */
-	public function updateShares(IShareable $shareable, array $add, array $remove) {
-		foreach ($add as $element) {
-			$principal = $this->principalBackend->findByUri($element['href'], '');
-			if ($principal !== '') {
-				$this->shareWith($shareable, $element);
-			}
-		}
-		foreach ($remove as $element) {
-			$principal = $this->principalBackend->findByUri($element, '');
-			if ($principal !== '') {
-				$this->unshare($shareable, $element);
-			}
-		}
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param string $element
-	 */
-	private function shareWith($shareable, $element) {
-		$user = $element['href'];
-		$parts = explode(':', $user, 2);
-		if ($parts[0] !== 'principal') {
-			return;
-		}
-
-		// don't share with owner
-		if ($shareable->getOwner() === $parts[1]) {
-			return;
-		}
-
-		$principal = explode('/', $parts[1], 3);
-		if (count($principal) !== 3 || $principal[0] !== 'principals' || !in_array($principal[1], ['users', 'groups', 'circles'], true)) {
-			// Invalid principal
-			return;
-		}
-
-		$principal[2] = urldecode($principal[2]);
-		if (($principal[1] === 'users' && !$this->userManager->userExists($principal[2])) ||
-			($principal[1] === 'groups' && !$this->groupManager->groupExists($principal[2]))) {
-			// User or group does not exist
-			return;
-		}
-
-		// remove the share if it already exists
-		$this->unshare($shareable, $element['href']);
-		$access = self::ACCESS_READ;
-		if (isset($element['readOnly'])) {
-			$access = $element['readOnly'] ? self::ACCESS_READ : self::ACCESS_READ_WRITE;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('dav_shares')
-			->values([
-				'principaluri' => $query->createNamedParameter($parts[1]),
-				'type' => $query->createNamedParameter($this->resourceType),
-				'access' => $query->createNamedParameter($access),
-				'resourceid' => $query->createNamedParameter($shareable->getResourceId())
-			]);
-		$query->execute();
-	}
-
-	/**
-	 * @param $resourceId
-	 */
-	public function deleteAllShares($resourceId) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->execute();
-	}
-
-	public function deleteAllSharesByUser($principaluri) {
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principaluri)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->execute();
-	}
-
-	/**
-	 * @param IShareable $shareable
-	 * @param string $element
-	 */
-	private function unshare($shareable, $element) {
-		$parts = explode(':', $element, 2);
-		if ($parts[0] !== 'principal') {
-			return;
-		}
-
-		// don't share with owner
-		if ($shareable->getOwner() === $parts[1]) {
-			return;
-		}
-
-		$query = $this->db->getQueryBuilder();
-		$query->delete('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($shareable->getResourceId())))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($parts[1])))
-		;
-		$query->execute();
-	}
-
-	/**
-	 * Returns the list of people whom this resource is shared with.
-	 *
-	 * Every element in this array should have the following properties:
-	 *   * href - Often a mailto: address
-	 *   * commonName - Optional, for example a first + last name
-	 *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-	 *   * readOnly - boolean
-	 *   * summary - Optional, a description for the share
-	 *
-	 * @param int $resourceId
-	 * @return array
-	 */
-	public function getShares($resourceId) {
-		$query = $this->db->getQueryBuilder();
-		$result = $query->select(['principaluri', 'access'])
-			->from('dav_shares')
-			->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
-			->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
-			->groupBy(['principaluri', 'access'])
-			->execute();
-
-		$shares = [];
-		while ($row = $result->fetch()) {
-			$p = $this->principalBackend->getPrincipalByPath($row['principaluri']);
-			$shares[] = [
-				'href' => "principal:${row['principaluri']}",
-				'commonName' => isset($p['{DAV:}displayname']) ? $p['{DAV:}displayname'] : '',
-				'status' => 1,
-				'readOnly' => (int) $row['access'] === self::ACCESS_READ,
-				'{http://owncloud.org/ns}principal' => $row['principaluri'],
-				'{http://owncloud.org/ns}group-share' => is_null($p)
-			];
-		}
-
-		return $shares;
-	}
-
-	/**
-	 * For shared resources the sharee is set in the ACL of the resource
-	 *
-	 * @param int $resourceId
-	 * @param array $acl
-	 * @return array
-	 */
-	public function applyShareAcl($resourceId, $acl) {
-		$shares = $this->getShares($resourceId);
-		foreach ($shares as $share) {
-			$acl[] = [
-				'privilege' => '{DAV:}read',
-				'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
-				'protected' => true,
-			];
-			if (!$share['readOnly']) {
-				$acl[] = [
-					'privilege' => '{DAV:}write',
-					'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
-					'protected' => true,
-				];
-			} elseif ($this->resourceType === 'calendar') {
-				// Allow changing the properties of read only calendars,
-				// so users can change the visibility.
-				$acl[] = [
-					'privilege' => '{DAV:}write-properties',
-					'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
-					'protected' => true,
-				];
-			}
-		}
-		return $acl;
-	}
+    /** @var IDBConnection */
+    private $db;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var Principal */
+    private $principalBackend;
+    /** @var string */
+    private $resourceType;
+
+    public const ACCESS_OWNER = 1;
+    public const ACCESS_READ_WRITE = 2;
+    public const ACCESS_READ = 3;
+
+    /**
+     * @param IDBConnection $db
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param Principal $principalBackend
+     * @param string $resourceType
+     */
+    public function __construct(IDBConnection $db, IUserManager $userManager, IGroupManager $groupManager, Principal $principalBackend, $resourceType) {
+        $this->db = $db;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->principalBackend = $principalBackend;
+        $this->resourceType = $resourceType;
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param string[] $add
+     * @param string[] $remove
+     */
+    public function updateShares(IShareable $shareable, array $add, array $remove) {
+        foreach ($add as $element) {
+            $principal = $this->principalBackend->findByUri($element['href'], '');
+            if ($principal !== '') {
+                $this->shareWith($shareable, $element);
+            }
+        }
+        foreach ($remove as $element) {
+            $principal = $this->principalBackend->findByUri($element, '');
+            if ($principal !== '') {
+                $this->unshare($shareable, $element);
+            }
+        }
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param string $element
+     */
+    private function shareWith($shareable, $element) {
+        $user = $element['href'];
+        $parts = explode(':', $user, 2);
+        if ($parts[0] !== 'principal') {
+            return;
+        }
+
+        // don't share with owner
+        if ($shareable->getOwner() === $parts[1]) {
+            return;
+        }
+
+        $principal = explode('/', $parts[1], 3);
+        if (count($principal) !== 3 || $principal[0] !== 'principals' || !in_array($principal[1], ['users', 'groups', 'circles'], true)) {
+            // Invalid principal
+            return;
+        }
+
+        $principal[2] = urldecode($principal[2]);
+        if (($principal[1] === 'users' && !$this->userManager->userExists($principal[2])) ||
+            ($principal[1] === 'groups' && !$this->groupManager->groupExists($principal[2]))) {
+            // User or group does not exist
+            return;
+        }
+
+        // remove the share if it already exists
+        $this->unshare($shareable, $element['href']);
+        $access = self::ACCESS_READ;
+        if (isset($element['readOnly'])) {
+            $access = $element['readOnly'] ? self::ACCESS_READ : self::ACCESS_READ_WRITE;
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('dav_shares')
+            ->values([
+                'principaluri' => $query->createNamedParameter($parts[1]),
+                'type' => $query->createNamedParameter($this->resourceType),
+                'access' => $query->createNamedParameter($access),
+                'resourceid' => $query->createNamedParameter($shareable->getResourceId())
+            ]);
+        $query->execute();
+    }
+
+    /**
+     * @param $resourceId
+     */
+    public function deleteAllShares($resourceId) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->execute();
+    }
+
+    public function deleteAllSharesByUser($principaluri) {
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('principaluri', $query->createNamedParameter($principaluri)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->execute();
+    }
+
+    /**
+     * @param IShareable $shareable
+     * @param string $element
+     */
+    private function unshare($shareable, $element) {
+        $parts = explode(':', $element, 2);
+        if ($parts[0] !== 'principal') {
+            return;
+        }
+
+        // don't share with owner
+        if ($shareable->getOwner() === $parts[1]) {
+            return;
+        }
+
+        $query = $this->db->getQueryBuilder();
+        $query->delete('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($shareable->getResourceId())))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->andWhere($query->expr()->eq('principaluri', $query->createNamedParameter($parts[1])))
+        ;
+        $query->execute();
+    }
+
+    /**
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every element in this array should have the following properties:
+     *   * href - Often a mailto: address
+     *   * commonName - Optional, for example a first + last name
+     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
+     *   * readOnly - boolean
+     *   * summary - Optional, a description for the share
+     *
+     * @param int $resourceId
+     * @return array
+     */
+    public function getShares($resourceId) {
+        $query = $this->db->getQueryBuilder();
+        $result = $query->select(['principaluri', 'access'])
+            ->from('dav_shares')
+            ->where($query->expr()->eq('resourceid', $query->createNamedParameter($resourceId)))
+            ->andWhere($query->expr()->eq('type', $query->createNamedParameter($this->resourceType)))
+            ->groupBy(['principaluri', 'access'])
+            ->execute();
+
+        $shares = [];
+        while ($row = $result->fetch()) {
+            $p = $this->principalBackend->getPrincipalByPath($row['principaluri']);
+            $shares[] = [
+                'href' => "principal:${row['principaluri']}",
+                'commonName' => isset($p['{DAV:}displayname']) ? $p['{DAV:}displayname'] : '',
+                'status' => 1,
+                'readOnly' => (int) $row['access'] === self::ACCESS_READ,
+                '{http://owncloud.org/ns}principal' => $row['principaluri'],
+                '{http://owncloud.org/ns}group-share' => is_null($p)
+            ];
+        }
+
+        return $shares;
+    }
+
+    /**
+     * For shared resources the sharee is set in the ACL of the resource
+     *
+     * @param int $resourceId
+     * @param array $acl
+     * @return array
+     */
+    public function applyShareAcl($resourceId, $acl) {
+        $shares = $this->getShares($resourceId);
+        foreach ($shares as $share) {
+            $acl[] = [
+                'privilege' => '{DAV:}read',
+                'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+                'protected' => true,
+            ];
+            if (!$share['readOnly']) {
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+                    'protected' => true,
+                ];
+            } elseif ($this->resourceType === 'calendar') {
+                // Allow changing the properties of read only calendars,
+                // so users can change the visibility.
+                $acl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => $share['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}principal'],
+                    'protected' => true,
+                ];
+            }
+        }
+        return $acl;
+    }
 }

apps/dav/lib/Connector/Sabre/BearerAuth.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	private function setupUserFs($userId) {
 		\OC_Util::setupFS($userId);
 		$this->session->close();
-		return $this->principalPrefix . $userId;
+		return $this->principalPrefix.$userId;
 	}
 
 	/**

Indentation +55 added lines, -55 removed lines

@@ -31,66 +31,66 @@
 use Sabre\HTTP\ResponseInterface;
 
 class BearerAuth extends AbstractBearer {
-	/** @var IUserSession */
-	private $userSession;
-	/** @var ISession */
-	private $session;
-	/** @var IRequest */
-	private $request;
-	/** @var string */
-	private $principalPrefix;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var ISession */
+    private $session;
+    /** @var IRequest */
+    private $request;
+    /** @var string */
+    private $principalPrefix;
 
-	/**
-	 * @param IUserSession $userSession
-	 * @param ISession $session
-	 * @param string $principalPrefix
-	 * @param IRequest $request
-	 */
-	public function __construct(IUserSession $userSession,
-								ISession $session,
-								IRequest $request,
-								$principalPrefix = 'principals/users/') {
-		$this->userSession = $userSession;
-		$this->session = $session;
-		$this->request = $request;
-		$this->principalPrefix = $principalPrefix;
+    /**
+     * @param IUserSession $userSession
+     * @param ISession $session
+     * @param string $principalPrefix
+     * @param IRequest $request
+     */
+    public function __construct(IUserSession $userSession,
+                                ISession $session,
+                                IRequest $request,
+                                $principalPrefix = 'principals/users/') {
+        $this->userSession = $userSession;
+        $this->session = $session;
+        $this->request = $request;
+        $this->principalPrefix = $principalPrefix;
 
-		// setup realm
-		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
-	}
+        // setup realm
+        $defaults = new \OCP\Defaults();
+        $this->realm = $defaults->getName();
+    }
 
-	private function setupUserFs($userId) {
-		\OC_Util::setupFS($userId);
-		$this->session->close();
-		return $this->principalPrefix . $userId;
-	}
+    private function setupUserFs($userId) {
+        \OC_Util::setupFS($userId);
+        $this->session->close();
+        return $this->principalPrefix . $userId;
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function validateBearerToken($bearerToken) {
-		\OC_Util::setupFS();
+    /**
+     * {@inheritdoc}
+     */
+    public function validateBearerToken($bearerToken) {
+        \OC_Util::setupFS();
 
-		if (!$this->userSession->isLoggedIn()) {
-			$this->userSession->tryTokenLogin($this->request);
-		}
-		if ($this->userSession->isLoggedIn()) {
-			return $this->setupUserFs($this->userSession->getUser()->getUID());
-		}
+        if (!$this->userSession->isLoggedIn()) {
+            $this->userSession->tryTokenLogin($this->request);
+        }
+        if ($this->userSession->isLoggedIn()) {
+            return $this->setupUserFs($this->userSession->getUser()->getUID());
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate
-	 * header which some DAV clients can't handle. Thus we override this function
-	 * and make it simply return a 401.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 */
-	public function challenge(RequestInterface $request, ResponseInterface $response) {
-		$response->setStatus(401);
-	}
+    /**
+     * \Sabre\DAV\Auth\Backend\AbstractBearer::challenge sets an WWW-Authenticate
+     * header which some DAV clients can't handle. Thus we override this function
+     * and make it simply return a 401.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function challenge(RequestInterface $request, ResponseInterface $response) {
+        $response->setStatus(401);
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/FileLocked.php

Indentation +14 added lines, -14 removed lines

@@ -29,19 +29,19 @@
 use Exception;
 
 class FileLocked extends \Sabre\DAV\Exception {
-	public function __construct($message = "", $code = 0, Exception $previous = null) {
-		if ($previous instanceof \OCP\Files\LockNotAcquiredException) {
-			$message = sprintf('Target file %s is locked by another process.', $previous->path);
-		}
-		parent::__construct($message, $code, $previous);
-	}
+    public function __construct($message = "", $code = 0, Exception $previous = null) {
+        if ($previous instanceof \OCP\Files\LockNotAcquiredException) {
+            $message = sprintf('Target file %s is locked by another process.', $previous->path);
+        }
+        parent::__construct($message, $code, $previous);
+    }
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-		return 423;
-	}
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        return 423;
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/UnsupportedMediaType.php

Indentation +8 added lines, -8 removed lines

@@ -31,12 +31,12 @@
  */
 class UnsupportedMediaType extends \Sabre\DAV\Exception {
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-		return 415;
-	}
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        return 415;
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/EntityTooLarge.php

Indentation +8 added lines, -8 removed lines

@@ -31,12 +31,12 @@
  */
 class EntityTooLarge extends \Sabre\DAV\Exception {
 
-	/**
-	 * Returns the HTTP status code for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-		return 413;
-	}
+    /**
+     * Returns the HTTP status code for this exception
+     *
+     * @return int
+     */
+    public function getHTTPCode() {
+        return 413;
+    }
 }

apps/dav/lib/Connector/Sabre/TagList.php

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 			return null;
 		}
 		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}tag') {
+			if ($elem['name'] === '{'.self::NS_OWNCLOUD.'}tag') {
 				$tags[] = $elem['value'];
 			}
 		}
@@ -116,7 +116,7 @@ 
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->tags as $tag) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}tag', $tag);
 		}
 	}
 }

Indentation +79 added lines, -79 removed lines

@@ -34,89 +34,89 @@
  * This property contains multiple "tag" elements, each containing a tag name.
  */
 class TagList implements Element {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * tags
-	 *
-	 * @var array
-	 */
-	private $tags;
+    /**
+     * tags
+     *
+     * @var array
+     */
+    private $tags;
 
-	/**
-	 * @param array $tags
-	 */
-	public function __construct(array $tags) {
-		$this->tags = $tags;
-	}
+    /**
+     * @param array $tags
+     */
+    public function __construct(array $tags) {
+        $this->tags = $tags;
+    }
 
-	/**
-	 * Returns the tags
-	 *
-	 * @return array
-	 */
-	public function getTags() {
-		return $this->tags;
-	}
+    /**
+     * Returns the tags
+     *
+     * @return array
+     */
+    public function getTags() {
+        return $this->tags;
+    }
 
-	/**
-	 * The deserialize method is called during xml parsing.
-	 *
-	 * This method is called statictly, 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.
-	 *
-	 * @param Reader $reader
-	 * @return mixed
-	 */
-	public static function xmlDeserialize(Reader $reader) {
-		$tags = [];
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statictly, 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.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    public static function xmlDeserialize(Reader $reader) {
+        $tags = [];
 
-		$tree = $reader->parseInnerTree();
-		if ($tree === null) {
-			return null;
-		}
-		foreach ($tree as $elem) {
-			if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}tag') {
-				$tags[] = $elem['value'];
-			}
-		}
-		return new self($tags);
-	}
+        $tree = $reader->parseInnerTree();
+        if ($tree === null) {
+            return null;
+        }
+        foreach ($tree as $elem) {
+            if ($elem['name'] === '{' . self::NS_OWNCLOUD . '}tag') {
+                $tags[] = $elem['value'];
+            }
+        }
+        return new self($tags);
+    }
 
-	/**
-	 * The xmlSerialize metod 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 XmlSerializble 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.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->tags as $tag) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
-		}
-	}
+    /**
+     * The xmlSerialize metod 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 XmlSerializble 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.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->tags as $tag) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}tag', $tag);
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php

Spacing +2 added lines, -2 removed lines

@@ -87,10 +87,10 @@
 	 * @return void
 	 */
 	public function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function () {
+		$propFind->handle('{DAV:}supportedlock', function() {
 			return new SupportedLock(true);
 		});
-		$propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+		$propFind->handle('{DAV:}lockdiscovery', function() use ($propFind) {
 			return new LockDiscovery([]);
 		});
 	}

Indentation +99 added lines, -99 removed lines

@@ -47,113 +47,113 @@
  * @package OCA\DAV\Connector\Sabre
  */
 class FakeLockerPlugin extends ServerPlugin {
-	/** @var \Sabre\DAV\Server */
-	private $server;
+    /** @var \Sabre\DAV\Server */
+    private $server;
 
-	/** {@inheritDoc} */
-	public function initialize(\Sabre\DAV\Server $server) {
-		$this->server = $server;
-		$this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
-		$this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
-		$server->on('propFind', [$this, 'propFind']);
-		$server->on('validateTokens', [$this, 'validateTokens']);
-	}
+    /** {@inheritDoc} */
+    public function initialize(\Sabre\DAV\Server $server) {
+        $this->server = $server;
+        $this->server->on('method:LOCK', [$this, 'fakeLockProvider'], 1);
+        $this->server->on('method:UNLOCK', [$this, 'fakeUnlockProvider'], 1);
+        $server->on('propFind', [$this, 'propFind']);
+        $server->on('validateTokens', [$this, 'validateTokens']);
+    }
 
-	/**
-	 * Indicate that we support LOCK and UNLOCK
-	 *
-	 * @param string $path
-	 * @return string[]
-	 */
-	public function getHTTPMethods($path) {
-		return [
-			'LOCK',
-			'UNLOCK',
-		];
-	}
+    /**
+     * Indicate that we support LOCK and UNLOCK
+     *
+     * @param string $path
+     * @return string[]
+     */
+    public function getHTTPMethods($path) {
+        return [
+            'LOCK',
+            'UNLOCK',
+        ];
+    }
 
-	/**
-	 * Indicate that we support locking
-	 *
-	 * @return integer[]
-	 */
-	public function getFeatures() {
-		return [2];
-	}
+    /**
+     * Indicate that we support locking
+     *
+     * @return integer[]
+     */
+    public function getFeatures() {
+        return [2];
+    }
 
-	/**
-	 * Return some dummy response for PROPFIND requests with regard to locking
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		$propFind->handle('{DAV:}supportedlock', function () {
-			return new SupportedLock(true);
-		});
-		$propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
-			return new LockDiscovery([]);
-		});
-	}
+    /**
+     * Return some dummy response for PROPFIND requests with regard to locking
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        $propFind->handle('{DAV:}supportedlock', function () {
+            return new SupportedLock(true);
+        });
+        $propFind->handle('{DAV:}lockdiscovery', function () use ($propFind) {
+            return new LockDiscovery([]);
+        });
+    }
 
-	/**
-	 * Mark a locking token always as valid
-	 *
-	 * @param RequestInterface $request
-	 * @param array $conditions
-	 */
-	public function validateTokens(RequestInterface $request, &$conditions) {
-		foreach ($conditions as &$fileCondition) {
-			if (isset($fileCondition['tokens'])) {
-				foreach ($fileCondition['tokens'] as &$token) {
-					if (isset($token['token'])) {
-						if (substr($token['token'], 0, 16) === 'opaquelocktoken:') {
-							$token['validToken'] = true;
-						}
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Mark a locking token always as valid
+     *
+     * @param RequestInterface $request
+     * @param array $conditions
+     */
+    public function validateTokens(RequestInterface $request, &$conditions) {
+        foreach ($conditions as &$fileCondition) {
+            if (isset($fileCondition['tokens'])) {
+                foreach ($fileCondition['tokens'] as &$token) {
+                    if (isset($token['token'])) {
+                        if (substr($token['token'], 0, 16) === 'opaquelocktoken:') {
+                            $token['validToken'] = true;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeLockProvider(RequestInterface $request,
-									 ResponseInterface $response) {
-		$lockInfo = new LockInfo();
-		$lockInfo->token = md5($request->getPath());
-		$lockInfo->uri = $request->getPath();
-		$lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY;
-		$lockInfo->timeout = 1800;
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeLockProvider(RequestInterface $request,
+                                        ResponseInterface $response) {
+        $lockInfo = new LockInfo();
+        $lockInfo->token = md5($request->getPath());
+        $lockInfo->uri = $request->getPath();
+        $lockInfo->depth = \Sabre\DAV\Server::DEPTH_INFINITY;
+        $lockInfo->timeout = 1800;
 
-		$body = $this->server->xml->write('{DAV:}prop', [
-			'{DAV:}lockdiscovery' =>
-					new LockDiscovery([$lockInfo])
-		]);
+        $body = $this->server->xml->write('{DAV:}prop', [
+            '{DAV:}lockdiscovery' =>
+                    new LockDiscovery([$lockInfo])
+        ]);
 
-		$response->setStatus(200);
-		$response->setBody($body);
+        $response->setStatus(200);
+        $response->setBody($body);
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Fakes a successful LOCK
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return bool
-	 */
-	public function fakeUnlockProvider(RequestInterface $request,
-									 ResponseInterface $response) {
-		$response->setStatus(204);
-		$response->setHeader('Content-Length', '0');
-		return false;
-	}
+    /**
+     * Fakes a successful LOCK
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function fakeUnlockProvider(RequestInterface $request,
+                                        ResponseInterface $response) {
+        $response->setStatus(204);
+        $response->setHeader('Content-Length', '0');
+        return false;
+    }
 }

apps/dav/lib/Connector/Sabre/ChecksumList.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+			$writer->writeElement('{'.self::NS_OWNCLOUD.'}checksum', $checksum);
 		}
 	}
 }

Indentation +33 added lines, -33 removed lines

@@ -32,40 +32,40 @@
  * checksum name.
  */
 class ChecksumList implements XmlSerializable {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/** @var string[] of TYPE:CHECKSUM */
-	private $checksums;
+    /** @var string[] of TYPE:CHECKSUM */
+    private $checksums;
 
-	/**
-	 * @param string $checksum
-	 */
-	public function __construct($checksum) {
-		$this->checksums = explode(',', $checksum);
-	}
+    /**
+     * @param string $checksum
+     */
+    public function __construct($checksum) {
+        $this->checksums = explode(',', $checksum);
+    }
 
-	/**
-	 * The xmlSerialize metod 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 XmlSerializble 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.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->checksums as $checksum) {
-			$writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
-		}
-	}
+    /**
+     * The xmlSerialize metod 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 XmlSerializble 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.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->checksums as $checksum) {
+            $writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum);
+        }
+    }
 }