nextcloud / server

lib/public/Contacts/ContactsMenu/IContactsStore.php

Indentation +16 added lines, -16 removed lines

@@ -10,22 +10,22 @@
 interface IContactsStore {
 
 
-	/**
-	 * @param IUser $user
-	 * @param $filter
-	 * @return IEntry[]
-	 * @since 13.0.0
-	 */
-	public function getContacts(IUser $user, $filter);
+    /**
+     * @param IUser $user
+     * @param $filter
+     * @return IEntry[]
+     * @since 13.0.0
+     */
+    public function getContacts(IUser $user, $filter);
 
-	/**
-	 * @brief finds a contact by specifying the property to search on ($shareType) and the value ($shareWith)
-	 * @param IUser $user
-	 * @param integer $shareType
-	 * @param string $shareWith
-	 * @return IEntry|null
-	 * @since 13.0.0
-	 */
-	public function findOne(IUser $user, $shareType, $shareWith);
+    /**
+     * @brief finds a contact by specifying the property to search on ($shareType) and the value ($shareWith)
+     * @param IUser $user
+     * @param integer $shareType
+     * @param string $shareWith
+     * @return IEntry|null
+     * @since 13.0.0
+     */
+    public function findOne(IUser $user, $shareType, $shareWith);
 
 }

apps/dav/lib/CalDAV/Principal/Collection.php

Indentation +9 added lines, -9 removed lines

@@ -32,14 +32,14 @@
  */
 class Collection extends \Sabre\CalDAV\Principal\Collection {
 
-	/**
-	 * Returns a child object based on principal information
-	 *
-	 * @param array $principalInfo
-	 * @return User
-	 */
-	function getChildForPrincipal(array $principalInfo) {
-		return new User($this->principalBackend, $principalInfo);
-	}
+    /**
+     * Returns a child object based on principal information
+     *
+     * @param array $principalInfo
+     * @return User
+     */
+    function getChildForPrincipal(array $principalInfo) {
+        return new User($this->principalBackend, $principalInfo);
+    }
 
 }

apps/dav/lib/CalDAV/Principal/User.php

Indentation +21 added lines, -21 removed lines

@@ -30,26 +30,26 @@
  */
 class User extends \Sabre\CalDAV\Principal\User {
 
-	/**
-	 * Returns a list of ACE's for this node.
-	 *
-	 * Each ACE has the following properties:
-	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-	 *     currently the only supported privileges
-	 *   * 'principal', a url to the principal who owns the node
-	 *   * 'protected' (optional), indicating that this ACE is not allowed to
-	 *      be updated.
-	 *
-	 * @return array
-	 */
-	function getACL() {
-		$acl = parent::getACL();
-		$acl[] = [
-			'privilege' => '{DAV:}read',
-			'principal' => '{DAV:}authenticated',
-			'protected' => true,
-		];
-		return $acl;
-	}
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    function getACL() {
+        $acl = parent::getACL();
+        $acl[] = [
+            'privilege' => '{DAV:}read',
+            'principal' => '{DAV:}authenticated',
+            'protected' => true,
+        ];
+        return $acl;
+    }
 
 }

lib/private/Repair/NC13/RepairInvalidPaths.php

Indentation +160 added lines, -160 removed lines

@@ -29,164 +29,164 @@
 use OCP\Migration\IRepairStep;
 
 class RepairInvalidPaths implements IRepairStep {
-	const MAX_ROWS = 1000;
-
-	/** @var IDBConnection */
-	private $connection;
-	/** @var IConfig */
-	private $config;
-
-	private $getIdQuery;
-	private $updateQuery;
-	private $reparentQuery;
-	private $deleteQuery;
-
-	public function __construct(IDBConnection $connection, IConfig $config) {
-		$this->connection = $connection;
-		$this->config = $config;
-	}
-
-
-	public function getName() {
-		return 'Repair invalid paths in file cache';
-	}
-
-	/**
-	 * @return \Generator
-	 * @suppress SqlInjectionChecker
-	 */
-	private function getInvalidEntries() {
-		$builder = $this->connection->getQueryBuilder();
-
-		$computedPath = $builder->func()->concat(
-			'p.path',
-			$builder->func()->concat($builder->createNamedParameter('/'), 'f.name')
-		);
-
-		//select f.path, f.parent,p.path from oc_filecache f inner join oc_filecache p on f.parent=p.fileid and p.path!='' where f.path != p.path || '/' || f.name;
-		$builder->select('f.fileid', 'f.path', 'f.name', 'f.parent', 'f.storage')
-			->selectAlias('p.path', 'parent_path')
-			->selectAlias('p.storage', 'parent_storage')
-			->from('filecache', 'f')
-			->innerJoin('f', 'filecache', 'p', $builder->expr()->andX(
-				$builder->expr()->eq('f.parent', 'p.fileid'),
-				$builder->expr()->nonEmptyString('p.name')
-			))
-			->where($builder->expr()->neq('f.path', $computedPath))
-			->setMaxResults(self::MAX_ROWS);
-
-		do {
-			$result = $builder->execute();
-			$rows = $result->fetchAll();
-			foreach ($rows as $row) {
-				yield $row;
-			}
-			$result->closeCursor();
-		} while (count($rows) > 0);
-	}
-
-	private function getId($storage, $path) {
-		if (!$this->getIdQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->getIdQuery = $builder->select('fileid')
-				->from('filecache')
-				->where($builder->expr()->eq('storage', $builder->createParameter('storage')))
-				->andWhere($builder->expr()->eq('path_hash', $builder->createParameter('path_hash')));
-		}
-
-		$this->getIdQuery->setParameter('storage', $storage, IQueryBuilder::PARAM_INT);
-		$this->getIdQuery->setParameter('path_hash', md5($path));
-
-		return $this->getIdQuery->execute()->fetchColumn();
-	}
-
-	/**
-	 * @param string $fileid
-	 * @param string $newPath
-	 * @param string $newStorage
-	 * @suppress SqlInjectionChecker
-	 */
-	private function update($fileid, $newPath, $newStorage) {
-		if (!$this->updateQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->updateQuery = $builder->update('filecache')
-				->set('path', $builder->createParameter('newpath'))
-				->set('path_hash', $builder->func()->md5($builder->createParameter('newpath')))
-				->set('storage', $builder->createParameter('newstorage'))
-				->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
-		}
-
-		$this->updateQuery->setParameter('newpath', $newPath);
-		$this->updateQuery->setParameter('newstorage', $newStorage);
-		$this->updateQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
-
-		$this->updateQuery->execute();
-	}
-
-	private function reparent($from, $to) {
-		if (!$this->reparentQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->reparentQuery = $builder->update('filecache')
-				->set('parent', $builder->createParameter('to'))
-				->where($builder->expr()->eq('fileid', $builder->createParameter('from')));
-		}
-
-		$this->reparentQuery->setParameter('from', $from);
-		$this->reparentQuery->setParameter('to', $to);
-
-		$this->reparentQuery->execute();
-	}
-
-	private function delete($fileid) {
-		if (!$this->deleteQuery) {
-			$builder = $this->connection->getQueryBuilder();
-
-			$this->deleteQuery = $builder->delete('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
-		}
-
-		$this->deleteQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
-
-		$this->deleteQuery->execute();
-	}
-
-	private function repair() {
-		$this->connection->beginTransaction();
-		$entries = $this->getInvalidEntries();
-		$count = 0;
-		foreach ($entries as $entry) {
-			$count++;
-			$calculatedPath = $entry['parent_path'] . '/' . $entry['name'];
-			if ($newId = $this->getId($entry['parent_storage'], $calculatedPath)) {
-				// a new entry with the correct path has already been created, reuse that one and delete the incorrect entry
-				$this->reparent($entry['fileid'], $newId);
-				$this->delete($entry['fileid']);
-			} else {
-				$this->update($entry['fileid'], $calculatedPath, $entry['parent_storage']);
-			}
-		}
-		$this->connection->commit();
-		return $count;
-	}
-
-	private function shouldRun() {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-
-		// was added to 11.0.5.2, 12.0.0.30 and 13.0.0.1
-		$shouldRun = version_compare($versionFromBeforeUpdate, '11.0.5.2', '<');
-		$shouldRun |= version_compare($versionFromBeforeUpdate, '12.0.0.0', '>=') && version_compare($versionFromBeforeUpdate, '12.0.0.30', '<');
-		$shouldRun |= version_compare($versionFromBeforeUpdate, '13.0.0.0', '==');
-		return $shouldRun;
-	}
-
-	public function run(IOutput $output) {
-		if ($this->shouldRun()) {
-			$count = $this->repair();
-
-			$output->info('Repaired ' . $count . ' paths');
-		}
-	}
+    const MAX_ROWS = 1000;
+
+    /** @var IDBConnection */
+    private $connection;
+    /** @var IConfig */
+    private $config;
+
+    private $getIdQuery;
+    private $updateQuery;
+    private $reparentQuery;
+    private $deleteQuery;
+
+    public function __construct(IDBConnection $connection, IConfig $config) {
+        $this->connection = $connection;
+        $this->config = $config;
+    }
+
+
+    public function getName() {
+        return 'Repair invalid paths in file cache';
+    }
+
+    /**
+     * @return \Generator
+     * @suppress SqlInjectionChecker
+     */
+    private function getInvalidEntries() {
+        $builder = $this->connection->getQueryBuilder();
+
+        $computedPath = $builder->func()->concat(
+            'p.path',
+            $builder->func()->concat($builder->createNamedParameter('/'), 'f.name')
+        );
+
+        //select f.path, f.parent,p.path from oc_filecache f inner join oc_filecache p on f.parent=p.fileid and p.path!='' where f.path != p.path || '/' || f.name;
+        $builder->select('f.fileid', 'f.path', 'f.name', 'f.parent', 'f.storage')
+            ->selectAlias('p.path', 'parent_path')
+            ->selectAlias('p.storage', 'parent_storage')
+            ->from('filecache', 'f')
+            ->innerJoin('f', 'filecache', 'p', $builder->expr()->andX(
+                $builder->expr()->eq('f.parent', 'p.fileid'),
+                $builder->expr()->nonEmptyString('p.name')
+            ))
+            ->where($builder->expr()->neq('f.path', $computedPath))
+            ->setMaxResults(self::MAX_ROWS);
+
+        do {
+            $result = $builder->execute();
+            $rows = $result->fetchAll();
+            foreach ($rows as $row) {
+                yield $row;
+            }
+            $result->closeCursor();
+        } while (count($rows) > 0);
+    }
+
+    private function getId($storage, $path) {
+        if (!$this->getIdQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->getIdQuery = $builder->select('fileid')
+                ->from('filecache')
+                ->where($builder->expr()->eq('storage', $builder->createParameter('storage')))
+                ->andWhere($builder->expr()->eq('path_hash', $builder->createParameter('path_hash')));
+        }
+
+        $this->getIdQuery->setParameter('storage', $storage, IQueryBuilder::PARAM_INT);
+        $this->getIdQuery->setParameter('path_hash', md5($path));
+
+        return $this->getIdQuery->execute()->fetchColumn();
+    }
+
+    /**
+     * @param string $fileid
+     * @param string $newPath
+     * @param string $newStorage
+     * @suppress SqlInjectionChecker
+     */
+    private function update($fileid, $newPath, $newStorage) {
+        if (!$this->updateQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->updateQuery = $builder->update('filecache')
+                ->set('path', $builder->createParameter('newpath'))
+                ->set('path_hash', $builder->func()->md5($builder->createParameter('newpath')))
+                ->set('storage', $builder->createParameter('newstorage'))
+                ->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
+        }
+
+        $this->updateQuery->setParameter('newpath', $newPath);
+        $this->updateQuery->setParameter('newstorage', $newStorage);
+        $this->updateQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
+
+        $this->updateQuery->execute();
+    }
+
+    private function reparent($from, $to) {
+        if (!$this->reparentQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->reparentQuery = $builder->update('filecache')
+                ->set('parent', $builder->createParameter('to'))
+                ->where($builder->expr()->eq('fileid', $builder->createParameter('from')));
+        }
+
+        $this->reparentQuery->setParameter('from', $from);
+        $this->reparentQuery->setParameter('to', $to);
+
+        $this->reparentQuery->execute();
+    }
+
+    private function delete($fileid) {
+        if (!$this->deleteQuery) {
+            $builder = $this->connection->getQueryBuilder();
+
+            $this->deleteQuery = $builder->delete('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createParameter('fileid')));
+        }
+
+        $this->deleteQuery->setParameter('fileid', $fileid, IQueryBuilder::PARAM_INT);
+
+        $this->deleteQuery->execute();
+    }
+
+    private function repair() {
+        $this->connection->beginTransaction();
+        $entries = $this->getInvalidEntries();
+        $count = 0;
+        foreach ($entries as $entry) {
+            $count++;
+            $calculatedPath = $entry['parent_path'] . '/' . $entry['name'];
+            if ($newId = $this->getId($entry['parent_storage'], $calculatedPath)) {
+                // a new entry with the correct path has already been created, reuse that one and delete the incorrect entry
+                $this->reparent($entry['fileid'], $newId);
+                $this->delete($entry['fileid']);
+            } else {
+                $this->update($entry['fileid'], $calculatedPath, $entry['parent_storage']);
+            }
+        }
+        $this->connection->commit();
+        return $count;
+    }
+
+    private function shouldRun() {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+
+        // was added to 11.0.5.2, 12.0.0.30 and 13.0.0.1
+        $shouldRun = version_compare($versionFromBeforeUpdate, '11.0.5.2', '<');
+        $shouldRun |= version_compare($versionFromBeforeUpdate, '12.0.0.0', '>=') && version_compare($versionFromBeforeUpdate, '12.0.0.30', '<');
+        $shouldRun |= version_compare($versionFromBeforeUpdate, '13.0.0.0', '==');
+        return $shouldRun;
+    }
+
+    public function run(IOutput $output) {
+        if ($this->shouldRun()) {
+            $count = $this->repair();
+
+            $output->info('Repaired ' . $count . ' paths');
+        }
+    }
 }

lib/private/Remote/Credentials.php

Indentation +24 added lines, -24 removed lines

@@ -25,31 +25,31 @@
 use OCP\Remote\ICredentials;
 
 class Credentials implements ICredentials {
-	/** @var string */
-	private $user;
-	/** @var string */
-	private $password;
+    /** @var string */
+    private $user;
+    /** @var string */
+    private $password;
 
-	/**
-	 * @param string $user
-	 * @param string $password
-	 */
-	public function __construct($user, $password) {
-		$this->user = $user;
-		$this->password = $password;
-	}
+    /**
+     * @param string $user
+     * @param string $password
+     */
+    public function __construct($user, $password) {
+        $this->user = $user;
+        $this->password = $password;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getUsername() {
-		return $this->user;
-	}
+    /**
+     * @return string
+     */
+    public function getUsername() {
+        return $this->user;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
+    /**
+     * @return string
+     */
+    public function getPassword() {
+        return $this->password;
+    }
 }

lib/public/Remote/Api/IUserApi.php

Indentation +7 added lines, -7 removed lines

@@ -27,11 +27,11 @@
  * @since 13.0.0
  */
 interface IUserApi {
-	/**
-	 * @param string $userId
-	 * @return IUser
-	 *
-	 * @since 13.0.0
-	 */
-	public function getUser($userId);
+    /**
+     * @param string $userId
+     * @return IUser
+     *
+     * @since 13.0.0
+     */
+    public function getUser($userId);
 }

lib/public/Remote/Api/ICapabilitiesApi.php

Indentation +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@
  * @since 13.0.0
  */
 interface ICapabilitiesApi {
-	/**
-	 * @return array The capabilities in the form of [$appId => [$capability => $value]]
-	 *
-	 * @since 13.0.0
-	 */
-	public function getCapabilities();
+    /**
+     * @return array The capabilities in the form of [$appId => [$capability => $value]]
+     *
+     * @since 13.0.0
+     */
+    public function getCapabilities();
 }

lib/public/Remote/Api/IApiFactory.php

Indentation +8 added lines, -8 removed lines

@@ -28,12 +28,12 @@
  * @since 13.0.0
  */
 interface IApiFactory {
-	/**
-	 * @param IInstance $instance
-	 * @param ICredentials $credentials
-	 * @return IApiCollection
-	 *
-	 * @since 13.0.0
-	 */
-	public function getApiCollection(IInstance $instance, ICredentials $credentials);
+    /**
+     * @param IInstance $instance
+     * @param ICredentials $credentials
+     * @return IApiCollection
+     *
+     * @since 13.0.0
+     */
+    public function getApiCollection(IInstance $instance, ICredentials $credentials);
 }

lib/public/Remote/Api/IApiCollection.php

Indentation +12 added lines, -12 removed lines

@@ -27,17 +27,17 @@
  * @since 13.0.0
  */
 interface IApiCollection {
-	/**
-	 * @return IUserApi
-	 *
-	 * @since 13.0.0
-	 */
-	public function getUserApi();
+    /**
+     * @return IUserApi
+     *
+     * @since 13.0.0
+     */
+    public function getUserApi();
 
-	/**
-	 * @return ICapabilitiesApi
-	 *
-	 * @since 13.0.0
-	 */
-	public function getCapabilitiesApi();
+    /**
+     * @return ICapabilitiesApi
+     *
+     * @since 13.0.0
+     */
+    public function getCapabilitiesApi();
 }