nextcloud / server

apps/files_sharing/lib/Helper.php

Doc Comments +1 added lines

@@ -303,6 +303,7 @@
 	 * get default share folder
 	 *
 	 * @param \OC\Files\View
+	 * @param View $view
 	 * @return string
 	 */
 	public static function getShareFolder($view = null) {

Spacing +9 added lines, -9 removed lines

@@ -87,7 +87,7 @@ 
 
 		$basePath = $path;
 
-		if ($relativePath !== null && Filesystem::isReadable($basePath . $relativePath)) {
+		if ($relativePath !== null && Filesystem::isReadable($basePath.$relativePath)) {
 			$path .= Filesystem::normalizePath($relativePath);
 		}
 
@@ -112,14 +112,14 @@ 
 		if ($password !== null) {
 			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
 				if ($shareManager->checkPassword($share, $password)) {
-					\OC::$server->getSession()->set('public_link_authenticated', (string)$share->getId());
+					\OC::$server->getSession()->set('public_link_authenticated', (string) $share->getId());
 					return true;
 				}
 			}
 		} else {
 			// not authenticated ?
 			if (\OC::$server->getSession()->exists('public_link_authenticated')
-				&& \OC::$server->getSession()->get('public_link_authenticated') !== (string)$share->getId()) {
+				&& \OC::$server->getSession()->get('public_link_authenticated') !== (string) $share->getId()) {
 				return true;
 			}
 		}
@@ -132,7 +132,7 @@ 
 		Filesystem::initMountPoints($owner);
 		$info = Filesystem::getFileInfo($target);
 		$ownerView = new View('/'.$owner.'/files');
-		if ( $owner != User::getUser() ) {
+		if ($owner != User::getUser()) {
 			$path = $ownerView->getPath($info['fileid']);
 		} else {
 			$path = $target;
@@ -145,7 +145,7 @@ 
 			if ($info instanceof \OC\Files\FileInfo) {
 				$ids[] = $info['fileid'];
 			} else {
-				\OCP\Util::writeLog('sharing', 'No fileinfo available for: ' . $path, \OCP\Util::WARN);
+				\OCP\Util::writeLog('sharing', 'No fileinfo available for: '.$path, \OCP\Util::WARN);
 			}
 			$path = dirname($path);
 		}
@@ -155,7 +155,7 @@ 
 			$idList = array_chunk($ids, 99, true);
 
 			foreach ($idList as $subList) {
-				$statement = "SELECT `share_with`, `share_type`, `file_target` FROM `*PREFIX*share` WHERE `file_source` IN (" . implode(',', $subList) . ") AND `share_type` IN (0, 1, 2)";
+				$statement = "SELECT `share_with`, `share_type`, `file_target` FROM `*PREFIX*share` WHERE `file_source` IN (".implode(',', $subList).") AND `share_type` IN (0, 1, 2)";
 				$query = \OCP\DB::prepare($statement);
 				$r = $query->execute();
 				$result = array_merge($result, $r->fetchAll());
@@ -183,7 +183,7 @@ 
 			$uid = User::getUser();
 		}
 		Filesystem::initMountPoints($uid);
-		if ( $uid != User::getUser() ) {
+		if ($uid != User::getUser()) {
 			$info = Filesystem::getFileInfo($filename);
 			$ownerView = new View('/'.$uid.'/files');
 			try {
@@ -230,7 +230,7 @@ 
 		$dir = $pathinfo['dirname'];
 		$i = 2;
 		while ($view->file_exists($path) || in_array($path, $excludeList)) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
+			$path = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext);
 			$i++;
 		}
 
@@ -254,7 +254,7 @@ 
 			$dir = '';
 			$subdirs = explode('/', $shareFolder);
 			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
+				$dir = $dir.'/'.$subdir;
 				if (!$view->is_dir($dir)) {
 					$view->mkdir($dir);
 				}

Indentation +238 added lines, -238 removed lines

@@ -36,243 +36,243 @@
 
 class Helper {
 
-	public static function registerHooks() {
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
-		\OCP\Util::connectHook('OC_Appconfig', 'post_set_value', '\OCA\Files_Sharing\Maintainer', 'configChangeHook');
-
-		\OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
-	}
-
-	/**
-	 * Sets up the filesystem and user for public sharing
-	 * @param string $token string share token
-	 * @param string $relativePath optional path relative to the share
-	 * @param string $password optional password
-	 * @return array
-	 */
-	public static function setupFromToken($token, $relativePath = null, $password = null) {
-		\OC_User::setIncognitoMode(true);
-
-		$shareManager = \OC::$server->getShareManager();
-
-		try {
-			$share = $shareManager->getShareByToken($token);
-		} catch (ShareNotFound $e) {
-			\OC_Response::setStatus(404);
-			\OCP\Util::writeLog('core-preview', 'Passed token parameter is not valid', \OCP\Util::DEBUG);
-			exit;
-		}
-
-		\OCP\JSON::checkUserExists($share->getShareOwner());
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($share->getShareOwner());
-
-
-		try {
-			$path = Filesystem::getPath($share->getNodeId());
-		} catch (NotFoundException $e) {
-			\OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
-			\OC_Response::setStatus(404);
-			\OCP\JSON::error(array('success' => false));
-			exit();
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK && $share->getPassword() !== null) {
-			if (!self::authenticate($share, $password)) {
-				\OC_Response::setStatus(403);
-				\OCP\JSON::error(array('success' => false));
-				exit();
-			}
-		}
-
-		$basePath = $path;
-
-		if ($relativePath !== null && Filesystem::isReadable($basePath . $relativePath)) {
-			$path .= Filesystem::normalizePath($relativePath);
-		}
-
-		return array(
-			'share' => $share,
-			'basePath' => $basePath,
-			'realPath' => $path
-		);
-	}
-
-	/**
-	 * Authenticate link item with the given password
-	 * or with the session if no password was given.
-	 * @param \OCP\Share\IShare $share
-	 * @param string $password optional password
-	 *
-	 * @return boolean true if authorized, false otherwise
-	 */
-	public static function authenticate($share, $password = null) {
-		$shareManager = \OC::$server->getShareManager();
-
-		if ($password !== null) {
-			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
-				if ($shareManager->checkPassword($share, $password)) {
-					\OC::$server->getSession()->set('public_link_authenticated', (string)$share->getId());
-					return true;
-				}
-			}
-		} else {
-			// not authenticated ?
-			if (\OC::$server->getSession()->exists('public_link_authenticated')
-				&& \OC::$server->getSession()->get('public_link_authenticated') !== (string)$share->getId()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static function getSharesFromItem($target) {
-		$result = array();
-		$owner = Filesystem::getOwner($target);
-		Filesystem::initMountPoints($owner);
-		$info = Filesystem::getFileInfo($target);
-		$ownerView = new View('/'.$owner.'/files');
-		if ( $owner != User::getUser() ) {
-			$path = $ownerView->getPath($info['fileid']);
-		} else {
-			$path = $target;
-		}
-
-
-		$ids = array();
-		while ($path !== dirname($path)) {
-			$info = $ownerView->getFileInfo($path);
-			if ($info instanceof \OC\Files\FileInfo) {
-				$ids[] = $info['fileid'];
-			} else {
-				\OCP\Util::writeLog('sharing', 'No fileinfo available for: ' . $path, \OCP\Util::WARN);
-			}
-			$path = dirname($path);
-		}
-
-		if (!empty($ids)) {
-
-			$idList = array_chunk($ids, 99, true);
-
-			foreach ($idList as $subList) {
-				$statement = "SELECT `share_with`, `share_type`, `file_target` FROM `*PREFIX*share` WHERE `file_source` IN (" . implode(',', $subList) . ") AND `share_type` IN (0, 1, 2)";
-				$query = \OCP\DB::prepare($statement);
-				$r = $query->execute();
-				$result = array_merge($result, $r->fetchAll());
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * get the UID of the owner of the file and the path to the file relative to
-	 * owners files folder
-	 *
-	 * @param $filename
-	 * @return array
-	 * @throws \OC\User\NoUserException
-	 */
-	public static function getUidAndFilename($filename) {
-		$uid = Filesystem::getOwner($filename);
-		$userManager = \OC::$server->getUserManager();
-		// if the user with the UID doesn't exists, e.g. because the UID points
-		// to a remote user with a federated cloud ID we use the current logged-in
-		// user. We need a valid local user to create the share
-		if (!$userManager->userExists($uid)) {
-			$uid = User::getUser();
-		}
-		Filesystem::initMountPoints($uid);
-		if ( $uid != User::getUser() ) {
-			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/'.$uid.'/files');
-			try {
-				$filename = $ownerView->getPath($info['fileid']);
-			} catch (NotFoundException $e) {
-				$filename = null;
-			}
-		}
-		return [$uid, $filename];
-	}
-
-	/**
-	 * Format a path to be relative to the /user/files/ directory
-	 * @param string $path the absolute path
-	 * @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
-	 */
-	public static function stripUserFilesPath($path) {
-		$trimmed = ltrim($path, '/');
-		$split = explode('/', $trimmed);
-
-		// it is not a file relative to data/user/files
-		if (count($split) < 3 || $split[1] !== 'files') {
-			return false;
-		}
-
-		$sliced = array_slice($split, 2);
-		$relPath = implode('/', $sliced);
-
-		return $relPath;
-	}
-
-	/**
-	 * check if file name already exists and generate unique target
-	 *
-	 * @param string $path
-	 * @param array $excludeList
-	 * @param View $view
-	 * @return string $path
-	 */
-	public static function generateUniqueTarget($path, $excludeList, $view) {
-		$pathinfo = pathinfo($path);
-		$ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : '';
-		$name = $pathinfo['filename'];
-		$dir = $pathinfo['dirname'];
-		$i = 2;
-		while ($view->file_exists($path) || in_array($path, $excludeList)) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
-			$i++;
-		}
-
-		return $path;
-	}
-
-	/**
-	 * get default share folder
-	 *
-	 * @param \OC\Files\View
-	 * @return string
-	 */
-	public static function getShareFolder($view = null) {
-		if ($view === null) {
-			$view = Filesystem::getView();
-		}
-		$shareFolder = \OC::$server->getConfig()->getSystemValue('share_folder', '/');
-		$shareFolder = Filesystem::normalizePath($shareFolder);
-
-		if (!$view->file_exists($shareFolder)) {
-			$dir = '';
-			$subdirs = explode('/', $shareFolder);
-			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
-				if (!$view->is_dir($dir)) {
-					$view->mkdir($dir);
-				}
-			}
-		}
-
-		return $shareFolder;
-
-	}
-
-	/**
-	 * set default share folder
-	 *
-	 * @param string $shareFolder
-	 */
-	public static function setShareFolder($shareFolder) {
-		\OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
-	}
+    public static function registerHooks() {
+        \OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
+        \OCP\Util::connectHook('OC_Appconfig', 'post_set_value', '\OCA\Files_Sharing\Maintainer', 'configChangeHook');
+
+        \OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
+    }
+
+    /**
+     * Sets up the filesystem and user for public sharing
+     * @param string $token string share token
+     * @param string $relativePath optional path relative to the share
+     * @param string $password optional password
+     * @return array
+     */
+    public static function setupFromToken($token, $relativePath = null, $password = null) {
+        \OC_User::setIncognitoMode(true);
+
+        $shareManager = \OC::$server->getShareManager();
+
+        try {
+            $share = $shareManager->getShareByToken($token);
+        } catch (ShareNotFound $e) {
+            \OC_Response::setStatus(404);
+            \OCP\Util::writeLog('core-preview', 'Passed token parameter is not valid', \OCP\Util::DEBUG);
+            exit;
+        }
+
+        \OCP\JSON::checkUserExists($share->getShareOwner());
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($share->getShareOwner());
+
+
+        try {
+            $path = Filesystem::getPath($share->getNodeId());
+        } catch (NotFoundException $e) {
+            \OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
+            \OC_Response::setStatus(404);
+            \OCP\JSON::error(array('success' => false));
+            exit();
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK && $share->getPassword() !== null) {
+            if (!self::authenticate($share, $password)) {
+                \OC_Response::setStatus(403);
+                \OCP\JSON::error(array('success' => false));
+                exit();
+            }
+        }
+
+        $basePath = $path;
+
+        if ($relativePath !== null && Filesystem::isReadable($basePath . $relativePath)) {
+            $path .= Filesystem::normalizePath($relativePath);
+        }
+
+        return array(
+            'share' => $share,
+            'basePath' => $basePath,
+            'realPath' => $path
+        );
+    }
+
+    /**
+     * Authenticate link item with the given password
+     * or with the session if no password was given.
+     * @param \OCP\Share\IShare $share
+     * @param string $password optional password
+     *
+     * @return boolean true if authorized, false otherwise
+     */
+    public static function authenticate($share, $password = null) {
+        $shareManager = \OC::$server->getShareManager();
+
+        if ($password !== null) {
+            if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {
+                if ($shareManager->checkPassword($share, $password)) {
+                    \OC::$server->getSession()->set('public_link_authenticated', (string)$share->getId());
+                    return true;
+                }
+            }
+        } else {
+            // not authenticated ?
+            if (\OC::$server->getSession()->exists('public_link_authenticated')
+                && \OC::$server->getSession()->get('public_link_authenticated') !== (string)$share->getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static function getSharesFromItem($target) {
+        $result = array();
+        $owner = Filesystem::getOwner($target);
+        Filesystem::initMountPoints($owner);
+        $info = Filesystem::getFileInfo($target);
+        $ownerView = new View('/'.$owner.'/files');
+        if ( $owner != User::getUser() ) {
+            $path = $ownerView->getPath($info['fileid']);
+        } else {
+            $path = $target;
+        }
+
+
+        $ids = array();
+        while ($path !== dirname($path)) {
+            $info = $ownerView->getFileInfo($path);
+            if ($info instanceof \OC\Files\FileInfo) {
+                $ids[] = $info['fileid'];
+            } else {
+                \OCP\Util::writeLog('sharing', 'No fileinfo available for: ' . $path, \OCP\Util::WARN);
+            }
+            $path = dirname($path);
+        }
+
+        if (!empty($ids)) {
+
+            $idList = array_chunk($ids, 99, true);
+
+            foreach ($idList as $subList) {
+                $statement = "SELECT `share_with`, `share_type`, `file_target` FROM `*PREFIX*share` WHERE `file_source` IN (" . implode(',', $subList) . ") AND `share_type` IN (0, 1, 2)";
+                $query = \OCP\DB::prepare($statement);
+                $r = $query->execute();
+                $result = array_merge($result, $r->fetchAll());
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * get the UID of the owner of the file and the path to the file relative to
+     * owners files folder
+     *
+     * @param $filename
+     * @return array
+     * @throws \OC\User\NoUserException
+     */
+    public static function getUidAndFilename($filename) {
+        $uid = Filesystem::getOwner($filename);
+        $userManager = \OC::$server->getUserManager();
+        // if the user with the UID doesn't exists, e.g. because the UID points
+        // to a remote user with a federated cloud ID we use the current logged-in
+        // user. We need a valid local user to create the share
+        if (!$userManager->userExists($uid)) {
+            $uid = User::getUser();
+        }
+        Filesystem::initMountPoints($uid);
+        if ( $uid != User::getUser() ) {
+            $info = Filesystem::getFileInfo($filename);
+            $ownerView = new View('/'.$uid.'/files');
+            try {
+                $filename = $ownerView->getPath($info['fileid']);
+            } catch (NotFoundException $e) {
+                $filename = null;
+            }
+        }
+        return [$uid, $filename];
+    }
+
+    /**
+     * Format a path to be relative to the /user/files/ directory
+     * @param string $path the absolute path
+     * @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
+     */
+    public static function stripUserFilesPath($path) {
+        $trimmed = ltrim($path, '/');
+        $split = explode('/', $trimmed);
+
+        // it is not a file relative to data/user/files
+        if (count($split) < 3 || $split[1] !== 'files') {
+            return false;
+        }
+
+        $sliced = array_slice($split, 2);
+        $relPath = implode('/', $sliced);
+
+        return $relPath;
+    }
+
+    /**
+     * check if file name already exists and generate unique target
+     *
+     * @param string $path
+     * @param array $excludeList
+     * @param View $view
+     * @return string $path
+     */
+    public static function generateUniqueTarget($path, $excludeList, $view) {
+        $pathinfo = pathinfo($path);
+        $ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : '';
+        $name = $pathinfo['filename'];
+        $dir = $pathinfo['dirname'];
+        $i = 2;
+        while ($view->file_exists($path) || in_array($path, $excludeList)) {
+            $path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
+            $i++;
+        }
+
+        return $path;
+    }
+
+    /**
+     * get default share folder
+     *
+     * @param \OC\Files\View
+     * @return string
+     */
+    public static function getShareFolder($view = null) {
+        if ($view === null) {
+            $view = Filesystem::getView();
+        }
+        $shareFolder = \OC::$server->getConfig()->getSystemValue('share_folder', '/');
+        $shareFolder = Filesystem::normalizePath($shareFolder);
+
+        if (!$view->file_exists($shareFolder)) {
+            $dir = '';
+            $subdirs = explode('/', $shareFolder);
+            foreach ($subdirs as $subdir) {
+                $dir = $dir . '/' . $subdir;
+                if (!$view->is_dir($dir)) {
+                    $view->mkdir($dir);
+                }
+            }
+        }
+
+        return $shareFolder;
+
+    }
+
+    /**
+     * set default share folder
+     *
+     * @param string $shareFolder
+     */
+    public static function setShareFolder($shareFolder) {
+        \OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
+    }
 
 }

lib/private/DB/Migrator.php

Doc Comments +8 added lines

@@ -273,6 +273,10 @@ 
 		return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
 	}
 
+	/**
+	 * @param integer $step
+	 * @param integer $max
+	 */
 	protected function emit($sql, $step, $max) {
 		if ($this->noEmit) {
 			return;
@@ -283,6 +287,10 @@ 
 		$this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max]));
 	}
 
+	/**
+	 * @param integer $step
+	 * @param integer $max
+	 */
 	private function emitCheckStep($tableName, $step, $max) {
 		if(is_null($this->dispatcher)) {
 			return;

Indentation +267 added lines, -267 removed lines

@@ -43,271 +43,271 @@
 
 class Migrator {
 
-	/**
-	 * @var \Doctrine\DBAL\Connection $connection
-	 */
-	protected $connection;
-
-	/**
-	 * @var ISecureRandom
-	 */
-	private $random;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var EventDispatcher  */
-	private $dispatcher;
-
-	/** @var bool */
-	private $noEmit = false;
-
-	/**
-	 * @param \Doctrine\DBAL\Connection|Connection $connection
-	 * @param ISecureRandom $random
-	 * @param IConfig $config
-	 * @param EventDispatcher $dispatcher
-	 */
-	public function __construct(\Doctrine\DBAL\Connection $connection,
-								ISecureRandom $random,
-								IConfig $config,
-								EventDispatcher $dispatcher = null) {
-		$this->connection = $connection;
-		$this->random = $random;
-		$this->config = $config;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 */
-	public function migrate(Schema $targetSchema) {
-		$this->noEmit = true;
-		$this->applySchema($targetSchema);
-	}
-
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 * @return string
-	 */
-	public function generateChangeScript(Schema $targetSchema) {
-		$schemaDiff = $this->getDiff($targetSchema, $this->connection);
-
-		$script = '';
-		$sqls = $schemaDiff->toSql($this->connection->getDatabasePlatform());
-		foreach ($sqls as $sql) {
-			$script .= $this->convertStatementToScript($sql);
-		}
-
-		return $script;
-	}
-
-	/**
-	 * @param Schema $targetSchema
-	 * @throws \OC\DB\MigrationException
-	 */
-	public function checkMigrate(Schema $targetSchema) {
-		$this->noEmit = true;
-		/**@var \Doctrine\DBAL\Schema\Table[] $tables */
-		$tables = $targetSchema->getTables();
-		$filterExpression = $this->getFilterExpression();
-		$this->connection->getConfiguration()->
-			setFilterSchemaAssetsExpression($filterExpression);
-		$existingTables = $this->connection->getSchemaManager()->listTableNames();
-
-		$step = 0;
-		foreach ($tables as $table) {
-			if (strpos($table->getName(), '.')) {
-				list(, $tableName) = explode('.', $table->getName());
-			} else {
-				$tableName = $table->getName();
-			}
-			$this->emitCheckStep($tableName, $step++, count($tables));
-			// don't need to check for new tables
-			if (array_search($tableName, $existingTables) !== false) {
-				$this->checkTableMigrate($table);
-			}
-		}
-	}
-
-	/**
-	 * Create a unique name for the temporary table
-	 *
-	 * @param string $name
-	 * @return string
-	 */
-	protected function generateTemporaryTableName($name) {
-		return $this->config->getSystemValue('dbtableprefix', 'oc_') . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
-	}
-
-	/**
-	 * Check the migration of a table on a copy so we can detect errors before messing with the real table
-	 *
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @throws \OC\DB\MigrationException
-	 */
-	protected function checkTableMigrate(Table $table) {
-		$name = $table->getName();
-		$tmpName = $this->generateTemporaryTableName($name);
-
-		$this->copyTable($name, $tmpName);
-
-		//create the migration schema for the temporary table
-		$tmpTable = $this->renameTableSchema($table, $tmpName);
-		$schemaConfig = new SchemaConfig();
-		$schemaConfig->setName($this->connection->getDatabase());
-		$schema = new Schema(array($tmpTable), array(), $schemaConfig);
-
-		try {
-			$this->applySchema($schema);
-			$this->dropTable($tmpName);
-		} catch (DBALException $e) {
-			// pgsql needs to commit it's failed transaction before doing anything else
-			if ($this->connection->isTransactionActive()) {
-				$this->connection->commit();
-			}
-			$this->dropTable($tmpName);
-			throw new MigrationException($table->getName(), $e->getMessage());
-		}
-	}
-
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param string $newName
-	 * @return \Doctrine\DBAL\Schema\Table
-	 */
-	protected function renameTableSchema(Table $table, $newName) {
-		/**
-		 * @var \Doctrine\DBAL\Schema\Index[] $indexes
-		 */
-		$indexes = $table->getIndexes();
-		$newIndexes = array();
-		foreach ($indexes as $index) {
-			if ($index->isPrimary()) {
-				// do not rename primary key
-				$indexName = $index->getName();
-			} else {
-				// avoid conflicts in index names
-				$indexName = $this->config->getSystemValue('dbtableprefix', 'oc_') . $this->random->generate(13, ISecureRandom::CHAR_LOWER);
-			}
-			$newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary());
-		}
-
-		// foreign keys are not supported so we just set it to an empty array
-		return new Table($newName, $table->getColumns(), $newIndexes, array(), 0, $table->getOptions());
-	}
-
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 * @throws DBALException
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		// adjust varchar columns with a length higher then getVarcharMaxLength to clob
-		foreach ($targetSchema->getTables() as $table) {
-			foreach ($table->getColumns() as $column) {
-				if ($column->getType() instanceof StringType) {
-					if ($column->getLength() > $connection->getDatabasePlatform()->getVarcharMaxLength()) {
-						$column->setType(Type::getType('text'));
-						$column->setLength(null);
-					}
-				}
-			}
-		}
-
-		$filterExpression = $this->getFilterExpression();
-		$this->connection->getConfiguration()->
-		setFilterSchemaAssetsExpression($filterExpression);
-		$sourceSchema = $connection->getSchemaManager()->createSchema();
-
-		// remove tables we don't know about
-		/** @var $table \Doctrine\DBAL\Schema\Table */
-		foreach ($sourceSchema->getTables() as $table) {
-			if (!$targetSchema->hasTable($table->getName())) {
-				$sourceSchema->dropTable($table->getName());
-			}
-		}
-		// remove sequences we don't know about
-		foreach ($sourceSchema->getSequences() as $table) {
-			if (!$targetSchema->hasSequence($table->getName())) {
-				$sourceSchema->dropSequence($table->getName());
-			}
-		}
-
-		$comparator = new Comparator();
-		return $comparator->compare($sourceSchema, $targetSchema);
-	}
-
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 */
-	protected function applySchema(Schema $targetSchema, \Doctrine\DBAL\Connection $connection = null) {
-		if (is_null($connection)) {
-			$connection = $this->connection;
-		}
-
-		$schemaDiff = $this->getDiff($targetSchema, $connection);
-
-		$connection->beginTransaction();
-		$sqls = $schemaDiff->toSql($connection->getDatabasePlatform());
-		$step = 0;
-		foreach ($sqls as $sql) {
-			$this->emit($sql, $step++, count($sqls));
-			$connection->query($sql);
-		}
-		$connection->commit();
-	}
-
-	/**
-	 * @param string $sourceName
-	 * @param string $targetName
-	 */
-	protected function copyTable($sourceName, $targetName) {
-		$quotedSource = $this->connection->quoteIdentifier($sourceName);
-		$quotedTarget = $this->connection->quoteIdentifier($targetName);
-
-		$this->connection->exec('CREATE TABLE ' . $quotedTarget . ' (LIKE ' . $quotedSource . ')');
-		$this->connection->exec('INSERT INTO ' . $quotedTarget . ' SELECT * FROM ' . $quotedSource);
-	}
-
-	/**
-	 * @param string $name
-	 */
-	protected function dropTable($name) {
-		$this->connection->exec('DROP TABLE ' . $this->connection->quoteIdentifier($name));
-	}
-
-	/**
-	 * @param $statement
-	 * @return string
-	 */
-	protected function convertStatementToScript($statement) {
-		$script = $statement . ';';
-		$script .= PHP_EOL;
-		$script .= PHP_EOL;
-		return $script;
-	}
-
-	protected function getFilterExpression() {
-		return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-	}
-
-	protected function emit($sql, $step, $max) {
-		if ($this->noEmit) {
-			return;
-		}
-		if(is_null($this->dispatcher)) {
-			return;
-		}
-		$this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max]));
-	}
-
-	private function emitCheckStep($tableName, $step, $max) {
-		if(is_null($this->dispatcher)) {
-			return;
-		}
-		$this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step+1, $max]));
-	}
+    /**
+     * @var \Doctrine\DBAL\Connection $connection
+     */
+    protected $connection;
+
+    /**
+     * @var ISecureRandom
+     */
+    private $random;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var EventDispatcher  */
+    private $dispatcher;
+
+    /** @var bool */
+    private $noEmit = false;
+
+    /**
+     * @param \Doctrine\DBAL\Connection|Connection $connection
+     * @param ISecureRandom $random
+     * @param IConfig $config
+     * @param EventDispatcher $dispatcher
+     */
+    public function __construct(\Doctrine\DBAL\Connection $connection,
+                                ISecureRandom $random,
+                                IConfig $config,
+                                EventDispatcher $dispatcher = null) {
+        $this->connection = $connection;
+        $this->random = $random;
+        $this->config = $config;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     */
+    public function migrate(Schema $targetSchema) {
+        $this->noEmit = true;
+        $this->applySchema($targetSchema);
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     * @return string
+     */
+    public function generateChangeScript(Schema $targetSchema) {
+        $schemaDiff = $this->getDiff($targetSchema, $this->connection);
+
+        $script = '';
+        $sqls = $schemaDiff->toSql($this->connection->getDatabasePlatform());
+        foreach ($sqls as $sql) {
+            $script .= $this->convertStatementToScript($sql);
+        }
+
+        return $script;
+    }
+
+    /**
+     * @param Schema $targetSchema
+     * @throws \OC\DB\MigrationException
+     */
+    public function checkMigrate(Schema $targetSchema) {
+        $this->noEmit = true;
+        /**@var \Doctrine\DBAL\Schema\Table[] $tables */
+        $tables = $targetSchema->getTables();
+        $filterExpression = $this->getFilterExpression();
+        $this->connection->getConfiguration()->
+            setFilterSchemaAssetsExpression($filterExpression);
+        $existingTables = $this->connection->getSchemaManager()->listTableNames();
+
+        $step = 0;
+        foreach ($tables as $table) {
+            if (strpos($table->getName(), '.')) {
+                list(, $tableName) = explode('.', $table->getName());
+            } else {
+                $tableName = $table->getName();
+            }
+            $this->emitCheckStep($tableName, $step++, count($tables));
+            // don't need to check for new tables
+            if (array_search($tableName, $existingTables) !== false) {
+                $this->checkTableMigrate($table);
+            }
+        }
+    }
+
+    /**
+     * Create a unique name for the temporary table
+     *
+     * @param string $name
+     * @return string
+     */
+    protected function generateTemporaryTableName($name) {
+        return $this->config->getSystemValue('dbtableprefix', 'oc_') . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+    }
+
+    /**
+     * Check the migration of a table on a copy so we can detect errors before messing with the real table
+     *
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @throws \OC\DB\MigrationException
+     */
+    protected function checkTableMigrate(Table $table) {
+        $name = $table->getName();
+        $tmpName = $this->generateTemporaryTableName($name);
+
+        $this->copyTable($name, $tmpName);
+
+        //create the migration schema for the temporary table
+        $tmpTable = $this->renameTableSchema($table, $tmpName);
+        $schemaConfig = new SchemaConfig();
+        $schemaConfig->setName($this->connection->getDatabase());
+        $schema = new Schema(array($tmpTable), array(), $schemaConfig);
+
+        try {
+            $this->applySchema($schema);
+            $this->dropTable($tmpName);
+        } catch (DBALException $e) {
+            // pgsql needs to commit it's failed transaction before doing anything else
+            if ($this->connection->isTransactionActive()) {
+                $this->connection->commit();
+            }
+            $this->dropTable($tmpName);
+            throw new MigrationException($table->getName(), $e->getMessage());
+        }
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param string $newName
+     * @return \Doctrine\DBAL\Schema\Table
+     */
+    protected function renameTableSchema(Table $table, $newName) {
+        /**
+         * @var \Doctrine\DBAL\Schema\Index[] $indexes
+         */
+        $indexes = $table->getIndexes();
+        $newIndexes = array();
+        foreach ($indexes as $index) {
+            if ($index->isPrimary()) {
+                // do not rename primary key
+                $indexName = $index->getName();
+            } else {
+                // avoid conflicts in index names
+                $indexName = $this->config->getSystemValue('dbtableprefix', 'oc_') . $this->random->generate(13, ISecureRandom::CHAR_LOWER);
+            }
+            $newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary());
+        }
+
+        // foreign keys are not supported so we just set it to an empty array
+        return new Table($newName, $table->getColumns(), $newIndexes, array(), 0, $table->getOptions());
+    }
+
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     * @throws DBALException
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        // adjust varchar columns with a length higher then getVarcharMaxLength to clob
+        foreach ($targetSchema->getTables() as $table) {
+            foreach ($table->getColumns() as $column) {
+                if ($column->getType() instanceof StringType) {
+                    if ($column->getLength() > $connection->getDatabasePlatform()->getVarcharMaxLength()) {
+                        $column->setType(Type::getType('text'));
+                        $column->setLength(null);
+                    }
+                }
+            }
+        }
+
+        $filterExpression = $this->getFilterExpression();
+        $this->connection->getConfiguration()->
+        setFilterSchemaAssetsExpression($filterExpression);
+        $sourceSchema = $connection->getSchemaManager()->createSchema();
+
+        // remove tables we don't know about
+        /** @var $table \Doctrine\DBAL\Schema\Table */
+        foreach ($sourceSchema->getTables() as $table) {
+            if (!$targetSchema->hasTable($table->getName())) {
+                $sourceSchema->dropTable($table->getName());
+            }
+        }
+        // remove sequences we don't know about
+        foreach ($sourceSchema->getSequences() as $table) {
+            if (!$targetSchema->hasSequence($table->getName())) {
+                $sourceSchema->dropSequence($table->getName());
+            }
+        }
+
+        $comparator = new Comparator();
+        return $comparator->compare($sourceSchema, $targetSchema);
+    }
+
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     */
+    protected function applySchema(Schema $targetSchema, \Doctrine\DBAL\Connection $connection = null) {
+        if (is_null($connection)) {
+            $connection = $this->connection;
+        }
+
+        $schemaDiff = $this->getDiff($targetSchema, $connection);
+
+        $connection->beginTransaction();
+        $sqls = $schemaDiff->toSql($connection->getDatabasePlatform());
+        $step = 0;
+        foreach ($sqls as $sql) {
+            $this->emit($sql, $step++, count($sqls));
+            $connection->query($sql);
+        }
+        $connection->commit();
+    }
+
+    /**
+     * @param string $sourceName
+     * @param string $targetName
+     */
+    protected function copyTable($sourceName, $targetName) {
+        $quotedSource = $this->connection->quoteIdentifier($sourceName);
+        $quotedTarget = $this->connection->quoteIdentifier($targetName);
+
+        $this->connection->exec('CREATE TABLE ' . $quotedTarget . ' (LIKE ' . $quotedSource . ')');
+        $this->connection->exec('INSERT INTO ' . $quotedTarget . ' SELECT * FROM ' . $quotedSource);
+    }
+
+    /**
+     * @param string $name
+     */
+    protected function dropTable($name) {
+        $this->connection->exec('DROP TABLE ' . $this->connection->quoteIdentifier($name));
+    }
+
+    /**
+     * @param $statement
+     * @return string
+     */
+    protected function convertStatementToScript($statement) {
+        $script = $statement . ';';
+        $script .= PHP_EOL;
+        $script .= PHP_EOL;
+        return $script;
+    }
+
+    protected function getFilterExpression() {
+        return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+    }
+
+    protected function emit($sql, $step, $max) {
+        if ($this->noEmit) {
+            return;
+        }
+        if(is_null($this->dispatcher)) {
+            return;
+        }
+        $this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max]));
+    }
+
+    private function emitCheckStep($tableName, $step, $max) {
+        if(is_null($this->dispatcher)) {
+            return;
+        }
+        $this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step+1, $max]));
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -137,7 +137,7 @@ 
 	 * @return string
 	 */
 	protected function generateTemporaryTableName($name) {
-		return $this->config->getSystemValue('dbtableprefix', 'oc_') . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
+		return $this->config->getSystemValue('dbtableprefix', 'oc_').$name.'_'.$this->random->generate(13, ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 				$indexName = $index->getName();
 			} else {
 				// avoid conflicts in index names
-				$indexName = $this->config->getSystemValue('dbtableprefix', 'oc_') . $this->random->generate(13, ISecureRandom::CHAR_LOWER);
+				$indexName = $this->config->getSystemValue('dbtableprefix', 'oc_').$this->random->generate(13, ISecureRandom::CHAR_LOWER);
 			}
 			$newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary());
 		}
@@ -268,15 +268,15 @@ 
 		$quotedSource = $this->connection->quoteIdentifier($sourceName);
 		$quotedTarget = $this->connection->quoteIdentifier($targetName);
 
-		$this->connection->exec('CREATE TABLE ' . $quotedTarget . ' (LIKE ' . $quotedSource . ')');
-		$this->connection->exec('INSERT INTO ' . $quotedTarget . ' SELECT * FROM ' . $quotedSource);
+		$this->connection->exec('CREATE TABLE '.$quotedTarget.' (LIKE '.$quotedSource.')');
+		$this->connection->exec('INSERT INTO '.$quotedTarget.' SELECT * FROM '.$quotedSource);
 	}
 
 	/**
 	 * @param string $name
 	 */
 	protected function dropTable($name) {
-		$this->connection->exec('DROP TABLE ' . $this->connection->quoteIdentifier($name));
+		$this->connection->exec('DROP TABLE '.$this->connection->quoteIdentifier($name));
 	}
 
 	/**
@@ -284,30 +284,30 @@ 
 	 * @return string
 	 */
 	protected function convertStatementToScript($statement) {
-		$script = $statement . ';';
+		$script = $statement.';';
 		$script .= PHP_EOL;
 		$script .= PHP_EOL;
 		return $script;
 	}
 
 	protected function getFilterExpression() {
-		return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+		return '/^'.preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')).'/';
 	}
 
 	protected function emit($sql, $step, $max) {
 		if ($this->noEmit) {
 			return;
 		}
-		if(is_null($this->dispatcher)) {
+		if (is_null($this->dispatcher)) {
 			return;
 		}
-		$this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max]));
+		$this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step + 1, $max]));
 	}
 
 	private function emitCheckStep($tableName, $step, $max) {
-		if(is_null($this->dispatcher)) {
+		if (is_null($this->dispatcher)) {
 			return;
 		}
-		$this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step+1, $max]));
+		$this->dispatcher->dispatch('\OC\DB\Migrator::checkTable', new GenericEvent($tableName, [$step + 1, $max]));
 	}
 }

apps/files_external/lib/Command/Backends.php

Unused Use Statements -5 removed lines

@@ -27,13 +27,8 @@
 use OCA\Files_External\Lib\DefinitionParameter;
 use OCA\Files_External\Service\BackendService;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableHelper;
-use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\Input;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Backends extends Base {

Indentation +77 added lines, -77 removed lines

@@ -32,91 +32,91 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Backends extends Base {
-	/** @var BackendService */
-	private $backendService;
+    /** @var BackendService */
+    private $backendService;
 
-	function __construct(BackendService $backendService
-	) {
-		parent::__construct();
+    function __construct(BackendService $backendService
+    ) {
+        parent::__construct();
 
-		$this->backendService = $backendService;
-	}
+        $this->backendService = $backendService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:backends')
-			->setDescription('Show available authentication and storage backends')
-			->addArgument(
-				'type',
-				InputArgument::OPTIONAL,
-				'only show backends of a certain type. Possible values are "authentication" or "storage"'
-			)->addArgument(
-				'backend',
-				InputArgument::OPTIONAL,
-				'only show information of a specific backend'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:backends')
+            ->setDescription('Show available authentication and storage backends')
+            ->addArgument(
+                'type',
+                InputArgument::OPTIONAL,
+                'only show backends of a certain type. Possible values are "authentication" or "storage"'
+            )->addArgument(
+                'backend',
+                InputArgument::OPTIONAL,
+                'only show information of a specific backend'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$authBackends = $this->backendService->getAuthMechanisms();
-		$storageBackends = $this->backendService->getBackends();
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $authBackends = $this->backendService->getAuthMechanisms();
+        $storageBackends = $this->backendService->getBackends();
 
-		$data = [
-			'authentication' => array_map([$this, 'serializeAuthBackend'], $authBackends),
-			'storage' => array_map([$this, 'serializeAuthBackend'], $storageBackends)
-		];
+        $data = [
+            'authentication' => array_map([$this, 'serializeAuthBackend'], $authBackends),
+            'storage' => array_map([$this, 'serializeAuthBackend'], $storageBackends)
+        ];
 
-		$type = $input->getArgument('type');
-		$backend = $input->getArgument('backend');
-		if ($type) {
-			if (!isset($data[$type])) {
-				$output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>');
-				return 1;
-			}
-			$data = $data[$type];
+        $type = $input->getArgument('type');
+        $backend = $input->getArgument('backend');
+        if ($type) {
+            if (!isset($data[$type])) {
+                $output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>');
+                return 1;
+            }
+            $data = $data[$type];
 
-			if ($backend) {
-				if (!isset($data[$backend])) {
-					$output->writeln('<error>Unknown backend "' . $backend . '" of type  "' . $type . '"</error>');
-					return 1;
-				}
-				$data = $data[$backend];
-			}
-		}
+            if ($backend) {
+                if (!isset($data[$backend])) {
+                    $output->writeln('<error>Unknown backend "' . $backend . '" of type  "' . $type . '"</error>');
+                    return 1;
+                }
+                $data = $data[$backend];
+            }
+        }
 
-		$this->writeArrayInOutputFormat($input, $output, $data);
-	}
+        $this->writeArrayInOutputFormat($input, $output, $data);
+    }
 
-	private function serializeAuthBackend(\JsonSerializable $backend) {
-		$data = $backend->jsonSerialize();
-		$result = [
-			'name' => $data['name'],
-			'identifier' => $data['identifier'],
-			'configuration' => $this->formatConfiguration($data['configuration'])
-		];
-		if ($backend instanceof Backend) {
-			$result['storage_class'] = $backend->getStorageClass();
-			$authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes()));
-			$result['supported_authentication_backends'] = array_keys($authBackends);
-			$authConfig = array_map(function (AuthMechanism $auth) {
-				return $this->serializeAuthBackend($auth)['configuration'];
-			}, $authBackends);
-			$result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig);
-		}
-		return $result;
-	}
+    private function serializeAuthBackend(\JsonSerializable $backend) {
+        $data = $backend->jsonSerialize();
+        $result = [
+            'name' => $data['name'],
+            'identifier' => $data['identifier'],
+            'configuration' => $this->formatConfiguration($data['configuration'])
+        ];
+        if ($backend instanceof Backend) {
+            $result['storage_class'] = $backend->getStorageClass();
+            $authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes()));
+            $result['supported_authentication_backends'] = array_keys($authBackends);
+            $authConfig = array_map(function (AuthMechanism $auth) {
+                return $this->serializeAuthBackend($auth)['configuration'];
+            }, $authBackends);
+            $result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param DefinitionParameter[] $parameters
-	 * @return string[]
-	 */
-	private function formatConfiguration(array $parameters) {
-		$configuration = array_filter($parameters, function (DefinitionParameter $parameter) {
-			return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN;
-		});
-		return array_map(function (DefinitionParameter $parameter) {
-			return $parameter->getTypeName();
-		}, $configuration);
-	}
+    /**
+     * @param DefinitionParameter[] $parameters
+     * @return string[]
+     */
+    private function formatConfiguration(array $parameters) {
+        $configuration = array_filter($parameters, function (DefinitionParameter $parameter) {
+            return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN;
+        });
+        return array_map(function (DefinitionParameter $parameter) {
+            return $parameter->getTypeName();
+        }, $configuration);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -71,14 +71,14 @@ 
 		$backend = $input->getArgument('backend');
 		if ($type) {
 			if (!isset($data[$type])) {
-				$output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>');
+				$output->writeln('<error>Invalid type "'.$type.'". Possible values are "authentication" or "storage"</error>');
 				return 1;
 			}
 			$data = $data[$type];
 
 			if ($backend) {
 				if (!isset($data[$backend])) {
-					$output->writeln('<error>Unknown backend "' . $backend . '" of type  "' . $type . '"</error>');
+					$output->writeln('<error>Unknown backend "'.$backend.'" of type  "'.$type.'"</error>');
 					return 1;
 				}
 				$data = $data[$backend];
@@ -99,7 +99,7 @@ 
 			$result['storage_class'] = $backend->getStorageClass();
 			$authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes()));
 			$result['supported_authentication_backends'] = array_keys($authBackends);
-			$authConfig = array_map(function (AuthMechanism $auth) {
+			$authConfig = array_map(function(AuthMechanism $auth) {
 				return $this->serializeAuthBackend($auth)['configuration'];
 			}, $authBackends);
 			$result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig);
@@ -112,10 +112,10 @@ 
 	 * @return string[]
 	 */
 	private function formatConfiguration(array $parameters) {
-		$configuration = array_filter($parameters, function (DefinitionParameter $parameter) {
+		$configuration = array_filter($parameters, function(DefinitionParameter $parameter) {
 			return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN;
 		});
-		return array_map(function (DefinitionParameter $parameter) {
+		return array_map(function(DefinitionParameter $parameter) {
 			return $parameter->getTypeName();
 		}, $configuration);
 	}

lib/private/Console/Application.php

Unused Use Statements -1 removed lines

@@ -27,7 +27,6 @@
 
 use OC_App;
 use OCP\Console\ConsoleEvent;
-use OCP\Defaults;
 use OCP\IConfig;
 use OCP\IRequest;
 use Symfony\Component\Console\Application as SymfonyApplication;

Indentation +102 added lines, -102 removed lines

@@ -39,110 +39,110 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class Application {
-	/** @var IConfig */
-	private $config;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-	/** @var IRequest */
-	private $request;
+    /** @var IConfig */
+    private $config;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+    /** @var IRequest */
+    private $request;
 
-	/**
-	 * @param IConfig $config
-	 * @param EventDispatcherInterface $dispatcher
-	 * @param IRequest $request
-	 */
-	public function __construct(IConfig $config, EventDispatcherInterface $dispatcher, IRequest $request) {
-		$defaults = \OC::$server->getThemingDefaults();
-		$this->config = $config;
-		$this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
-		$this->dispatcher = $dispatcher;
-		$this->request = $request;
-	}
+    /**
+     * @param IConfig $config
+     * @param EventDispatcherInterface $dispatcher
+     * @param IRequest $request
+     */
+    public function __construct(IConfig $config, EventDispatcherInterface $dispatcher, IRequest $request) {
+        $defaults = \OC::$server->getThemingDefaults();
+        $this->config = $config;
+        $this->application = new SymfonyApplication($defaults->getName(), \OC_Util::getVersionString());
+        $this->dispatcher = $dispatcher;
+        $this->request = $request;
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @throws \Exception
-	 */
-	public function loadCommands(InputInterface $input, OutputInterface $output) {
-		// $application is required to be defined in the register_command scripts
-		$application = $this->application;
-		$inputDefinition = $application->getDefinition();
-		$inputDefinition->addOption(
-			new InputOption(
-				'no-warnings', 
-				null, 
-				InputOption::VALUE_NONE, 
-				'Skip global warnings, show command output only', 
-				null
-			)
-		);
-		try {
-			$input->bind($inputDefinition);
-		} catch (\RuntimeException $e) {
-			//expected if there are extra options
-		}
-		if ($input->getOption('no-warnings')) {
-			$output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
-		}
-		require_once __DIR__ . '/../../../core/register_command.php';
-		if ($this->config->getSystemValue('installed', false)) {
-			if (\OCP\Util::needUpgrade()) {
-				$output->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
-				$output->writeln("You may use your browser or the occ upgrade command to do the upgrade");
-			} elseif ($this->config->getSystemValue('maintenance', false)) {
-				$output->writeln("Nextcloud is in maintenance mode - no app have been loaded");
-			} else {
-				OC_App::loadApps();
-				foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
-					$appPath = \OC_App::getAppPath($app);
-					if($appPath === false) {
-						continue;
-					}
-					\OC_App::registerAutoloading($app, $appPath);
-					$file = $appPath . '/appinfo/register_command.php';
-					if (file_exists($file)) {
-						require $file;
-					}
-				}
-			}
-		} else {
-			$output->writeln("Nextcloud is not installed - only a limited number of commands are available");
-		}
-		$input = new ArgvInput();
-		if ($input->getFirstArgument() !== 'check') {
-			$errors = \OC_Util::checkServer(\OC::$server->getConfig());
-			if (!empty($errors)) {
-				foreach ($errors as $error) {
-					$output->writeln((string)$error['error']);
-					$output->writeln((string)$error['hint']);
-					$output->writeln('');
-				}
-				throw new \Exception("Environment not properly prepared.");
-			}
-		}
-	}
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @throws \Exception
+     */
+    public function loadCommands(InputInterface $input, OutputInterface $output) {
+        // $application is required to be defined in the register_command scripts
+        $application = $this->application;
+        $inputDefinition = $application->getDefinition();
+        $inputDefinition->addOption(
+            new InputOption(
+                'no-warnings', 
+                null, 
+                InputOption::VALUE_NONE, 
+                'Skip global warnings, show command output only', 
+                null
+            )
+        );
+        try {
+            $input->bind($inputDefinition);
+        } catch (\RuntimeException $e) {
+            //expected if there are extra options
+        }
+        if ($input->getOption('no-warnings')) {
+            $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
+        }
+        require_once __DIR__ . '/../../../core/register_command.php';
+        if ($this->config->getSystemValue('installed', false)) {
+            if (\OCP\Util::needUpgrade()) {
+                $output->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
+                $output->writeln("You may use your browser or the occ upgrade command to do the upgrade");
+            } elseif ($this->config->getSystemValue('maintenance', false)) {
+                $output->writeln("Nextcloud is in maintenance mode - no app have been loaded");
+            } else {
+                OC_App::loadApps();
+                foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
+                    $appPath = \OC_App::getAppPath($app);
+                    if($appPath === false) {
+                        continue;
+                    }
+                    \OC_App::registerAutoloading($app, $appPath);
+                    $file = $appPath . '/appinfo/register_command.php';
+                    if (file_exists($file)) {
+                        require $file;
+                    }
+                }
+            }
+        } else {
+            $output->writeln("Nextcloud is not installed - only a limited number of commands are available");
+        }
+        $input = new ArgvInput();
+        if ($input->getFirstArgument() !== 'check') {
+            $errors = \OC_Util::checkServer(\OC::$server->getConfig());
+            if (!empty($errors)) {
+                foreach ($errors as $error) {
+                    $output->writeln((string)$error['error']);
+                    $output->writeln((string)$error['hint']);
+                    $output->writeln('');
+                }
+                throw new \Exception("Environment not properly prepared.");
+            }
+        }
+    }
 
-	/**
-	 * Sets whether to automatically exit after a command execution or not.
-	 *
-	 * @param bool $boolean Whether to automatically exit after a command execution or not
-	 */
-	public function setAutoExit($boolean) {
-		$this->application->setAutoExit($boolean);
-	}
+    /**
+     * Sets whether to automatically exit after a command execution or not.
+     *
+     * @param bool $boolean Whether to automatically exit after a command execution or not
+     */
+    public function setAutoExit($boolean) {
+        $this->application->setAutoExit($boolean);
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function run(InputInterface $input = null, OutputInterface $output = null) {
-		$this->dispatcher->dispatch(ConsoleEvent::EVENT_RUN, new ConsoleEvent(
-			ConsoleEvent::EVENT_RUN,
-			$this->request->server['argv']
-		));
-		return $this->application->run($input, $output);
-	}
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws \Exception
+     */
+    public function run(InputInterface $input = null, OutputInterface $output = null) {
+        $this->dispatcher->dispatch(ConsoleEvent::EVENT_RUN, new ConsoleEvent(
+            ConsoleEvent::EVENT_RUN,
+            $this->request->server['argv']
+        ));
+        return $this->application->run($input, $output);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -85,7 +85,7 @@ 
 		if ($input->getOption('no-warnings')) {
 			$output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
 		}
-		require_once __DIR__ . '/../../../core/register_command.php';
+		require_once __DIR__.'/../../../core/register_command.php';
 		if ($this->config->getSystemValue('installed', false)) {
 			if (\OCP\Util::needUpgrade()) {
 				$output->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
@@ -96,11 +96,11 @@ 
 				OC_App::loadApps();
 				foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
 					$appPath = \OC_App::getAppPath($app);
-					if($appPath === false) {
+					if ($appPath === false) {
 						continue;
 					}
 					\OC_App::registerAutoloading($app, $appPath);
-					$file = $appPath . '/appinfo/register_command.php';
+					$file = $appPath.'/appinfo/register_command.php';
 					if (file_exists($file)) {
 						require $file;
 					}
@@ -114,8 +114,8 @@ 
 			$errors = \OC_Util::checkServer(\OC::$server->getConfig());
 			if (!empty($errors)) {
 				foreach ($errors as $error) {
-					$output->writeln((string)$error['error']);
-					$output->writeln((string)$error['hint']);
+					$output->writeln((string) $error['error']);
+					$output->writeln((string) $error['hint']);
 					$output->writeln('');
 				}
 				throw new \Exception("Environment not properly prepared.");

lib/private/TemplateLayout.php

Unused Use Statements -9 removed lines

@@ -35,15 +35,6 @@
  */
 namespace OC;
 
-use Assetic\Asset\AssetCollection;
-use Assetic\Asset\FileAsset;
-use Assetic\AssetWriter;
-use Assetic\Filter\CssImportFilter;
-use Assetic\Filter\CssMinFilter;
-use Assetic\Filter\CssRewriteFilter;
-use Assetic\Filter\JSqueezeFilter;
-use Assetic\Filter\SeparatorFilter;
-
 class TemplateLayout extends \OC_Template {
 
 	private static $versionHash = '';

Braces +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 			parent::__construct( 'core', 'layout.user' );
 			if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
 				$this->assign('bodyid', 'body-settings');
-			}else{
+			} else{
 				$this->assign('bodyid', 'body-user');
 			}
 

Indentation +167 added lines, -167 removed lines

@@ -46,172 +46,172 @@
 
 class TemplateLayout extends \OC_Template {
 
-	private static $versionHash = '';
-
-	/**
-	 * @var \OCP\IConfig
-	 */
-	private $config;
-
-	/**
-	 * @param string $renderAs
-	 * @param string $appId application id
-	 */
-	public function __construct( $renderAs, $appId = '' ) {
-
-		// yes - should be injected ....
-		$this->config = \OC::$server->getConfig();
-
-		// Decide which page we show
-		if($renderAs == 'user') {
-			parent::__construct( 'core', 'layout.user' );
-			if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
-				$this->assign('bodyid', 'body-settings');
-			}else{
-				$this->assign('bodyid', 'body-user');
-			}
-
-			// Code integrity notification
-			$integrityChecker = \OC::$server->getIntegrityCodeChecker();
-			if(\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) {
-				\OCP\Util::addScript('core', 'integritycheck-failed-notification');
-			}
-
-			// Add navigation entry
-			$this->assign( 'application', '');
-			$this->assign( 'appid', $appId );
-			$navigation = \OC_App::getNavigation();
-			$this->assign( 'navigation', $navigation);
-			$settingsNavigation = \OC_App::getSettingsNavigation();
-			$this->assign( 'settingsnavigation', $settingsNavigation);
-			foreach($navigation as $entry) {
-				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
-					break;
-				}
-			}
+    private static $versionHash = '';
+
+    /**
+     * @var \OCP\IConfig
+     */
+    private $config;
+
+    /**
+     * @param string $renderAs
+     * @param string $appId application id
+     */
+    public function __construct( $renderAs, $appId = '' ) {
+
+        // yes - should be injected ....
+        $this->config = \OC::$server->getConfig();
+
+        // Decide which page we show
+        if($renderAs == 'user') {
+            parent::__construct( 'core', 'layout.user' );
+            if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+                $this->assign('bodyid', 'body-settings');
+            }else{
+                $this->assign('bodyid', 'body-user');
+            }
+
+            // Code integrity notification
+            $integrityChecker = \OC::$server->getIntegrityCodeChecker();
+            if(\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) {
+                \OCP\Util::addScript('core', 'integritycheck-failed-notification');
+            }
+
+            // Add navigation entry
+            $this->assign( 'application', '');
+            $this->assign( 'appid', $appId );
+            $navigation = \OC_App::getNavigation();
+            $this->assign( 'navigation', $navigation);
+            $settingsNavigation = \OC_App::getSettingsNavigation();
+            $this->assign( 'settingsnavigation', $settingsNavigation);
+            foreach($navigation as $entry) {
+                if ($entry['active']) {
+                    $this->assign( 'application', $entry['name'] );
+                    break;
+                }
+            }
 			
-			foreach($settingsNavigation as $entry) {
-				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
-					break;
-				}
-			}
-			$userDisplayName = \OC_User::getDisplayName();
-			$appsMgmtActive = strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')) === 0;
-			if ($appsMgmtActive) {
-				$l = \OC::$server->getL10N('lib');
-				$this->assign('application', $l->t('Apps'));
-			}
-			$this->assign('user_displayname', $userDisplayName);
-			$this->assign('user_uid', \OC_User::getUser());
-			$this->assign('appsmanagement_active', $appsMgmtActive);
-			$this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true) === true);
-
-			if (\OC_User::getUser() === false) {
-				$this->assign('userAvatarSet', false);
-			} else {
-				$this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists());
-			}
-
-		} else if ($renderAs == 'error') {
-			parent::__construct('core', 'layout.guest', '', false);
-			$this->assign('bodyid', 'body-login');
-		} else if ($renderAs == 'guest') {
-			parent::__construct('core', 'layout.guest');
-			$this->assign('bodyid', 'body-login');
-		} else {
-			parent::__construct('core', 'layout.base');
-
-		}
-		// Send the language to our layouts
-		$this->assign('language', \OC_L10N::findLanguage());
-
-		if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
-			if (empty(self::$versionHash)) {
-				$v = \OC_App::getAppVersions();
-				$v['core'] = implode('.', \OCP\Util::getVersion());
-				self::$versionHash = md5(implode(',', $v));
-			}
-		} else {
-			self::$versionHash = md5('not installed');
-		}
-
-		// Add the js files
-		$jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
-		$this->assign('jsfiles', array());
-		if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
-			$this->append( 'jsfiles', \OC::$server->getURLGenerator()->linkToRoute('js_config', ['v' => self::$versionHash]));
-		}
-		foreach($jsFiles as $info) {
-			$web = $info[1];
-			$file = $info[2];
-			$this->append( 'jsfiles', $web.'/'.$file . '?v=' . self::$versionHash);
-		}
-
-		// Add the css files
-		$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
-		$this->assign('cssfiles', array());
-		$this->assign('printcssfiles', []);
-		$this->assign('versionHash', self::$versionHash);
-		foreach($cssFiles as $info) {
-			$web = $info[1];
-			$file = $info[2];
-
-			if (substr($file, -strlen('print.css')) === 'print.css') {
-				$this->append( 'printcssfiles', $web.'/'.$file . '?v=' . self::$versionHash);
-			} else {
-				$this->append( 'cssfiles', $web.'/'.$file . '?v=' . self::$versionHash);
-			}
-		}
-	}
-
-	/**
-	 * @param array $styles
-	 * @return array
-	 */
-	static public function findStylesheetFiles($styles) {
-		// Read the selected theme from the config file
-		$theme = \OC_Util::getTheme();
-
-		$locator = new \OC\Template\CSSResourceLocator(
-			\OC::$server->getLogger(),
-			$theme,
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ));
-		$locator->find($styles);
-		return $locator->getResources();
-	}
-
-	/**
-	 * @param array $scripts
-	 * @return array
-	 */
-	static public function findJavascriptFiles($scripts) {
-		// Read the selected theme from the config file
-		$theme = \OC_Util::getTheme();
-
-		$locator = new \OC\Template\JSResourceLocator(
-			\OC::$server->getLogger(),
-			$theme,
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ));
-		$locator->find($scripts);
-		return $locator->getResources();
-	}
-
-	/**
-	 * Converts the absolute file path to a relative path from \OC::$SERVERROOT
-	 * @param string $filePath Absolute path
-	 * @return string Relative path
-	 * @throws \Exception If $filePath is not under \OC::$SERVERROOT
-	 */
-	public static function convertToRelativePath($filePath) {
-		$relativePath = explode(\OC::$SERVERROOT, $filePath);
-		if(count($relativePath) !== 2) {
-			throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
-		}
-
-		return $relativePath[1];
-	}
+            foreach($settingsNavigation as $entry) {
+                if ($entry['active']) {
+                    $this->assign( 'application', $entry['name'] );
+                    break;
+                }
+            }
+            $userDisplayName = \OC_User::getDisplayName();
+            $appsMgmtActive = strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')) === 0;
+            if ($appsMgmtActive) {
+                $l = \OC::$server->getL10N('lib');
+                $this->assign('application', $l->t('Apps'));
+            }
+            $this->assign('user_displayname', $userDisplayName);
+            $this->assign('user_uid', \OC_User::getUser());
+            $this->assign('appsmanagement_active', $appsMgmtActive);
+            $this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true) === true);
+
+            if (\OC_User::getUser() === false) {
+                $this->assign('userAvatarSet', false);
+            } else {
+                $this->assign('userAvatarSet', \OC::$server->getAvatarManager()->getAvatar(\OC_User::getUser())->exists());
+            }
+
+        } else if ($renderAs == 'error') {
+            parent::__construct('core', 'layout.guest', '', false);
+            $this->assign('bodyid', 'body-login');
+        } else if ($renderAs == 'guest') {
+            parent::__construct('core', 'layout.guest');
+            $this->assign('bodyid', 'body-login');
+        } else {
+            parent::__construct('core', 'layout.base');
+
+        }
+        // Send the language to our layouts
+        $this->assign('language', \OC_L10N::findLanguage());
+
+        if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+            if (empty(self::$versionHash)) {
+                $v = \OC_App::getAppVersions();
+                $v['core'] = implode('.', \OCP\Util::getVersion());
+                self::$versionHash = md5(implode(',', $v));
+            }
+        } else {
+            self::$versionHash = md5('not installed');
+        }
+
+        // Add the js files
+        $jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
+        $this->assign('jsfiles', array());
+        if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
+            $this->append( 'jsfiles', \OC::$server->getURLGenerator()->linkToRoute('js_config', ['v' => self::$versionHash]));
+        }
+        foreach($jsFiles as $info) {
+            $web = $info[1];
+            $file = $info[2];
+            $this->append( 'jsfiles', $web.'/'.$file . '?v=' . self::$versionHash);
+        }
+
+        // Add the css files
+        $cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
+        $this->assign('cssfiles', array());
+        $this->assign('printcssfiles', []);
+        $this->assign('versionHash', self::$versionHash);
+        foreach($cssFiles as $info) {
+            $web = $info[1];
+            $file = $info[2];
+
+            if (substr($file, -strlen('print.css')) === 'print.css') {
+                $this->append( 'printcssfiles', $web.'/'.$file . '?v=' . self::$versionHash);
+            } else {
+                $this->append( 'cssfiles', $web.'/'.$file . '?v=' . self::$versionHash);
+            }
+        }
+    }
+
+    /**
+     * @param array $styles
+     * @return array
+     */
+    static public function findStylesheetFiles($styles) {
+        // Read the selected theme from the config file
+        $theme = \OC_Util::getTheme();
+
+        $locator = new \OC\Template\CSSResourceLocator(
+            \OC::$server->getLogger(),
+            $theme,
+            array( \OC::$SERVERROOT => \OC::$WEBROOT ),
+            array( \OC::$SERVERROOT => \OC::$WEBROOT ));
+        $locator->find($styles);
+        return $locator->getResources();
+    }
+
+    /**
+     * @param array $scripts
+     * @return array
+     */
+    static public function findJavascriptFiles($scripts) {
+        // Read the selected theme from the config file
+        $theme = \OC_Util::getTheme();
+
+        $locator = new \OC\Template\JSResourceLocator(
+            \OC::$server->getLogger(),
+            $theme,
+            array( \OC::$SERVERROOT => \OC::$WEBROOT ),
+            array( \OC::$SERVERROOT => \OC::$WEBROOT ));
+        $locator->find($scripts);
+        return $locator->getResources();
+    }
+
+    /**
+     * Converts the absolute file path to a relative path from \OC::$SERVERROOT
+     * @param string $filePath Absolute path
+     * @return string Relative path
+     * @throws \Exception If $filePath is not under \OC::$SERVERROOT
+     */
+    public static function convertToRelativePath($filePath) {
+        $relativePath = explode(\OC::$SERVERROOT, $filePath);
+        if(count($relativePath) !== 2) {
+            throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
+        }
+
+        return $relativePath[1];
+    }
 }

Spacing +26 added lines, -26 removed lines

@@ -57,43 +57,43 @@ 
 	 * @param string $renderAs
 	 * @param string $appId application id
 	 */
-	public function __construct( $renderAs, $appId = '' ) {
+	public function __construct($renderAs, $appId = '') {
 
 		// yes - should be injected ....
 		$this->config = \OC::$server->getConfig();
 
 		// Decide which page we show
-		if($renderAs == 'user') {
-			parent::__construct( 'core', 'layout.user' );
-			if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+		if ($renderAs == 'user') {
+			parent::__construct('core', 'layout.user');
+			if (in_array(\OC_App::getCurrentApp(), ['settings', 'admin', 'help']) !== false) {
 				$this->assign('bodyid', 'body-settings');
-			}else{
+			} else {
 				$this->assign('bodyid', 'body-user');
 			}
 
 			// Code integrity notification
 			$integrityChecker = \OC::$server->getIntegrityCodeChecker();
-			if(\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) {
+			if (\OC_User::isAdminUser(\OC_User::getUser()) && $integrityChecker->isCodeCheckEnforced() && !$integrityChecker->hasPassedCheck()) {
 				\OCP\Util::addScript('core', 'integritycheck-failed-notification');
 			}
 
 			// Add navigation entry
-			$this->assign( 'application', '');
-			$this->assign( 'appid', $appId );
+			$this->assign('application', '');
+			$this->assign('appid', $appId);
 			$navigation = \OC_App::getNavigation();
-			$this->assign( 'navigation', $navigation);
+			$this->assign('navigation', $navigation);
 			$settingsNavigation = \OC_App::getSettingsNavigation();
-			$this->assign( 'settingsnavigation', $settingsNavigation);
-			foreach($navigation as $entry) {
+			$this->assign('settingsnavigation', $settingsNavigation);
+			foreach ($navigation as $entry) {
 				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
+					$this->assign('application', $entry['name']);
 					break;
 				}
 			}
 			
-			foreach($settingsNavigation as $entry) {
+			foreach ($settingsNavigation as $entry) {
 				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
+					$this->assign('application', $entry['name']);
 					break;
 				}
 			}
@@ -127,7 +127,7 @@ 
 		// Send the language to our layouts
 		$this->assign('language', \OC_L10N::findLanguage());
 
-		if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+		if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
 			if (empty(self::$versionHash)) {
 				$v = \OC_App::getAppVersions();
 				$v['core'] = implode('.', \OCP\Util::getVersion());
@@ -141,12 +141,12 @@ 
 		$jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
 		$this->assign('jsfiles', array());
 		if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
-			$this->append( 'jsfiles', \OC::$server->getURLGenerator()->linkToRoute('js_config', ['v' => self::$versionHash]));
+			$this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('js_config', ['v' => self::$versionHash]));
 		}
-		foreach($jsFiles as $info) {
+		foreach ($jsFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
-			$this->append( 'jsfiles', $web.'/'.$file . '?v=' . self::$versionHash);
+			$this->append('jsfiles', $web.'/'.$file.'?v='.self::$versionHash);
 		}
 
 		// Add the css files
@@ -154,14 +154,14 @@ 
 		$this->assign('cssfiles', array());
 		$this->assign('printcssfiles', []);
 		$this->assign('versionHash', self::$versionHash);
-		foreach($cssFiles as $info) {
+		foreach ($cssFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
 
 			if (substr($file, -strlen('print.css')) === 'print.css') {
-				$this->append( 'printcssfiles', $web.'/'.$file . '?v=' . self::$versionHash);
+				$this->append('printcssfiles', $web.'/'.$file.'?v='.self::$versionHash);
 			} else {
-				$this->append( 'cssfiles', $web.'/'.$file . '?v=' . self::$versionHash);
+				$this->append('cssfiles', $web.'/'.$file.'?v='.self::$versionHash);
 			}
 		}
 	}
@@ -177,8 +177,8 @@ 
 		$locator = new \OC\Template\CSSResourceLocator(
 			\OC::$server->getLogger(),
 			$theme,
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ));
+			array(\OC::$SERVERROOT => \OC::$WEBROOT),
+			array(\OC::$SERVERROOT => \OC::$WEBROOT));
 		$locator->find($styles);
 		return $locator->getResources();
 	}
@@ -194,8 +194,8 @@ 
 		$locator = new \OC\Template\JSResourceLocator(
 			\OC::$server->getLogger(),
 			$theme,
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ));
+			array(\OC::$SERVERROOT => \OC::$WEBROOT),
+			array(\OC::$SERVERROOT => \OC::$WEBROOT));
 		$locator->find($scripts);
 		return $locator->getResources();
 	}
@@ -208,7 +208,7 @@ 
 	 */
 	public static function convertToRelativePath($filePath) {
 		$relativePath = explode(\OC::$SERVERROOT, $filePath);
-		if(count($relativePath) !== 2) {
+		if (count($relativePath) !== 2) {
 			throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
 		}
 

core/Controller/LoginController.php

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
 
 namespace OC\Core\Controller;
 
-use OC\AppFramework\Utility\TimeFactory;
 use OC\Authentication\TwoFactorAuth\Manager;
 use OC\Security\Bruteforce\Throttler;
 use OC\User\Session;

Indentation +197 added lines, -197 removed lines

@@ -42,219 +42,219 @@
 use OCP\IUserManager;
 
 class LoginController extends Controller {
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IConfig */
-	private $config;
-	/** @var ISession */
-	private $session;
-	/** @var Session */
-	private $userSession;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var Manager */
-	private $twoFactorManager;
-	/** @var Throttler */
-	private $throttler;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ISession */
+    private $session;
+    /** @var Session */
+    private $userSession;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var Manager */
+    private $twoFactorManager;
+    /** @var Throttler */
+    private $throttler;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param ISession $session
-	 * @param Session $userSession
-	 * @param IURLGenerator $urlGenerator
-	 * @param Manager $twoFactorManager
-	 * @param Throttler $throttler
-	 */
-	function __construct($appName,
-						 IRequest $request,
-						 IUserManager $userManager,
-						 IConfig $config,
-						 ISession $session,
-						 Session $userSession,
-						 IURLGenerator $urlGenerator,
-						 Manager $twoFactorManager,
-						 Throttler $throttler) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->config = $config;
-		$this->session = $session;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->twoFactorManager = $twoFactorManager;
-		$this->throttler = $throttler;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param ISession $session
+     * @param Session $userSession
+     * @param IURLGenerator $urlGenerator
+     * @param Manager $twoFactorManager
+     * @param Throttler $throttler
+     */
+    function __construct($appName,
+                            IRequest $request,
+                            IUserManager $userManager,
+                            IConfig $config,
+                            ISession $session,
+                            Session $userSession,
+                            IURLGenerator $urlGenerator,
+                            Manager $twoFactorManager,
+                            Throttler $throttler) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->config = $config;
+        $this->session = $session;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->twoFactorManager = $twoFactorManager;
+        $this->throttler = $throttler;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @UseSession
-	 *
-	 * @return RedirectResponse
-	 */
-	public function logout() {
-		$loginToken = $this->request->getCookie('oc_token');
-		if (!is_null($loginToken)) {
-			$this->config->deleteUserValue($this->userSession->getUser()->getUID(), 'login_token', $loginToken);
-		}
-		$this->userSession->logout();
+    /**
+     * @NoAdminRequired
+     * @UseSession
+     *
+     * @return RedirectResponse
+     */
+    public function logout() {
+        $loginToken = $this->request->getCookie('oc_token');
+        if (!is_null($loginToken)) {
+            $this->config->deleteUserValue($this->userSession->getUser()->getUID(), 'login_token', $loginToken);
+        }
+        $this->userSession->logout();
 
-		return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
-	}
+        return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 * @UseSession
-	 *
-	 * @param string $user
-	 * @param string $redirect_url
-	 * @param string $remember_login
-	 *
-	 * @return TemplateResponse|RedirectResponse
-	 */
-	public function showLoginForm($user, $redirect_url, $remember_login) {
-		if ($this->userSession->isLoggedIn()) {
-			return new RedirectResponse(OC_Util::getDefaultPageUrl());
-		}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     * @UseSession
+     *
+     * @param string $user
+     * @param string $redirect_url
+     * @param string $remember_login
+     *
+     * @return TemplateResponse|RedirectResponse
+     */
+    public function showLoginForm($user, $redirect_url, $remember_login) {
+        if ($this->userSession->isLoggedIn()) {
+            return new RedirectResponse(OC_Util::getDefaultPageUrl());
+        }
 
-		$parameters = array();
-		$loginMessages = $this->session->get('loginMessages');
-		$errors = [];
-		$messages = [];
-		if (is_array($loginMessages)) {
-			list($errors, $messages) = $loginMessages;
-		}
-		$this->session->remove('loginMessages');
-		foreach ($errors as $value) {
-			$parameters[$value] = true;
-		}
+        $parameters = array();
+        $loginMessages = $this->session->get('loginMessages');
+        $errors = [];
+        $messages = [];
+        if (is_array($loginMessages)) {
+            list($errors, $messages) = $loginMessages;
+        }
+        $this->session->remove('loginMessages');
+        foreach ($errors as $value) {
+            $parameters[$value] = true;
+        }
 
-		$parameters['messages'] = $messages;
-		if (!is_null($user) && $user !== '') {
-			$parameters['loginName'] = $user;
-			$parameters['user_autofocus'] = false;
-		} else {
-			$parameters['loginName'] = '';
-			$parameters['user_autofocus'] = true;
-		}
-		if (!empty($redirect_url)) {
-			$parameters['redirect_url'] = $redirect_url;
-		}
+        $parameters['messages'] = $messages;
+        if (!is_null($user) && $user !== '') {
+            $parameters['loginName'] = $user;
+            $parameters['user_autofocus'] = false;
+        } else {
+            $parameters['loginName'] = '';
+            $parameters['user_autofocus'] = true;
+        }
+        if (!empty($redirect_url)) {
+            $parameters['redirect_url'] = $redirect_url;
+        }
 
-		$parameters['canResetPassword'] = true;
-		$parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
-		if (!$parameters['resetPasswordLink']) {
-			if (!is_null($user) && $user !== '') {
-				$userObj = $this->userManager->get($user);
-				if ($userObj instanceof IUser) {
-					$parameters['canResetPassword'] = $userObj->canChangePassword();
-				}
-			}
-		}
+        $parameters['canResetPassword'] = true;
+        $parameters['resetPasswordLink'] = $this->config->getSystemValue('lost_password_link', '');
+        if (!$parameters['resetPasswordLink']) {
+            if (!is_null($user) && $user !== '') {
+                $userObj = $this->userManager->get($user);
+                if ($userObj instanceof IUser) {
+                    $parameters['canResetPassword'] = $userObj->canChangePassword();
+                }
+            }
+        }
 
-		$parameters['alt_login'] = OC_App::getAlternativeLogIns();
-		$parameters['rememberLoginAllowed'] = OC_Util::rememberLoginAllowed();
-		$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
+        $parameters['alt_login'] = OC_App::getAlternativeLogIns();
+        $parameters['rememberLoginAllowed'] = OC_Util::rememberLoginAllowed();
+        $parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
 
-		if (!is_null($user) && $user !== '') {
-			$parameters['loginName'] = $user;
-			$parameters['user_autofocus'] = false;
-		} else {
-			$parameters['loginName'] = '';
-			$parameters['user_autofocus'] = true;
-		}
+        if (!is_null($user) && $user !== '') {
+            $parameters['loginName'] = $user;
+            $parameters['user_autofocus'] = false;
+        } else {
+            $parameters['loginName'] = '';
+            $parameters['user_autofocus'] = true;
+        }
 
-		return new TemplateResponse(
-			$this->appName, 'login', $parameters, 'guest'
-		);
-	}
+        return new TemplateResponse(
+            $this->appName, 'login', $parameters, 'guest'
+        );
+    }
 
-	/**
-	 * @param string $redirectUrl
-	 * @return RedirectResponse
-	 */
-	private function generateRedirect($redirectUrl) {
-		if (!is_null($redirectUrl) && $this->userSession->isLoggedIn()) {
-			$location = $this->urlGenerator->getAbsoluteURL(urldecode($redirectUrl));
-			// Deny the redirect if the URL contains a @
-			// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
-			if (strpos($location, '@') === false) {
-				return new RedirectResponse($location);
-			}
-		}
-		return new RedirectResponse(OC_Util::getDefaultPageUrl());
-	}
+    /**
+     * @param string $redirectUrl
+     * @return RedirectResponse
+     */
+    private function generateRedirect($redirectUrl) {
+        if (!is_null($redirectUrl) && $this->userSession->isLoggedIn()) {
+            $location = $this->urlGenerator->getAbsoluteURL(urldecode($redirectUrl));
+            // Deny the redirect if the URL contains a @
+            // This prevents unvalidated redirects like ?redirect_url=:user@domain.com
+            if (strpos($location, '@') === false) {
+                return new RedirectResponse($location);
+            }
+        }
+        return new RedirectResponse(OC_Util::getDefaultPageUrl());
+    }
 
-	/**
-	 * @PublicPage
-	 * @UseSession
-	 * @NoCSRFRequired
-	 *
-	 * @param string $user
-	 * @param string $password
-	 * @param string $redirect_url
-	 * @param string $timezone
-	 * @param string $timezone_offset
-	 * @return RedirectResponse
-	 */
-	public function tryLogin($user, $password, $redirect_url, $timezone = '', $timezone_offset = '') {
-		$currentDelay = $this->throttler->getDelay($this->request->getRemoteAddress());
-		$this->throttler->sleepDelay($this->request->getRemoteAddress());
+    /**
+     * @PublicPage
+     * @UseSession
+     * @NoCSRFRequired
+     *
+     * @param string $user
+     * @param string $password
+     * @param string $redirect_url
+     * @param string $timezone
+     * @param string $timezone_offset
+     * @return RedirectResponse
+     */
+    public function tryLogin($user, $password, $redirect_url, $timezone = '', $timezone_offset = '') {
+        $currentDelay = $this->throttler->getDelay($this->request->getRemoteAddress());
+        $this->throttler->sleepDelay($this->request->getRemoteAddress());
 
-		// If the user is already logged in and the CSRF check does not pass then
-		// simply redirect the user to the correct page as required. This is the
-		// case when an user has already logged-in, in another tab.
-		if(!$this->request->passesCSRFCheck()) {
-			return $this->generateRedirect($redirect_url);
-		}
+        // If the user is already logged in and the CSRF check does not pass then
+        // simply redirect the user to the correct page as required. This is the
+        // case when an user has already logged-in, in another tab.
+        if(!$this->request->passesCSRFCheck()) {
+            return $this->generateRedirect($redirect_url);
+        }
 
-		$originalUser = $user;
-		// TODO: Add all the insane error handling
-		/* @var $loginResult IUser */
-		$loginResult = $this->userManager->checkPassword($user, $password);
-		if ($loginResult === false) {
-			$users = $this->userManager->getByEmail($user);
-			// we only allow login by email if unique
-			if (count($users) === 1) {
-				$user = $users[0]->getUID();
-				$loginResult = $this->userManager->checkPassword($user, $password);
-			}
-		}
-		if ($loginResult === false) {
-			$this->throttler->registerAttempt('login', $this->request->getRemoteAddress(), ['user' => $originalUser]);
-			if($currentDelay === 0) {
-				$this->throttler->sleepDelay($this->request->getRemoteAddress());
-			}
-			$this->session->set('loginMessages', [
-				['invalidpassword'], []
-			]);
-			// Read current user and append if possible - we need to return the unmodified user otherwise we will leak the login name
-			$args = !is_null($user) ? ['user' => $originalUser] : [];
-			return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
-		}
-		// TODO: remove password checks from above and let the user session handle failures
-		// requires https://github.com/owncloud/core/pull/24616
-		$this->userSession->login($user, $password);
-		$this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password);
+        $originalUser = $user;
+        // TODO: Add all the insane error handling
+        /* @var $loginResult IUser */
+        $loginResult = $this->userManager->checkPassword($user, $password);
+        if ($loginResult === false) {
+            $users = $this->userManager->getByEmail($user);
+            // we only allow login by email if unique
+            if (count($users) === 1) {
+                $user = $users[0]->getUID();
+                $loginResult = $this->userManager->checkPassword($user, $password);
+            }
+        }
+        if ($loginResult === false) {
+            $this->throttler->registerAttempt('login', $this->request->getRemoteAddress(), ['user' => $originalUser]);
+            if($currentDelay === 0) {
+                $this->throttler->sleepDelay($this->request->getRemoteAddress());
+            }
+            $this->session->set('loginMessages', [
+                ['invalidpassword'], []
+            ]);
+            // Read current user and append if possible - we need to return the unmodified user otherwise we will leak the login name
+            $args = !is_null($user) ? ['user' => $originalUser] : [];
+            return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
+        }
+        // TODO: remove password checks from above and let the user session handle failures
+        // requires https://github.com/owncloud/core/pull/24616
+        $this->userSession->login($user, $password);
+        $this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password);
 
-		if ($timezone_offset !== '') {
-			$this->config->setUserValue($loginResult->getUID(), 'core', 'timezone', $timezone);
-			$this->session->set('timezone', $timezone_offset);
-		}
+        if ($timezone_offset !== '') {
+            $this->config->setUserValue($loginResult->getUID(), 'core', 'timezone', $timezone);
+            $this->session->set('timezone', $timezone_offset);
+        }
 
-		if ($this->twoFactorManager->isTwoFactorAuthenticated($loginResult)) {
-			$this->twoFactorManager->prepareTwoFactorLogin($loginResult);
-			if (!is_null($redirect_url)) {
-				return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge', [
-					'redirect_url' => $redirect_url
-				]));
-			}
-			return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
-		}
+        if ($this->twoFactorManager->isTwoFactorAuthenticated($loginResult)) {
+            $this->twoFactorManager->prepareTwoFactorLogin($loginResult);
+            if (!is_null($redirect_url)) {
+                return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge', [
+                    'redirect_url' => $redirect_url
+                ]));
+            }
+            return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
+        }
 
-		return $this->generateRedirect($redirect_url);
-	}
+        return $this->generateRedirect($redirect_url);
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -206,7 +206,7 @@ 
 		// If the user is already logged in and the CSRF check does not pass then
 		// simply redirect the user to the correct page as required. This is the
 		// case when an user has already logged-in, in another tab.
-		if(!$this->request->passesCSRFCheck()) {
+		if (!$this->request->passesCSRFCheck()) {
 			return $this->generateRedirect($redirect_url);
 		}
 
@@ -224,7 +224,7 @@ 
 		}
 		if ($loginResult === false) {
 			$this->throttler->registerAttempt('login', $this->request->getRemoteAddress(), ['user' => $originalUser]);
-			if($currentDelay === 0) {
+			if ($currentDelay === 0) {
 				$this->throttler->sleepDelay($this->request->getRemoteAddress());
 			}
 			$this->session->set('loginMessages', [

core/Controller/TokenController.php

Unused Use Statements -3 removed lines

@@ -22,13 +22,10 @@
 namespace OC\Core\Controller;
 
 use OC\AppFramework\Http;
-use OC\AppFramework\Utility\TimeFactory;
-use OC\Authentication\Token\DefaultTokenProvider;
 use OC\Authentication\Token\IProvider;
 use OC\Authentication\Token\IToken;
 use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager;
 use OC\User\Manager as UserManager;
-use OCA\User_LDAP\User\Manager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;

Indentation +63 added lines, -63 removed lines

@@ -37,72 +37,72 @@
 use OCP\Security\ISecureRandom;
 
 class TokenController extends Controller {
-	/** @var UserManager */
-	private $userManager;
-	/** @var IProvider */
-	private $tokenProvider;
-	/** @var TwoFactorAuthManager */
-	private $twoFactorAuthManager;
-	/** @var ISecureRandom */
-	private $secureRandom;
+    /** @var UserManager */
+    private $userManager;
+    /** @var IProvider */
+    private $tokenProvider;
+    /** @var TwoFactorAuthManager */
+    private $twoFactorAuthManager;
+    /** @var ISecureRandom */
+    private $secureRandom;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param UserManager $userManager
-	 * @param IProvider $tokenProvider
-	 * @param TwoFactorAuthManager $twoFactorAuthManager
-	 * @param ISecureRandom $secureRandom
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								UserManager $userManager,
-								IProvider $tokenProvider,
-								TwoFactorAuthManager $twoFactorAuthManager,
-								ISecureRandom $secureRandom) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-		$this->tokenProvider = $tokenProvider;
-		$this->secureRandom = $secureRandom;
-		$this->twoFactorAuthManager = $twoFactorAuthManager;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param UserManager $userManager
+     * @param IProvider $tokenProvider
+     * @param TwoFactorAuthManager $twoFactorAuthManager
+     * @param ISecureRandom $secureRandom
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                UserManager $userManager,
+                                IProvider $tokenProvider,
+                                TwoFactorAuthManager $twoFactorAuthManager,
+                                ISecureRandom $secureRandom) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+        $this->tokenProvider = $tokenProvider;
+        $this->secureRandom = $secureRandom;
+        $this->twoFactorAuthManager = $twoFactorAuthManager;
+    }
 
-	/**
-	 * Generate a new access token clients can authenticate with
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $user
-	 * @param string $password
-	 * @param string $name the name of the client
-	 * @return JSONResponse
-	 */
-	public function generateToken($user, $password, $name = 'unknown client') {
-		if (is_null($user) || is_null($password)) {
-			$response = new JSONResponse();
-			$response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
-			return $response;
-		}
-		$loginName = $user;
-		$user = $this->userManager->checkPassword($loginName, $password);
-		if ($user === false) {
-			$response = new JSONResponse();
-			$response->setStatus(Http::STATUS_UNAUTHORIZED);
-			return $response;
-		}
+    /**
+     * Generate a new access token clients can authenticate with
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $user
+     * @param string $password
+     * @param string $name the name of the client
+     * @return JSONResponse
+     */
+    public function generateToken($user, $password, $name = 'unknown client') {
+        if (is_null($user) || is_null($password)) {
+            $response = new JSONResponse();
+            $response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
+            return $response;
+        }
+        $loginName = $user;
+        $user = $this->userManager->checkPassword($loginName, $password);
+        if ($user === false) {
+            $response = new JSONResponse();
+            $response->setStatus(Http::STATUS_UNAUTHORIZED);
+            return $response;
+        }
 
-		if ($this->twoFactorAuthManager->isTwoFactorAuthenticated($user)) {
-			$resp = new JSONResponse();
-			$resp->setStatus(Http::STATUS_UNAUTHORIZED);
-			return $resp;
-		}
+        if ($this->twoFactorAuthManager->isTwoFactorAuthenticated($user)) {
+            $resp = new JSONResponse();
+            $resp->setStatus(Http::STATUS_UNAUTHORIZED);
+            return $resp;
+        }
 
-		$token = $this->secureRandom->generate(128);
-		$this->tokenProvider->generateToken($token, $user->getUID(), $loginName, $password, $name, IToken::PERMANENT_TOKEN);
-		return [
-			'token' => $token,
-		];
-	}
+        $token = $this->secureRandom->generate(128);
+        $this->tokenProvider->generateToken($token, $user->getUID(), $loginName, $password, $name, IToken::PERMANENT_TOKEN);
+        return [
+            'token' => $token,
+        ];
+    }
 
 }

lib/private/Repair/RepairUnmergedShares.php

Doc Comments +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
 	 * @param array $groupSharesById
 	 * @param array $subShares
 	 *
-	 * @return true if the share is valid, false if it needs repair
+	 * @return boolean if the share is valid, false if it needs repair
 	 */
 	private function isThisShareValid($groupSharesById, $subShares) {
 		$foundTargets = [];

Spacing +4 added lines, -4 removed lines

@@ -173,7 +173,7 @@ 
 		$pickedShare = null;
 		// sort by stime, this also properly sorts the direct user share if any
 		@usort($subShares, function($a, $b) {
-			return ((int)$a['stime'] - (int)$b['stime']);
+			return ((int) $a['stime'] - (int) $b['stime']);
 		});
 
 		foreach ($subShares as $subShare) {
@@ -222,7 +222,7 @@ 
 		// check whether the user opted out completely of all subshares
 		$optedOut = true;
 		foreach ($subShares as $subShare) {
-			if ((int)$subShare['permissions'] !== 0) {
+			if ((int) $subShare['permissions'] !== 0) {
 				$optedOut = false;
 				break;
 			}
@@ -231,7 +231,7 @@ 
 		$shareIds = [];
 		foreach ($subShares as $subShare) {
 			// only if the user deleted some subshares but not all, adjust the permissions of that subshare
-			if (!$optedOut && (int)$subShare['permissions'] === 0 && (int)$subShare['share_type'] === DefaultShareProvider::SHARE_TYPE_USERGROUP) {
+			if (!$optedOut && (int) $subShare['permissions'] === 0 && (int) $subShare['share_type'] === DefaultShareProvider::SHARE_TYPE_USERGROUP) {
 				// set permissions from parent group share
 				$permissions = $groupSharesById[$subShare['parent']]['permissions'];
 
@@ -244,7 +244,7 @@ 
 			} else {
 				// gather share ids for bulk target update
 				if ($subShare['file_target'] !== $targetPath) {
-					$shareIds[] = (int)$subShare['id'];
+					$shareIds[] = (int) $subShare['id'];
 				}
 			}
 		}

Indentation +328 added lines, -328 removed lines

@@ -43,332 +43,332 @@
  */
 class RepairUnmergedShares implements IRepairStep {
 
-	/** @var \OCP\IConfig */
-	protected $config;
-
-	/** @var \OCP\IDBConnection */
-	protected $connection;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IQueryBuilder */
-	private $queryGetSharesWithUsers;
-
-	/** @var IQueryBuilder */
-	private $queryUpdateSharePermissionsAndTarget;
-
-	/** @var IQueryBuilder */
-	private $queryUpdateShareInBatch;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct(
-		IConfig $config,
-		IDBConnection $connection,
-		IUserManager $userManager,
-		IGroupManager $groupManager
-	) {
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-	}
-
-	public function getName() {
-		return 'Repair unmerged shares';
-	}
-
-	/**
-	 * Builds prepared queries for reuse
-	 */
-	private function buildPreparedQueries() {
-		/**
-		 * Retrieve shares for a given user/group and share type
-		 */
-		$query = $this->connection->getQueryBuilder();
-		$query
-			->select('item_source', 'id', 'file_target', 'permissions', 'parent', 'share_type', 'stime')
-			->from('share')
-			->where($query->expr()->eq('share_type', $query->createParameter('shareType')))
-			->andWhere($query->expr()->in('share_with', $query->createParameter('shareWiths')))
-			->andWhere($query->expr()->in('item_type', $query->createParameter('itemTypes')))
-			->orderBy('item_source', 'ASC')
-			->addOrderBy('stime', 'ASC');
-
-		$this->queryGetSharesWithUsers = $query;
-
-		/**
-		 * Updates the file_target to the given value for all given share ids.
-		 *
-		 * This updates several shares in bulk which is faster than individually.
-		 */
-		$query = $this->connection->getQueryBuilder();
-		$query->update('share')
-			->set('file_target', $query->createParameter('file_target'))
-			->where($query->expr()->in('id', $query->createParameter('ids')));
-
-		$this->queryUpdateShareInBatch = $query;
-
-		/**
-		 * Updates the share permissions and target path of a single share.
-		 */
-		$query = $this->connection->getQueryBuilder();
-		$query->update('share')
-			->set('permissions', $query->createParameter('permissions'))
-			->set('file_target', $query->createParameter('file_target'))
-			->where($query->expr()->eq('id', $query->createParameter('shareid')));
-
-		$this->queryUpdateSharePermissionsAndTarget = $query;
-
-	}
-
-	private function getSharesWithUser($shareType, $shareWiths) {
-		$groupedShares = [];
-
-		$query = $this->queryGetSharesWithUsers;
-		$query->setParameter('shareWiths', $shareWiths, IQueryBuilder::PARAM_STR_ARRAY);
-		$query->setParameter('shareType', $shareType);
-		$query->setParameter('itemTypes', ['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY);
-
-		$shares = $query->execute()->fetchAll();
-
-		// group by item_source
-		foreach ($shares as $share) {
-			if (!isset($groupedShares[$share['item_source']])) {
-				$groupedShares[$share['item_source']] = [];
-			}
-			$groupedShares[$share['item_source']][] = $share;
-		}
-		return $groupedShares;
-	}
-
-	private function isPotentialDuplicateName($name) {
-		return (preg_match('/\(\d+\)(\.[^\.]+)?$/', $name) === 1);
-	}
-
-	/**
-	 * Decide on the best target name based on all group shares and subshares,
-	 * goal is to increase the likeliness that the chosen name matches what
-	 * the user is expecting.
-	 *
-	 * For this, we discard the entries with parenthesis "(2)".
-	 * In case the user also renamed the duplicates to a legitimate name, this logic
-	 * will still pick the most recent one as it's the one the user is most likely to
-	 * remember renaming.
-	 *
-	 * If no suitable subshare is found, use the least recent group share instead.
-	 *
-	 * @param array $groupShares group share entries
-	 * @param array $subShares sub share entries
-	 *
-	 * @return string chosen target name
-	 */
-	private function findBestTargetName($groupShares, $subShares) {
-		$pickedShare = null;
-		// sort by stime, this also properly sorts the direct user share if any
-		@usort($subShares, function($a, $b) {
-			return ((int)$a['stime'] - (int)$b['stime']);
-		});
-
-		foreach ($subShares as $subShare) {
-			// skip entries that have parenthesis with numbers
-			if ($this->isPotentialDuplicateName($subShare['file_target'])) {
-				continue;
-			}
-			// pick any share found that would match, the last being the most recent
-			$pickedShare = $subShare;
-		}
-
-		// no suitable subshare found
-		if ($pickedShare === null) {
-			// use least recent group share target instead
-			$pickedShare = $groupShares[0];
-		}
-
-		return $pickedShare['file_target'];
-	}
-
-	/**
-	 * Fix the given received share represented by the set of group shares
-	 * and matching sub shares
-	 *
-	 * @param array $groupShares group share entries
-	 * @param array $subShares sub share entries
-	 *
-	 * @return boolean false if the share was not repaired, true if it was
-	 */
-	private function fixThisShare($groupShares, $subShares) {
-		if (empty($subShares)) {
-			return false;
-		}
-
-		$groupSharesById = [];
-		foreach ($groupShares as $groupShare) {
-			$groupSharesById[$groupShare['id']] = $groupShare;
-		}
-
-		if ($this->isThisShareValid($groupSharesById, $subShares)) {
-			return false;
-		}
-
-		$targetPath = $this->findBestTargetName($groupShares, $subShares);
-
-		// check whether the user opted out completely of all subshares
-		$optedOut = true;
-		foreach ($subShares as $subShare) {
-			if ((int)$subShare['permissions'] !== 0) {
-				$optedOut = false;
-				break;
-			}
-		}
-
-		$shareIds = [];
-		foreach ($subShares as $subShare) {
-			// only if the user deleted some subshares but not all, adjust the permissions of that subshare
-			if (!$optedOut && (int)$subShare['permissions'] === 0 && (int)$subShare['share_type'] === DefaultShareProvider::SHARE_TYPE_USERGROUP) {
-				// set permissions from parent group share
-				$permissions = $groupSharesById[$subShare['parent']]['permissions'];
-
-				// fix permissions and target directly
-				$query = $this->queryUpdateSharePermissionsAndTarget;
-				$query->setParameter('shareid', $subShare['id']);
-				$query->setParameter('file_target', $targetPath);
-				$query->setParameter('permissions', $permissions);
-				$query->execute();
-			} else {
-				// gather share ids for bulk target update
-				if ($subShare['file_target'] !== $targetPath) {
-					$shareIds[] = (int)$subShare['id'];
-				}
-			}
-		}
-
-		if (!empty($shareIds)) {
-			$query = $this->queryUpdateShareInBatch;
-			$query->setParameter('ids', $shareIds, IQueryBuilder::PARAM_INT_ARRAY);
-			$query->setParameter('file_target', $targetPath);
-			$query->execute();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Checks whether the number of group shares is balanced with the child subshares.
-	 * If all group shares have exactly one subshare, and the target of every subshare
-	 * is the same, then the share is valid.
-	 * If however there is a group share entry that has no matching subshare, it means
-	 * we're in the bogus situation and the whole share must be repaired
-	 *
-	 * @param array $groupSharesById
-	 * @param array $subShares
-	 *
-	 * @return true if the share is valid, false if it needs repair
-	 */
-	private function isThisShareValid($groupSharesById, $subShares) {
-		$foundTargets = [];
-
-		// every group share needs to have exactly one matching subshare
-		foreach ($subShares as $subShare) {
-			$foundTargets[$subShare['file_target']] = true;
-			if (count($foundTargets) > 1) {
-				// not all the same target path value => invalid
-				return false;
-			}
-			if (isset($groupSharesById[$subShare['parent']])) {
-				// remove it from the list as we found it
-				unset($groupSharesById[$subShare['parent']]);
-			}
-		}
-
-		// if we found one subshare per group entry, the set will be empty.
-		// If not empty, it means that one of the group shares did not have
-		// a matching subshare entry.
-		return empty($groupSharesById);
-	}
-
-	/**
-	 * Detect unmerged received shares and merge them properly
-	 */
-	private function fixUnmergedShares(IOutput $out, IUser $user) {
-		$groups = $this->groupManager->getUserGroupIds($user);
-		if (empty($groups)) {
-			// user is in no groups, so can't have received group shares
-			return;
-		}
-
-		// get all subshares grouped by item source
-		$subSharesByItemSource = $this->getSharesWithUser(DefaultShareProvider::SHARE_TYPE_USERGROUP, [$user->getUID()]);
-
-		// because sometimes one wants to give the user more permissions than the group share
-		$userSharesByItemSource = $this->getSharesWithUser(Constants::SHARE_TYPE_USER, [$user->getUID()]);
-
-		if (empty($subSharesByItemSource) && empty($userSharesByItemSource)) {
-			// nothing to repair for this user, no need to do extra queries
-			return;
-		}
-
-		$groupSharesByItemSource = $this->getSharesWithUser(Constants::SHARE_TYPE_GROUP, $groups);
-		if (empty($groupSharesByItemSource) && empty($userSharesByItemSource)) {
-			// nothing to repair for this user
-			return;
-		}
-
-		foreach ($groupSharesByItemSource as $itemSource => $groupShares) {
-			$subShares = [];
-			if (isset($subSharesByItemSource[$itemSource])) {
-				$subShares = $subSharesByItemSource[$itemSource];
-			}
-
-			if (isset($userSharesByItemSource[$itemSource])) {
-				// add it to the subshares to get a similar treatment
-				$subShares = array_merge($subShares, $userSharesByItemSource[$itemSource]);
-			}
-
-			$this->fixThisShare($groupShares, $subShares);
-		}
-	}
-
-	/**
-	 * Count all the users
-	 *
-	 * @return int
-	 */
-	private function countUsers() {
-		$allCount = $this->userManager->countUsers();
-
-		$totalCount = 0;
-		foreach ($allCount as $backend => $count) {
-			$totalCount += $count;
-		}
-
-		return $totalCount;
-	}
-
-	public function run(IOutput $output) {
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		if (version_compare($ocVersionFromBeforeUpdate, '9.1.0.16', '<')) {
-			// this situation was only possible between 9.0.0 and 9.0.3 included
-
-			$function = function(IUser $user) use ($output) {
-				$this->fixUnmergedShares($output, $user);
-				$output->advance();
-			};
-
-			$this->buildPreparedQueries();
-
-			$userCount = $this->countUsers();
-			$output->startProgress($userCount);
-
-			$this->userManager->callForAllUsers($function);
-
-			$output->finishProgress();
-		}
-	}
+    /** @var \OCP\IConfig */
+    protected $config;
+
+    /** @var \OCP\IDBConnection */
+    protected $connection;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IQueryBuilder */
+    private $queryGetSharesWithUsers;
+
+    /** @var IQueryBuilder */
+    private $queryUpdateSharePermissionsAndTarget;
+
+    /** @var IQueryBuilder */
+    private $queryUpdateShareInBatch;
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OCP\IDBConnection $connection
+     */
+    public function __construct(
+        IConfig $config,
+        IDBConnection $connection,
+        IUserManager $userManager,
+        IGroupManager $groupManager
+    ) {
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+    }
+
+    public function getName() {
+        return 'Repair unmerged shares';
+    }
+
+    /**
+     * Builds prepared queries for reuse
+     */
+    private function buildPreparedQueries() {
+        /**
+         * Retrieve shares for a given user/group and share type
+         */
+        $query = $this->connection->getQueryBuilder();
+        $query
+            ->select('item_source', 'id', 'file_target', 'permissions', 'parent', 'share_type', 'stime')
+            ->from('share')
+            ->where($query->expr()->eq('share_type', $query->createParameter('shareType')))
+            ->andWhere($query->expr()->in('share_with', $query->createParameter('shareWiths')))
+            ->andWhere($query->expr()->in('item_type', $query->createParameter('itemTypes')))
+            ->orderBy('item_source', 'ASC')
+            ->addOrderBy('stime', 'ASC');
+
+        $this->queryGetSharesWithUsers = $query;
+
+        /**
+         * Updates the file_target to the given value for all given share ids.
+         *
+         * This updates several shares in bulk which is faster than individually.
+         */
+        $query = $this->connection->getQueryBuilder();
+        $query->update('share')
+            ->set('file_target', $query->createParameter('file_target'))
+            ->where($query->expr()->in('id', $query->createParameter('ids')));
+
+        $this->queryUpdateShareInBatch = $query;
+
+        /**
+         * Updates the share permissions and target path of a single share.
+         */
+        $query = $this->connection->getQueryBuilder();
+        $query->update('share')
+            ->set('permissions', $query->createParameter('permissions'))
+            ->set('file_target', $query->createParameter('file_target'))
+            ->where($query->expr()->eq('id', $query->createParameter('shareid')));
+
+        $this->queryUpdateSharePermissionsAndTarget = $query;
+
+    }
+
+    private function getSharesWithUser($shareType, $shareWiths) {
+        $groupedShares = [];
+
+        $query = $this->queryGetSharesWithUsers;
+        $query->setParameter('shareWiths', $shareWiths, IQueryBuilder::PARAM_STR_ARRAY);
+        $query->setParameter('shareType', $shareType);
+        $query->setParameter('itemTypes', ['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY);
+
+        $shares = $query->execute()->fetchAll();
+
+        // group by item_source
+        foreach ($shares as $share) {
+            if (!isset($groupedShares[$share['item_source']])) {
+                $groupedShares[$share['item_source']] = [];
+            }
+            $groupedShares[$share['item_source']][] = $share;
+        }
+        return $groupedShares;
+    }
+
+    private function isPotentialDuplicateName($name) {
+        return (preg_match('/\(\d+\)(\.[^\.]+)?$/', $name) === 1);
+    }
+
+    /**
+     * Decide on the best target name based on all group shares and subshares,
+     * goal is to increase the likeliness that the chosen name matches what
+     * the user is expecting.
+     *
+     * For this, we discard the entries with parenthesis "(2)".
+     * In case the user also renamed the duplicates to a legitimate name, this logic
+     * will still pick the most recent one as it's the one the user is most likely to
+     * remember renaming.
+     *
+     * If no suitable subshare is found, use the least recent group share instead.
+     *
+     * @param array $groupShares group share entries
+     * @param array $subShares sub share entries
+     *
+     * @return string chosen target name
+     */
+    private function findBestTargetName($groupShares, $subShares) {
+        $pickedShare = null;
+        // sort by stime, this also properly sorts the direct user share if any
+        @usort($subShares, function($a, $b) {
+            return ((int)$a['stime'] - (int)$b['stime']);
+        });
+
+        foreach ($subShares as $subShare) {
+            // skip entries that have parenthesis with numbers
+            if ($this->isPotentialDuplicateName($subShare['file_target'])) {
+                continue;
+            }
+            // pick any share found that would match, the last being the most recent
+            $pickedShare = $subShare;
+        }
+
+        // no suitable subshare found
+        if ($pickedShare === null) {
+            // use least recent group share target instead
+            $pickedShare = $groupShares[0];
+        }
+
+        return $pickedShare['file_target'];
+    }
+
+    /**
+     * Fix the given received share represented by the set of group shares
+     * and matching sub shares
+     *
+     * @param array $groupShares group share entries
+     * @param array $subShares sub share entries
+     *
+     * @return boolean false if the share was not repaired, true if it was
+     */
+    private function fixThisShare($groupShares, $subShares) {
+        if (empty($subShares)) {
+            return false;
+        }
+
+        $groupSharesById = [];
+        foreach ($groupShares as $groupShare) {
+            $groupSharesById[$groupShare['id']] = $groupShare;
+        }
+
+        if ($this->isThisShareValid($groupSharesById, $subShares)) {
+            return false;
+        }
+
+        $targetPath = $this->findBestTargetName($groupShares, $subShares);
+
+        // check whether the user opted out completely of all subshares
+        $optedOut = true;
+        foreach ($subShares as $subShare) {
+            if ((int)$subShare['permissions'] !== 0) {
+                $optedOut = false;
+                break;
+            }
+        }
+
+        $shareIds = [];
+        foreach ($subShares as $subShare) {
+            // only if the user deleted some subshares but not all, adjust the permissions of that subshare
+            if (!$optedOut && (int)$subShare['permissions'] === 0 && (int)$subShare['share_type'] === DefaultShareProvider::SHARE_TYPE_USERGROUP) {
+                // set permissions from parent group share
+                $permissions = $groupSharesById[$subShare['parent']]['permissions'];
+
+                // fix permissions and target directly
+                $query = $this->queryUpdateSharePermissionsAndTarget;
+                $query->setParameter('shareid', $subShare['id']);
+                $query->setParameter('file_target', $targetPath);
+                $query->setParameter('permissions', $permissions);
+                $query->execute();
+            } else {
+                // gather share ids for bulk target update
+                if ($subShare['file_target'] !== $targetPath) {
+                    $shareIds[] = (int)$subShare['id'];
+                }
+            }
+        }
+
+        if (!empty($shareIds)) {
+            $query = $this->queryUpdateShareInBatch;
+            $query->setParameter('ids', $shareIds, IQueryBuilder::PARAM_INT_ARRAY);
+            $query->setParameter('file_target', $targetPath);
+            $query->execute();
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks whether the number of group shares is balanced with the child subshares.
+     * If all group shares have exactly one subshare, and the target of every subshare
+     * is the same, then the share is valid.
+     * If however there is a group share entry that has no matching subshare, it means
+     * we're in the bogus situation and the whole share must be repaired
+     *
+     * @param array $groupSharesById
+     * @param array $subShares
+     *
+     * @return true if the share is valid, false if it needs repair
+     */
+    private function isThisShareValid($groupSharesById, $subShares) {
+        $foundTargets = [];
+
+        // every group share needs to have exactly one matching subshare
+        foreach ($subShares as $subShare) {
+            $foundTargets[$subShare['file_target']] = true;
+            if (count($foundTargets) > 1) {
+                // not all the same target path value => invalid
+                return false;
+            }
+            if (isset($groupSharesById[$subShare['parent']])) {
+                // remove it from the list as we found it
+                unset($groupSharesById[$subShare['parent']]);
+            }
+        }
+
+        // if we found one subshare per group entry, the set will be empty.
+        // If not empty, it means that one of the group shares did not have
+        // a matching subshare entry.
+        return empty($groupSharesById);
+    }
+
+    /**
+     * Detect unmerged received shares and merge them properly
+     */
+    private function fixUnmergedShares(IOutput $out, IUser $user) {
+        $groups = $this->groupManager->getUserGroupIds($user);
+        if (empty($groups)) {
+            // user is in no groups, so can't have received group shares
+            return;
+        }
+
+        // get all subshares grouped by item source
+        $subSharesByItemSource = $this->getSharesWithUser(DefaultShareProvider::SHARE_TYPE_USERGROUP, [$user->getUID()]);
+
+        // because sometimes one wants to give the user more permissions than the group share
+        $userSharesByItemSource = $this->getSharesWithUser(Constants::SHARE_TYPE_USER, [$user->getUID()]);
+
+        if (empty($subSharesByItemSource) && empty($userSharesByItemSource)) {
+            // nothing to repair for this user, no need to do extra queries
+            return;
+        }
+
+        $groupSharesByItemSource = $this->getSharesWithUser(Constants::SHARE_TYPE_GROUP, $groups);
+        if (empty($groupSharesByItemSource) && empty($userSharesByItemSource)) {
+            // nothing to repair for this user
+            return;
+        }
+
+        foreach ($groupSharesByItemSource as $itemSource => $groupShares) {
+            $subShares = [];
+            if (isset($subSharesByItemSource[$itemSource])) {
+                $subShares = $subSharesByItemSource[$itemSource];
+            }
+
+            if (isset($userSharesByItemSource[$itemSource])) {
+                // add it to the subshares to get a similar treatment
+                $subShares = array_merge($subShares, $userSharesByItemSource[$itemSource]);
+            }
+
+            $this->fixThisShare($groupShares, $subShares);
+        }
+    }
+
+    /**
+     * Count all the users
+     *
+     * @return int
+     */
+    private function countUsers() {
+        $allCount = $this->userManager->countUsers();
+
+        $totalCount = 0;
+        foreach ($allCount as $backend => $count) {
+            $totalCount += $count;
+        }
+
+        return $totalCount;
+    }
+
+    public function run(IOutput $output) {
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+        if (version_compare($ocVersionFromBeforeUpdate, '9.1.0.16', '<')) {
+            // this situation was only possible between 9.0.0 and 9.0.3 included
+
+            $function = function(IUser $user) use ($output) {
+                $this->fixUnmergedShares($output, $user);
+                $output->advance();
+            };
+
+            $this->buildPreparedQueries();
+
+            $userCount = $this->countUsers();
+            $output->startProgress($userCount);
+
+            $this->userManager->callForAllUsers($function);
+
+            $output->finishProgress();
+        }
+    }
 }

apps/user_ldap/lib/LDAPProvider.php

Unused Use Statements -2 removed lines

@@ -21,12 +21,10 @@
 
 namespace OCA\User_LDAP;
 
-use OCP\IUserBackend;
 use OCP\LDAP\ILDAPProvider;
 use OCP\LDAP\IDeletionFlagSupport;
 use OCP\IServerContainer;
 use OCA\User_LDAP\User\DeletedUsersIndex;
-use OCA\User_LDAP\Mapping\UserMapping;
 
 /**
  * LDAP provider for pulic access to the LDAP backend.

Indentation +138 added lines, -138 removed lines

@@ -33,155 +33,155 @@
  */
 class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport {
 
-	private $backend;
-	private $logger;
-	private $helper;
-	private $deletedUsersIndex;
+    private $backend;
+    private $logger;
+    private $helper;
+    private $deletedUsersIndex;
 	
-	/**
-	 * Create new LDAPProvider
-	 * @param \OCP\IServerContainer $serverContainer
-	 * @throws \Exception if user_ldap app was not enabled
-	 */
-	public function __construct(IServerContainer $serverContainer, Helper $helper, DeletedUsersIndex $deletedUsersIndex) {
-		$this->logger = $serverContainer->getLogger();
-		$this->helper = $helper;
-		$this->deletedUsersIndex = $deletedUsersIndex;
-		foreach ($serverContainer->getUserManager()->getBackends() as $backend){
-			$this->logger->debug('instance '.get_class($backend).' backend.', ['app' => 'user_ldap']);
-			if ($backend instanceof IUserLDAP) {
-				$this->backend = $backend;
-				return;
-			}
+    /**
+     * Create new LDAPProvider
+     * @param \OCP\IServerContainer $serverContainer
+     * @throws \Exception if user_ldap app was not enabled
+     */
+    public function __construct(IServerContainer $serverContainer, Helper $helper, DeletedUsersIndex $deletedUsersIndex) {
+        $this->logger = $serverContainer->getLogger();
+        $this->helper = $helper;
+        $this->deletedUsersIndex = $deletedUsersIndex;
+        foreach ($serverContainer->getUserManager()->getBackends() as $backend){
+            $this->logger->debug('instance '.get_class($backend).' backend.', ['app' => 'user_ldap']);
+            if ($backend instanceof IUserLDAP) {
+                $this->backend = $backend;
+                return;
+            }
         }
-		throw new \Exception('To use the LDAPProvider, user_ldap app must be enabled');
-	}
+        throw new \Exception('To use the LDAPProvider, user_ldap app must be enabled');
+    }
 	
-	/**
-	 * Translate an user id to LDAP DN
-	 * @param string $uid user id
-	 * @return string with the LDAP DN
-	 * @throws \Exception if translation was unsuccessful
-	 */
-	public function getUserDN($uid) {
-		if(!$this->backend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		$result = $this->backend->getLDAPAccess($uid)->username2dn($uid);
-		if(!$result){
-			throw new \Exception('Translation to LDAP DN unsuccessful');
-		}
-		return $result;
-	}
+    /**
+     * Translate an user id to LDAP DN
+     * @param string $uid user id
+     * @return string with the LDAP DN
+     * @throws \Exception if translation was unsuccessful
+     */
+    public function getUserDN($uid) {
+        if(!$this->backend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        $result = $this->backend->getLDAPAccess($uid)->username2dn($uid);
+        if(!$result){
+            throw new \Exception('Translation to LDAP DN unsuccessful');
+        }
+        return $result;
+    }
 	
-	/**
-	 * Translate a LDAP DN to an internal user name. If there is no mapping between 
-	 * the DN and the user name, a new one will be created.
-	 * @param string $dn LDAP DN
-	 * @return string with the internal user name
-	 * @throws \Exception if translation was unsuccessful
-	 */
-	public function getUserName($dn) {
-		$result = $this->backend->dn2UserName($dn);
-		if(!$result){
-			throw new \Exception('Translation to internal user name unsuccessful');
-		}
-		return $result;
-	}
+    /**
+     * Translate a LDAP DN to an internal user name. If there is no mapping between 
+     * the DN and the user name, a new one will be created.
+     * @param string $dn LDAP DN
+     * @return string with the internal user name
+     * @throws \Exception if translation was unsuccessful
+     */
+    public function getUserName($dn) {
+        $result = $this->backend->dn2UserName($dn);
+        if(!$result){
+            throw new \Exception('Translation to internal user name unsuccessful');
+        }
+        return $result;
+    }
 	
-	/**
-	 * Convert a stored DN so it can be used as base parameter for LDAP queries.
-	 * @param string $dn the DN in question
-	 * @return string
-	 */
-	public function DNasBaseParameter($dn) {
-		return $this->helper->DNasBaseParameter($dn);
-	}
+    /**
+     * Convert a stored DN so it can be used as base parameter for LDAP queries.
+     * @param string $dn the DN in question
+     * @return string
+     */
+    public function DNasBaseParameter($dn) {
+        return $this->helper->DNasBaseParameter($dn);
+    }
 	
-	/**
-	 * Sanitize a DN received from the LDAP server.
-	 * @param array $dn the DN in question
-	 * @return array the sanitized DN
-	 */
-	public function sanitizeDN($dn) {
-		return $this->helper->sanitizeDN($dn);
-	}
+    /**
+     * Sanitize a DN received from the LDAP server.
+     * @param array $dn the DN in question
+     * @return array the sanitized DN
+     */
+    public function sanitizeDN($dn) {
+        return $this->helper->sanitizeDN($dn);
+    }
 	
-	/**
-	 * Return a new LDAP connection resource for the specified user. 
-	 * The connection must be closed manually.
-	 * @param string $uid user id
-	 * @return resource of the LDAP connection
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPConnection($uid) {
-		if(!$this->backend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		return $this->backend->getNewLDAPConnection($uid);
-	}
+    /**
+     * Return a new LDAP connection resource for the specified user. 
+     * The connection must be closed manually.
+     * @param string $uid user id
+     * @return resource of the LDAP connection
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPConnection($uid) {
+        if(!$this->backend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        return $this->backend->getNewLDAPConnection($uid);
+    }
 	
-	/**
-	 * Get the LDAP base for users.
-	 * @param string $uid user id
-	 * @return string the base for users
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPBaseUsers($uid) {
-		if(!$this->backend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}	
-		return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users'];
-	}
+    /**
+     * Get the LDAP base for users.
+     * @param string $uid user id
+     * @return string the base for users
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPBaseUsers($uid) {
+        if(!$this->backend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }	
+        return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users'];
+    }
 	
-	/**
-	 * Get the LDAP base for groups.
-	 * @param string $uid user id
-	 * @return string the base for groups
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPBaseGroups($uid) {
-		if(!$this->backend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups'];
-	}
+    /**
+     * Get the LDAP base for groups.
+     * @param string $uid user id
+     * @return string the base for groups
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPBaseGroups($uid) {
+        if(!$this->backend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups'];
+    }
 	
-	/**
-	 * Clear the cache if a cache is used, otherwise do nothing.
-	 * @param string $uid user id
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function clearCache($uid) {
-		if(!$this->backend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		$this->backend->getLDAPAccess($uid)->getConnection()->clearCache();
-	}
+    /**
+     * Clear the cache if a cache is used, otherwise do nothing.
+     * @param string $uid user id
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function clearCache($uid) {
+        if(!$this->backend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        $this->backend->getLDAPAccess($uid)->getConnection()->clearCache();
+    }
 	
-	/**
-	 * Check whether a LDAP DN exists
-	 * @param string $dn LDAP DN
-	 * @return bool whether the DN exists
-	 */
-	public function dnExists($dn) {
-		$result = $this->backend->dn2UserName($dn);
-		return !$result ? false : true;
-	}
+    /**
+     * Check whether a LDAP DN exists
+     * @param string $dn LDAP DN
+     * @return bool whether the DN exists
+     */
+    public function dnExists($dn) {
+        $result = $this->backend->dn2UserName($dn);
+        return !$result ? false : true;
+    }
 	
-	/**
-	 * Flag record for deletion.
-	 * @param string $uid user id
-	 */
-	public function flagRecord($uid) {
-		$this->deletedUsersIndex->markUser($uid);
-	}
+    /**
+     * Flag record for deletion.
+     * @param string $uid user id
+     */
+    public function flagRecord($uid) {
+        $this->deletedUsersIndex->markUser($uid);
+    }
 	
-	/**
-	 * Unflag record for deletion.
-	 * @param string $uid user id
-	 */
-	public function unflagRecord($uid) {
-		//do nothing
-	}
+    /**
+     * Unflag record for deletion.
+     * @param string $uid user id
+     */
+    public function unflagRecord($uid) {
+        //do nothing
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -47,7 +47,7 @@ 
 		$this->logger = $serverContainer->getLogger();
 		$this->helper = $helper;
 		$this->deletedUsersIndex = $deletedUsersIndex;
-		foreach ($serverContainer->getUserManager()->getBackends() as $backend){
+		foreach ($serverContainer->getUserManager()->getBackends() as $backend) {
 			$this->logger->debug('instance '.get_class($backend).' backend.', ['app' => 'user_ldap']);
 			if ($backend instanceof IUserLDAP) {
 				$this->backend = $backend;
@@ -64,11 +64,11 @@ 
 	 * @throws \Exception if translation was unsuccessful
 	 */
 	public function getUserDN($uid) {
-		if(!$this->backend->userExists($uid)){
+		if (!$this->backend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		$result = $this->backend->getLDAPAccess($uid)->username2dn($uid);
-		if(!$result){
+		if (!$result) {
 			throw new \Exception('Translation to LDAP DN unsuccessful');
 		}
 		return $result;
@@ -83,7 +83,7 @@ 
 	 */
 	public function getUserName($dn) {
 		$result = $this->backend->dn2UserName($dn);
-		if(!$result){
+		if (!$result) {
 			throw new \Exception('Translation to internal user name unsuccessful');
 		}
 		return $result;
@@ -115,7 +115,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPConnection($uid) {
-		if(!$this->backend->userExists($uid)){
+		if (!$this->backend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		return $this->backend->getNewLDAPConnection($uid);
@@ -128,7 +128,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPBaseUsers($uid) {
-		if(!$this->backend->userExists($uid)){
+		if (!$this->backend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}	
 		return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users'];
@@ -141,7 +141,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPBaseGroups($uid) {
-		if(!$this->backend->userExists($uid)){
+		if (!$this->backend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups'];
@@ -153,7 +153,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function clearCache($uid) {
-		if(!$this->backend->userExists($uid)){
+		if (!$this->backend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		$this->backend->getLDAPAccess($uid)->getConnection()->clearCache();