nextcloud / server

apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php

Doc Comments +3 added lines

@@ -89,6 +89,9 @@
 		$this->user = $user;
 	}
 
+	/**
+	 * @param string $tagId
+	 */
 	function createFile($tagId, $data = null) {
 		try {
 			$tags = $this->tagManager->getTagsByIds([$tagId]);

Spacing +5 added lines, -5 removed lines

@@ -95,15 +95,15 @@ 
 			$tags = $this->tagManager->getTagsByIds([$tagId]);
 			$tag = current($tags);
 			if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
-				throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+				throw new PreconditionFailed('Tag with id '.$tagId.' does not exist, cannot assign');
 			}
 			if (!$this->tagManager->canUserAssignTag($tag, $this->user)) {
-				throw new Forbidden('No permission to assign tag ' . $tagId);
+				throw new Forbidden('No permission to assign tag '.$tagId);
 			}
 
 			$this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId);
 		} catch (TagNotFoundException $e) {
-			throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+			throw new PreconditionFailed('Tag with id '.$tagId.' does not exist, cannot assign');
 		}
 	}
 
@@ -120,11 +120,11 @@ 
 					return $this->makeNode($tag);
 				}
 			}
-			throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId);
+			throw new NotFound('Tag with id '.$tagId.' not present for object '.$this->objectId);
 		} catch (\InvalidArgumentException $e) {
 			throw new BadRequest('Invalid tag id', 0, $e);
 		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e);
+			throw new NotFound('Tag with id '.$tagId.' not found', 0, $e);
 		}
 	}
 

Indentation +165 added lines, -165 removed lines

@@ -39,169 +39,169 @@
  */
 class SystemTagsObjectMappingCollection implements ICollection {
 
-	/**
-	 * @var string
-	 */
-	private $objectId;
-
-	/**
-	 * @var string
-	 */
-	private $objectType;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	private $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * User
-	 *
-	 * @var IUser
-	 */
-	private $user;
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $objectId object id
-	 * @param string $objectType object type
-	 * @param IUser $user user
-	 * @param ISystemTagManager $tagManager tag manager
-	 * @param ISystemTagObjectMapper $tagMapper tag mapper
-	 */
-	public function __construct(
-		$objectId,
-		$objectType,
-		IUser $user,
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper
-	) {
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-		$this->objectId = $objectId;
-		$this->objectType = $objectType;
-		$this->user = $user;
-	}
-
-	function createFile($tagId, $data = null) {
-		try {
-			$tags = $this->tagManager->getTagsByIds([$tagId]);
-			$tag = current($tags);
-			if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
-				throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
-			}
-			if (!$this->tagManager->canUserAssignTag($tag, $this->user)) {
-				throw new Forbidden('No permission to assign tag ' . $tagId);
-			}
-
-			$this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId);
-		} catch (TagNotFoundException $e) {
-			throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
-		}
-	}
-
-	function createDirectory($name) {
-		throw new Forbidden('Permission denied to create collections');
-	}
-
-	function getChild($tagId) {
-		try {
-			if ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)) {
-				$tag = $this->tagManager->getTagsByIds([$tagId]);
-				$tag = current($tag);
-				if ($this->tagManager->canUserSeeTag($tag, $this->user)) {
-					return $this->makeNode($tag);
-				}
-			}
-			throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId);
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e);
-		}
-	}
-
-	function getChildren() {
-		$tagIds = current($this->tagMapper->getTagIdsForObjects([$this->objectId], $this->objectType));
-		if (empty($tagIds)) {
-			return [];
-		}
-		$tags = $this->tagManager->getTagsByIds($tagIds);
-
-		// filter out non-visible tags
-		$tags = array_filter($tags, function($tag) {
-			return $this->tagManager->canUserSeeTag($tag, $this->user);
-		});
-
-		return array_values(array_map(function($tag) {
-			return $this->makeNode($tag);
-		}, $tags));
-	}
-
-	function childExists($tagId) {
-		try {
-			$result = $this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true);
-
-			if ($result) {
-				$tags = $this->tagManager->getTagsByIds([$tagId]);
-				$tag = current($tags);
-				if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
-					return false;
-				}
-			}
-
-			return $result;
-		} catch (\InvalidArgumentException $e) {
-			throw new BadRequest('Invalid tag id', 0, $e);
-		} catch (TagNotFoundException $e) {
-			return false;
-		}
-	}
-
-	function delete() {
-		throw new Forbidden('Permission denied to delete this collection');
-	}
-
-	function getName() {
-		return $this->objectId;
-	}
-
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this collection');
-	}
-
-	/**
-	 * Returns the last modification time, as a unix timestamp
-	 *
-	 * @return int
-	 */
-	function getLastModified() {
-		return null;
-	}
-
-	/**
-	 * Create a sabre node for the mapping of the 
-	 * given system tag to the collection's object
-	 *
-	 * @param ISystemTag $tag
-	 *
-	 * @return SystemTagMappingNode
-	 */
-	private function makeNode(ISystemTag $tag) {
-		return new SystemTagMappingNode(
-			$tag,
-			$this->objectId,
-			$this->objectType,
-			$this->user,
-			$this->tagManager,
-			$this->tagMapper
-		);
-	}
+    /**
+     * @var string
+     */
+    private $objectId;
+
+    /**
+     * @var string
+     */
+    private $objectType;
+
+    /**
+     * @var ISystemTagManager
+     */
+    private $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * User
+     *
+     * @var IUser
+     */
+    private $user;
+
+
+    /**
+     * Constructor
+     *
+     * @param string $objectId object id
+     * @param string $objectType object type
+     * @param IUser $user user
+     * @param ISystemTagManager $tagManager tag manager
+     * @param ISystemTagObjectMapper $tagMapper tag mapper
+     */
+    public function __construct(
+        $objectId,
+        $objectType,
+        IUser $user,
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper
+    ) {
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+        $this->objectId = $objectId;
+        $this->objectType = $objectType;
+        $this->user = $user;
+    }
+
+    function createFile($tagId, $data = null) {
+        try {
+            $tags = $this->tagManager->getTagsByIds([$tagId]);
+            $tag = current($tags);
+            if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
+                throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+            }
+            if (!$this->tagManager->canUserAssignTag($tag, $this->user)) {
+                throw new Forbidden('No permission to assign tag ' . $tagId);
+            }
+
+            $this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId);
+        } catch (TagNotFoundException $e) {
+            throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign');
+        }
+    }
+
+    function createDirectory($name) {
+        throw new Forbidden('Permission denied to create collections');
+    }
+
+    function getChild($tagId) {
+        try {
+            if ($this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true)) {
+                $tag = $this->tagManager->getTagsByIds([$tagId]);
+                $tag = current($tag);
+                if ($this->tagManager->canUserSeeTag($tag, $this->user)) {
+                    return $this->makeNode($tag);
+                }
+            }
+            throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId);
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e);
+        }
+    }
+
+    function getChildren() {
+        $tagIds = current($this->tagMapper->getTagIdsForObjects([$this->objectId], $this->objectType));
+        if (empty($tagIds)) {
+            return [];
+        }
+        $tags = $this->tagManager->getTagsByIds($tagIds);
+
+        // filter out non-visible tags
+        $tags = array_filter($tags, function($tag) {
+            return $this->tagManager->canUserSeeTag($tag, $this->user);
+        });
+
+        return array_values(array_map(function($tag) {
+            return $this->makeNode($tag);
+        }, $tags));
+    }
+
+    function childExists($tagId) {
+        try {
+            $result = $this->tagMapper->haveTag([$this->objectId], $this->objectType, $tagId, true);
+
+            if ($result) {
+                $tags = $this->tagManager->getTagsByIds([$tagId]);
+                $tag = current($tags);
+                if (!$this->tagManager->canUserSeeTag($tag, $this->user)) {
+                    return false;
+                }
+            }
+
+            return $result;
+        } catch (\InvalidArgumentException $e) {
+            throw new BadRequest('Invalid tag id', 0, $e);
+        } catch (TagNotFoundException $e) {
+            return false;
+        }
+    }
+
+    function delete() {
+        throw new Forbidden('Permission denied to delete this collection');
+    }
+
+    function getName() {
+        return $this->objectId;
+    }
+
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this collection');
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    function getLastModified() {
+        return null;
+    }
+
+    /**
+     * Create a sabre node for the mapping of the 
+     * given system tag to the collection's object
+     *
+     * @param ISystemTag $tag
+     *
+     * @return SystemTagMappingNode
+     */
+    private function makeNode(ISystemTag $tag) {
+        return new SystemTagMappingNode(
+            $tag,
+            $this->objectId,
+            $this->objectType,
+            $this->user,
+            $this->tagManager,
+            $this->tagMapper
+        );
+    }
 }

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;

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]));
 	}
 }

Indentation +268 added lines, -268 removed lines

@@ -43,272 +43,272 @@
 
 class Migrator {
 
-	/** @var \Doctrine\DBAL\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());
-	}
-
-	public function createSchema() {
-		$filterExpression = $this->getFilterExpression();
-		$this->connection->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
-		return $this->connection->getSchemaManager()->createSchema();
-	}
-
-	/**
-	 * @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 */
+    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());
+    }
+
+    public function createSchema() {
+        $filterExpression = $this->getFilterExpression();
+        $this->connection->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
+        return $this->connection->getSchemaManager()->createSchema();
+    }
+
+    /**
+     * @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]));
+    }
 }

settings/Controller/CheckSetupController.php

Doc Comments +2 added lines, -1 removed lines

@@ -103,6 +103,7 @@ 
 
 	/**
 	* Chceks if the ownCloud server can connect to a specific URL using both HTTPS and HTTP
+	* @param string $sitename
 	* @return bool
 	*/
 	private function isSiteReachable($sitename) {
@@ -285,7 +286,7 @@ 
 
 	/**
 	 * @NoCSRFRequired
-	 * @return DataResponse
+	 * @return DataDisplayResponse
 	 */
 	public function getFailedIntegrityCheckFiles() {
 		if(!$this->checker->isCodeCheckEnforced()) {

Spacing +26 added lines, -26 removed lines

@@ -104,7 +104,7 @@ 
 						'www.google.com',
 						'www.github.com'];
 
-		foreach($siteArray as $site) {
+		foreach ($siteArray as $site) {
 			if ($this->isSiteReachable($site)) {
 				return true;
 			}
@@ -117,8 +117,8 @@ 
 	* @return bool
 	*/
 	private function isSiteReachable($sitename) {
-		$httpSiteName = 'http://' . $sitename . '/';
-		$httpsSiteName = 'https://' . $sitename . '/';
+		$httpSiteName = 'http://'.$sitename.'/';
+		$httpsSiteName = 'https://'.$sitename.'/';
 
 		try {
 			$client = $this->clientService->newClient();
@@ -145,9 +145,9 @@ 
 	 * @return bool
 	 */
 	private function isUrandomAvailable() {
-		if(@file_exists('/dev/urandom')) {
+		if (@file_exists('/dev/urandom')) {
 			$file = fopen('/dev/urandom', 'rb');
-			if($file) {
+			if ($file) {
 				fclose($file);
 				return true;
 			}
@@ -178,40 +178,40 @@ 
 		// Don't run check when:
 		// 1. Server has `has_internet_connection` set to false
 		// 2. AppStore AND S2S is disabled
-		if(!$this->config->getSystemValue('has_internet_connection', true)) {
+		if (!$this->config->getSystemValue('has_internet_connection', true)) {
 			return '';
 		}
-		if(!$this->config->getSystemValue('appstoreenabled', true)
+		if (!$this->config->getSystemValue('appstoreenabled', true)
 			&& $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
 			&& $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
 			return '';
 		}
 
 		$versionString = $this->getCurlVersion();
-		if(isset($versionString['ssl_version'])) {
+		if (isset($versionString['ssl_version'])) {
 			$versionString = $versionString['ssl_version'];
 		} else {
 			return '';
 		}
 
-		$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
-		if(!$this->config->getSystemValue('appstoreenabled', true)) {
-			$features = (string)$this->l10n->t('Federated Cloud Sharing');
+		$features = (string) $this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
+		if (!$this->config->getSystemValue('appstoreenabled', true)) {
+			$features = (string) $this->l10n->t('Federated Cloud Sharing');
 		}
 
 		// Check if at least OpenSSL after 1.01d or 1.0.2b
-		if(strpos($versionString, 'OpenSSL/') === 0) {
+		if (strpos($versionString, 'OpenSSL/') === 0) {
 			$majorVersion = substr($versionString, 8, 5);
 			$patchRelease = substr($versionString, 13, 6);
 
-			if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
+			if (($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
 				($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
 				return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['OpenSSL', $versionString, $features]);
 			}
 		}
 
 		// Check if NSS and perform heuristic check
-		if(strpos($versionString, 'NSS/') === 0) {
+		if (strpos($versionString, 'NSS/') === 0) {
 			try {
 				$firstClient = $this->clientService->newClient();
 				$firstClient->get('https://nextcloud.com/');
@@ -219,7 +219,7 @@ 
 				$secondClient = $this->clientService->newClient();
 				$secondClient->get('https://nextcloud.com/');
 			} catch (ClientException $e) {
-				if($e->getResponse()->getStatusCode() === 400) {
+				if ($e->getResponse()->getStatusCode() === 400) {
 					return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['NSS', $versionString, $features]);
 				}
 			}
@@ -314,13 +314,13 @@ 
 	 * @return DataResponse
 	 */
 	public function getFailedIntegrityCheckFiles() {
-		if(!$this->checker->isCodeCheckEnforced()) {
+		if (!$this->checker->isCodeCheckEnforced()) {
 			return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
 		}
 
 		$completeResults = $this->checker->getResults();
 
-		if(!empty($completeResults)) {
+		if (!empty($completeResults)) {
 			$formattedTextResponse = 'Technical information
 =====================
 The following list covers which files have failed the integrity check. Please read
@@ -330,12 +330,12 @@ 
 Results
 =======
 ';
-			foreach($completeResults as $context => $contextResult) {
+			foreach ($completeResults as $context => $contextResult) {
 				$formattedTextResponse .= "- $context\n";
 
-				foreach($contextResult as $category => $result) {
+				foreach ($contextResult as $category => $result) {
 					$formattedTextResponse .= "\t- $category\n";
-					if($category !== 'EXCEPTION') {
+					if ($category !== 'EXCEPTION') {
 						foreach ($result as $key => $results) {
 							$formattedTextResponse .= "\t\t- $key\n";
 						}
@@ -378,27 +378,27 @@ 
 
 		$isOpcacheProperlySetUp = true;
 
-		if(!$iniWrapper->getBool('opcache.enable')) {
+		if (!$iniWrapper->getBool('opcache.enable')) {
 			$isOpcacheProperlySetUp = false;
 		}
 
-		if(!$iniWrapper->getBool('opcache.save_comments')) {
+		if (!$iniWrapper->getBool('opcache.save_comments')) {
 			$isOpcacheProperlySetUp = false;
 		}
 
-		if(!$iniWrapper->getBool('opcache.enable_cli')) {
+		if (!$iniWrapper->getBool('opcache.enable_cli')) {
 			$isOpcacheProperlySetUp = false;
 		}
 
-		if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
+		if ($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
 			$isOpcacheProperlySetUp = false;
 		}
 
-		if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
+		if ($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
 			$isOpcacheProperlySetUp = false;
 		}
 
-		if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
+		if ($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
 			$isOpcacheProperlySetUp = false;
 		}
 

Indentation +381 added lines, -381 removed lines

@@ -49,282 +49,282 @@ 
  * @package OC\Settings\Controller
  */
 class CheckSetupController extends Controller {
-	/** @var IConfig */
-	private $config;
-	/** @var IClientService */
-	private $clientService;
-	/** @var \OC_Util */
-	private $util;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IL10N */
-	private $l10n;
-	/** @var Checker */
-	private $checker;
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IClientService $clientService
-	 * @param IURLGenerator $urlGenerator
-	 * @param \OC_Util $util
-	 * @param IL10N $l10n
-	 * @param Checker $checker
-	 * @param ILogger $logger
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IConfig $config,
-								IClientService $clientService,
-								IURLGenerator $urlGenerator,
-								\OC_Util $util,
-								IL10N $l10n,
-								Checker $checker,
-								ILogger $logger) {
-		parent::__construct($AppName, $request);
-		$this->config = $config;
-		$this->clientService = $clientService;
-		$this->util = $util;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10n = $l10n;
-		$this->checker = $checker;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Checks if the server can connect to the internet using HTTPS and HTTP
-	 * @return bool
-	 */
-	private function isInternetConnectionWorking() {
-		if ($this->config->getSystemValue('has_internet_connection', true) === false) {
-			return false;
-		}
-
-		$siteArray = ['www.nextcloud.com',
-						'www.google.com',
-						'www.github.com'];
-
-		foreach($siteArray as $site) {
-			if ($this->isSiteReachable($site)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* Chceks if the ownCloud server can connect to a specific URL using both HTTPS and HTTP
-	* @return bool
-	*/
-	private function isSiteReachable($sitename) {
-		$httpSiteName = 'http://' . $sitename . '/';
-		$httpsSiteName = 'https://' . $sitename . '/';
-
-		try {
-			$client = $this->clientService->newClient();
-			$client->get($httpSiteName);
-			$client->get($httpsSiteName);
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'internet_connection_check']);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Checks whether a local memcache is installed or not
-	 * @return bool
-	 */
-	private function isMemcacheConfigured() {
-		return $this->config->getSystemValue('memcache.local', null) !== null;
-	}
-
-	/**
-	 * Whether /dev/urandom is available to the PHP controller
-	 *
-	 * @return bool
-	 */
-	private function isUrandomAvailable() {
-		if(@file_exists('/dev/urandom')) {
-			$file = fopen('/dev/urandom', 'rb');
-			if($file) {
-				fclose($file);
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Public for the sake of unit-testing
-	 *
-	 * @return array
-	 */
-	protected function getCurlVersion() {
-		return curl_version();
-	}
-
-	/**
-	 * Check if the used  SSL lib is outdated. Older OpenSSL and NSS versions do
-	 * have multiple bugs which likely lead to problems in combination with
-	 * functionality required by ownCloud such as SNI.
-	 *
-	 * @link https://github.com/owncloud/core/issues/17446#issuecomment-122877546
-	 * @link https://bugzilla.redhat.com/show_bug.cgi?id=1241172
-	 * @return string
-	 */
-	private function isUsedTlsLibOutdated() {
-		// Don't run check when:
-		// 1. Server has `has_internet_connection` set to false
-		// 2. AppStore AND S2S is disabled
-		if(!$this->config->getSystemValue('has_internet_connection', true)) {
-			return '';
-		}
-		if(!$this->config->getSystemValue('appstoreenabled', true)
-			&& $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
-			&& $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
-			return '';
-		}
-
-		$versionString = $this->getCurlVersion();
-		if(isset($versionString['ssl_version'])) {
-			$versionString = $versionString['ssl_version'];
-		} else {
-			return '';
-		}
-
-		$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
-		if(!$this->config->getSystemValue('appstoreenabled', true)) {
-			$features = (string)$this->l10n->t('Federated Cloud Sharing');
-		}
-
-		// Check if at least OpenSSL after 1.01d or 1.0.2b
-		if(strpos($versionString, 'OpenSSL/') === 0) {
-			$majorVersion = substr($versionString, 8, 5);
-			$patchRelease = substr($versionString, 13, 6);
-
-			if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
-				($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
-				return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['OpenSSL', $versionString, $features]);
-			}
-		}
-
-		// Check if NSS and perform heuristic check
-		if(strpos($versionString, 'NSS/') === 0) {
-			try {
-				$firstClient = $this->clientService->newClient();
-				$firstClient->get('https://nextcloud.com/');
-
-				$secondClient = $this->clientService->newClient();
-				$secondClient->get('https://nextcloud.com/');
-			} catch (ClientException $e) {
-				if($e->getResponse()->getStatusCode() === 400) {
-					return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['NSS', $versionString, $features]);
-				}
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	 * Whether the version is outdated
-	 *
-	 * @return bool
-	 */
-	protected function isPhpOutdated() {
-		if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Whether the php version is still supported (at time of release)
-	 * according to: https://secure.php.net/supported-versions.php
-	 *
-	 * @return array
-	 */
-	private function isPhpSupported() {
-		return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
-	}
-
-	/**
-	 * Check if the reverse proxy configuration is working as expected
-	 *
-	 * @return bool
-	 */
-	private function forwardedForHeadersWorking() {
-		$trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
-		$remoteAddress = $this->request->getRemoteAddress();
-
-		if (is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) {
-			return false;
-		}
-
-		// either not enabled or working correctly
-		return true;
-	}
-
-	/**
-	 * Checks if the correct memcache module for PHP is installed. Only
-	 * fails if memcached is configured and the working module is not installed.
-	 *
-	 * @return bool
-	 */
-	private function isCorrectMemcachedPHPModuleInstalled() {
-		if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
-			return true;
-		}
-
-		// there are two different memcached modules for PHP
-		// we only support memcached and not memcache
-		// https://code.google.com/p/memcached/wiki/PHPClientComparison
-		return !(!extension_loaded('memcached') && extension_loaded('memcache'));
-	}
-
-	/**
-	 * Checks if set_time_limit is not disabled.
-	 *
-	 * @return bool
-	 */
-	private function isSettimelimitAvailable() {
-		if (function_exists('set_time_limit')
-			&& strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return RedirectResponse
-	 */
-	public function rescanFailedIntegrityCheck() {
-		$this->checker->runInstanceVerification();
-		return new RedirectResponse(
-			$this->urlGenerator->linkToRoute('settings.AdminSettings.index')
-		);
-	}
-
-	/**
-	 * @NoCSRFRequired
-	 * @return DataResponse
-	 */
-	public function getFailedIntegrityCheckFiles() {
-		if(!$this->checker->isCodeCheckEnforced()) {
-			return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
-		}
-
-		$completeResults = $this->checker->getResults();
-
-		if(!empty($completeResults)) {
-			$formattedTextResponse = 'Technical information
+    /** @var IConfig */
+    private $config;
+    /** @var IClientService */
+    private $clientService;
+    /** @var \OC_Util */
+    private $util;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IL10N */
+    private $l10n;
+    /** @var Checker */
+    private $checker;
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IClientService $clientService
+     * @param IURLGenerator $urlGenerator
+     * @param \OC_Util $util
+     * @param IL10N $l10n
+     * @param Checker $checker
+     * @param ILogger $logger
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IConfig $config,
+                                IClientService $clientService,
+                                IURLGenerator $urlGenerator,
+                                \OC_Util $util,
+                                IL10N $l10n,
+                                Checker $checker,
+                                ILogger $logger) {
+        parent::__construct($AppName, $request);
+        $this->config = $config;
+        $this->clientService = $clientService;
+        $this->util = $util;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10n = $l10n;
+        $this->checker = $checker;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Checks if the server can connect to the internet using HTTPS and HTTP
+     * @return bool
+     */
+    private function isInternetConnectionWorking() {
+        if ($this->config->getSystemValue('has_internet_connection', true) === false) {
+            return false;
+        }
+
+        $siteArray = ['www.nextcloud.com',
+                        'www.google.com',
+                        'www.github.com'];
+
+        foreach($siteArray as $site) {
+            if ($this->isSiteReachable($site)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Chceks if the ownCloud server can connect to a specific URL using both HTTPS and HTTP
+     * @return bool
+     */
+    private function isSiteReachable($sitename) {
+        $httpSiteName = 'http://' . $sitename . '/';
+        $httpsSiteName = 'https://' . $sitename . '/';
+
+        try {
+            $client = $this->clientService->newClient();
+            $client->get($httpSiteName);
+            $client->get($httpsSiteName);
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'internet_connection_check']);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Checks whether a local memcache is installed or not
+     * @return bool
+     */
+    private function isMemcacheConfigured() {
+        return $this->config->getSystemValue('memcache.local', null) !== null;
+    }
+
+    /**
+     * Whether /dev/urandom is available to the PHP controller
+     *
+     * @return bool
+     */
+    private function isUrandomAvailable() {
+        if(@file_exists('/dev/urandom')) {
+            $file = fopen('/dev/urandom', 'rb');
+            if($file) {
+                fclose($file);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Public for the sake of unit-testing
+     *
+     * @return array
+     */
+    protected function getCurlVersion() {
+        return curl_version();
+    }
+
+    /**
+     * Check if the used  SSL lib is outdated. Older OpenSSL and NSS versions do
+     * have multiple bugs which likely lead to problems in combination with
+     * functionality required by ownCloud such as SNI.
+     *
+     * @link https://github.com/owncloud/core/issues/17446#issuecomment-122877546
+     * @link https://bugzilla.redhat.com/show_bug.cgi?id=1241172
+     * @return string
+     */
+    private function isUsedTlsLibOutdated() {
+        // Don't run check when:
+        // 1. Server has `has_internet_connection` set to false
+        // 2. AppStore AND S2S is disabled
+        if(!$this->config->getSystemValue('has_internet_connection', true)) {
+            return '';
+        }
+        if(!$this->config->getSystemValue('appstoreenabled', true)
+            && $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
+            && $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
+            return '';
+        }
+
+        $versionString = $this->getCurlVersion();
+        if(isset($versionString['ssl_version'])) {
+            $versionString = $versionString['ssl_version'];
+        } else {
+            return '';
+        }
+
+        $features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
+        if(!$this->config->getSystemValue('appstoreenabled', true)) {
+            $features = (string)$this->l10n->t('Federated Cloud Sharing');
+        }
+
+        // Check if at least OpenSSL after 1.01d or 1.0.2b
+        if(strpos($versionString, 'OpenSSL/') === 0) {
+            $majorVersion = substr($versionString, 8, 5);
+            $patchRelease = substr($versionString, 13, 6);
+
+            if(($majorVersion === '1.0.1' && ord($patchRelease) < ord('d')) ||
+                ($majorVersion === '1.0.2' && ord($patchRelease) < ord('b'))) {
+                return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['OpenSSL', $versionString, $features]);
+            }
+        }
+
+        // Check if NSS and perform heuristic check
+        if(strpos($versionString, 'NSS/') === 0) {
+            try {
+                $firstClient = $this->clientService->newClient();
+                $firstClient->get('https://nextcloud.com/');
+
+                $secondClient = $this->clientService->newClient();
+                $secondClient->get('https://nextcloud.com/');
+            } catch (ClientException $e) {
+                if($e->getResponse()->getStatusCode() === 400) {
+                    return (string) $this->l10n->t('cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably.', ['NSS', $versionString, $features]);
+                }
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * Whether the version is outdated
+     *
+     * @return bool
+     */
+    protected function isPhpOutdated() {
+        if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Whether the php version is still supported (at time of release)
+     * according to: https://secure.php.net/supported-versions.php
+     *
+     * @return array
+     */
+    private function isPhpSupported() {
+        return ['eol' => $this->isPhpOutdated(), 'version' => PHP_VERSION];
+    }
+
+    /**
+     * Check if the reverse proxy configuration is working as expected
+     *
+     * @return bool
+     */
+    private function forwardedForHeadersWorking() {
+        $trustedProxies = $this->config->getSystemValue('trusted_proxies', []);
+        $remoteAddress = $this->request->getRemoteAddress();
+
+        if (is_array($trustedProxies) && in_array($remoteAddress, $trustedProxies)) {
+            return false;
+        }
+
+        // either not enabled or working correctly
+        return true;
+    }
+
+    /**
+     * Checks if the correct memcache module for PHP is installed. Only
+     * fails if memcached is configured and the working module is not installed.
+     *
+     * @return bool
+     */
+    private function isCorrectMemcachedPHPModuleInstalled() {
+        if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
+            return true;
+        }
+
+        // there are two different memcached modules for PHP
+        // we only support memcached and not memcache
+        // https://code.google.com/p/memcached/wiki/PHPClientComparison
+        return !(!extension_loaded('memcached') && extension_loaded('memcache'));
+    }
+
+    /**
+     * Checks if set_time_limit is not disabled.
+     *
+     * @return bool
+     */
+    private function isSettimelimitAvailable() {
+        if (function_exists('set_time_limit')
+            && strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return RedirectResponse
+     */
+    public function rescanFailedIntegrityCheck() {
+        $this->checker->runInstanceVerification();
+        return new RedirectResponse(
+            $this->urlGenerator->linkToRoute('settings.AdminSettings.index')
+        );
+    }
+
+    /**
+     * @NoCSRFRequired
+     * @return DataResponse
+     */
+    public function getFailedIntegrityCheckFiles() {
+        if(!$this->checker->isCodeCheckEnforced()) {
+            return new DataDisplayResponse('Integrity checker has been disabled. Integrity cannot be verified.');
+        }
+
+        $completeResults = $this->checker->getResults();
+
+        if(!empty($completeResults)) {
+            $formattedTextResponse = 'Technical information
 =====================
 The following list covers which files have failed the integrity check. Please read
 the previous linked documentation to learn more about the errors and how to fix
@@ -333,112 +333,112 @@ 
 Results
 =======
 ';
-			foreach($completeResults as $context => $contextResult) {
-				$formattedTextResponse .= "- $context\n";
-
-				foreach($contextResult as $category => $result) {
-					$formattedTextResponse .= "\t- $category\n";
-					if($category !== 'EXCEPTION') {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $key\n";
-						}
-					} else {
-						foreach ($result as $key => $results) {
-							$formattedTextResponse .= "\t\t- $results\n";
-						}
-					}
-
-				}
-			}
-
-			$formattedTextResponse .= '
+            foreach($completeResults as $context => $contextResult) {
+                $formattedTextResponse .= "- $context\n";
+
+                foreach($contextResult as $category => $result) {
+                    $formattedTextResponse .= "\t- $category\n";
+                    if($category !== 'EXCEPTION') {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $key\n";
+                        }
+                    } else {
+                        foreach ($result as $key => $results) {
+                            $formattedTextResponse .= "\t\t- $results\n";
+                        }
+                    }
+
+                }
+            }
+
+            $formattedTextResponse .= '
 Raw output
 ==========
 ';
-			$formattedTextResponse .= print_r($completeResults, true);
-		} else {
-			$formattedTextResponse = 'No errors have been found.';
-		}
-
-
-		$response = new DataDisplayResponse(
-			$formattedTextResponse,
-			Http::STATUS_OK,
-			[
-				'Content-Type' => 'text/plain',
-			]
-		);
-
-		return $response;
-	}
-
-	/**
-	 * Checks whether a PHP opcache is properly set up
-	 * @return bool
-	 */
-	protected function isOpcacheProperlySetup() {
-		$iniWrapper = new IniGetWrapper();
-
-		$isOpcacheProperlySetUp = true;
-
-		if(!$iniWrapper->getBool('opcache.enable')) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if(!$iniWrapper->getBool('opcache.save_comments')) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if(!$iniWrapper->getBool('opcache.enable_cli')) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
-			$isOpcacheProperlySetUp = false;
-		}
-
-		return $isOpcacheProperlySetUp;
-	}
-
-	/**
-	 * Check if the required FreeType functions are present
-	 * @return bool
-	 */
-	protected function hasFreeTypeSupport() {
-		return function_exists('imagettfbbox') && function_exists('imagettftext');
-	}
-
-	/**
-	 * @return DataResponse
-	 */
-	public function check() {
-		return new DataResponse(
-			[
-				'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
-				'isMemcacheConfigured' => $this->isMemcacheConfigured(),
-				'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
-				'isUrandomAvailable' => $this->isUrandomAvailable(),
-				'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
-				'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
-				'phpSupported' => $this->isPhpSupported(),
-				'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
-				'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
-				'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
-				'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
-				'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
-				'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
-				'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
-				'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
-				'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
-			]
-		);
-	}
+            $formattedTextResponse .= print_r($completeResults, true);
+        } else {
+            $formattedTextResponse = 'No errors have been found.';
+        }
+
+
+        $response = new DataDisplayResponse(
+            $formattedTextResponse,
+            Http::STATUS_OK,
+            [
+                'Content-Type' => 'text/plain',
+            ]
+        );
+
+        return $response;
+    }
+
+    /**
+     * Checks whether a PHP opcache is properly set up
+     * @return bool
+     */
+    protected function isOpcacheProperlySetup() {
+        $iniWrapper = new IniGetWrapper();
+
+        $isOpcacheProperlySetUp = true;
+
+        if(!$iniWrapper->getBool('opcache.enable')) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if(!$iniWrapper->getBool('opcache.save_comments')) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if(!$iniWrapper->getBool('opcache.enable_cli')) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.max_accelerated_files') < 10000) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.memory_consumption') < 128) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        if($iniWrapper->getNumeric('opcache.interned_strings_buffer') < 8) {
+            $isOpcacheProperlySetUp = false;
+        }
+
+        return $isOpcacheProperlySetUp;
+    }
+
+    /**
+     * Check if the required FreeType functions are present
+     * @return bool
+     */
+    protected function hasFreeTypeSupport() {
+        return function_exists('imagettfbbox') && function_exists('imagettftext');
+    }
+
+    /**
+     * @return DataResponse
+     */
+    public function check() {
+        return new DataResponse(
+            [
+                'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
+                'isMemcacheConfigured' => $this->isMemcacheConfigured(),
+                'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
+                'isUrandomAvailable' => $this->isUrandomAvailable(),
+                'securityDocs' => $this->urlGenerator->linkToDocs('admin-security'),
+                'isUsedTlsLibOutdated' => $this->isUsedTlsLibOutdated(),
+                'phpSupported' => $this->isPhpSupported(),
+                'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
+                'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
+                'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled(),
+                'hasPassedCodeIntegrityCheck' => $this->checker->hasPassedCheck(),
+                'codeIntegrityCheckerDocumentation' => $this->urlGenerator->linkToDocs('admin-code-integrity'),
+                'isOpcacheProperlySetup' => $this->isOpcacheProperlySetup(),
+                'phpOpcacheDocumentation' => $this->urlGenerator->linkToDocs('admin-php-opcache'),
+                'isSettimelimitAvailable' => $this->isSettimelimitAvailable(),
+                'hasFreeTypeSupport' => $this->hasFreeTypeSupport(),
+            ]
+        );
+    }
 }

apps/user_ldap/lib/Wizard.php

Doc Comments +1 added lines, -1 removed lines

@@ -1104,7 +1104,7 @@
 	}
 
 	/**
-	 * @param array $reqs
+	 * @param string[] $reqs
 	 * @return bool
 	 */
 	private function checkRequirements($reqs) {

Indentation +1314 added lines, -1314 removed lines

@@ -41,1320 +41,1320 @@
 use OC\ServerNotAvailableException;
 
 class Wizard extends LDAPUtility {
-	/** @var \OCP\IL10N */
-	static protected $l;
-	protected $access;
-	protected $cr;
-	protected $configuration;
-	protected $result;
-	protected $resultCache = array();
-
-	const LRESULT_PROCESSED_OK = 2;
-	const LRESULT_PROCESSED_INVALID = 3;
-	const LRESULT_PROCESSED_SKIP = 4;
-
-	const LFILTER_LOGIN      = 2;
-	const LFILTER_USER_LIST  = 3;
-	const LFILTER_GROUP_LIST = 4;
-
-	const LFILTER_MODE_ASSISTED = 2;
-	const LFILTER_MODE_RAW = 1;
-
-	const LDAP_NW_TIMEOUT = 4;
-
-	/**
-	 * Constructor
-	 * @param Configuration $configuration an instance of Configuration
-	 * @param ILDAPWrapper $ldap an instance of ILDAPWrapper
-	 * @param Access $access
-	 */
-	public function __construct(Configuration $configuration, ILDAPWrapper $ldap, Access $access) {
-		parent::__construct($ldap);
-		$this->configuration = $configuration;
-		if(is_null(Wizard::$l)) {
-			Wizard::$l = \OC::$server->getL10N('user_ldap');
-		}
-		$this->access = $access;
-		$this->result = new WizardResult();
-	}
-
-	public function  __destruct() {
-		if($this->result->hasChanges()) {
-			$this->configuration->saveConfiguration();
-		}
-	}
-
-	/**
-	 * counts entries in the LDAP directory
-	 *
-	 * @param string $filter the LDAP search filter
-	 * @param string $type a string being either 'users' or 'groups';
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function countEntries(string $filter, string $type): int {
-		$reqs = ['ldapHost', 'ldapPort', 'ldapBase'];
-		if($type === 'users') {
-			$reqs[] = 'ldapUserFilter';
-		}
-		if(!$this->checkRequirements($reqs)) {
-			throw new \Exception('Requirements not met', 400);
-		}
-
-		$attr = ['dn']; // default
-		$limit = 1001;
-		if($type === 'groups') {
-			$result =  $this->access->countGroups($filter, $attr, $limit);
-		} else if($type === 'users') {
-			$result = $this->access->countUsers($filter, $attr, $limit);
-		} else if ($type === 'objects') {
-			$result = $this->access->countObjects($limit);
-		} else {
-			throw new \Exception('Internal error: Invalid object type', 500);
-		}
-
-		return (int)$result;
-	}
-
-	/**
-	 * formats the return value of a count operation to the string to be
-	 * inserted.
-	 *
-	 * @param int $count
-	 * @return string
-	 */
-	private function formatCountResult(int $count): string {
-		if($count > 1000) {
-			return '> 1000';
-		}
-		return (string)$count;
-	}
-
-	public function countGroups() {
-		$filter = $this->configuration->ldapGroupFilter;
-
-		if(empty($filter)) {
-			$output = self::$l->n('%s group found', '%s groups found', 0, array(0));
-			$this->result->addChange('ldap_group_count', $output);
-			return $this->result;
-		}
-
-		try {
-			$groupsTotal = $this->countEntries($filter, 'groups');
-		} catch (\Exception $e) {
-			//400 can be ignored, 500 is forwarded
-			if($e->getCode() === 500) {
-				throw $e;
-			}
-			return false;
-		}
-		$output = self::$l->n(
-			'%s group found',
-			'%s groups found',
-			$groupsTotal,
-			[$this->formatCountResult($groupsTotal)]
-		);
-		$this->result->addChange('ldap_group_count', $output);
-		return $this->result;
-	}
-
-	/**
-	 * @return WizardResult
-	 * @throws \Exception
-	 */
-	public function countUsers() {
-		$filter = $this->access->getFilterForUserCount();
-
-		$usersTotal = $this->countEntries($filter, 'users');
-		$output = self::$l->n(
-			'%s user found',
-			'%s users found',
-			$usersTotal,
-			[$this->formatCountResult($usersTotal)]
-		);
-		$this->result->addChange('ldap_user_count', $output);
-		return $this->result;
-	}
-
-	/**
-	 * counts any objects in the currently set base dn
-	 *
-	 * @return WizardResult
-	 * @throws \Exception
-	 */
-	public function countInBaseDN() {
-		// we don't need to provide a filter in this case
-		$total = $this->countEntries('', 'objects');
-		if($total === false) {
-			throw new \Exception('invalid results received');
-		}
-		$this->result->addChange('ldap_test_base', $total);
-		return $this->result;
-	}
-
-	/**
-	 * counts users with a specified attribute
-	 * @param string $attr
-	 * @param bool $existsCheck
-	 * @return int|bool
-	 */
-	public function countUsersWithAttribute($attr, $existsCheck = false) {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapBase',
-										   'ldapUserFilter',
-										   ))) {
-			return  false;
-		}
-
-		$filter = $this->access->combineFilterWithAnd(array(
-			$this->configuration->ldapUserFilter,
-			$attr . '=*'
-		));
-
-		$limit = ($existsCheck === false) ? null : 1;
-
-		return $this->access->countUsers($filter, array('dn'), $limit);
-	}
-
-	/**
-	 * detects the display name attribute. If a setting is already present that
-	 * returns at least one hit, the detection will be canceled.
-	 * @return WizardResult|bool
-	 * @throws \Exception
-	 */
-	public function detectUserDisplayNameAttribute() {
-		if(!$this->checkRequirements(array('ldapHost',
-										'ldapPort',
-										'ldapBase',
-										'ldapUserFilter',
-										))) {
-			return  false;
-		}
-
-		$attr = $this->configuration->ldapUserDisplayName;
-		if ($attr !== '' && $attr !== 'displayName') {
-			// most likely not the default value with upper case N,
-			// verify it still produces a result
-			$count = (int)$this->countUsersWithAttribute($attr, true);
-			if($count > 0) {
-				//no change, but we sent it back to make sure the user interface
-				//is still correct, even if the ajax call was cancelled meanwhile
-				$this->result->addChange('ldap_display_name', $attr);
-				return $this->result;
-			}
-		}
-
-		// first attribute that has at least one result wins
-		$displayNameAttrs = array('displayname', 'cn');
-		foreach ($displayNameAttrs as $attr) {
-			$count = (int)$this->countUsersWithAttribute($attr, true);
-
-			if($count > 0) {
-				$this->applyFind('ldap_display_name', $attr);
-				return $this->result;
-			}
-		}
-
-		throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings.'));
-	}
-
-	/**
-	 * detects the most often used email attribute for users applying to the
-	 * user list filter. If a setting is already present that returns at least
-	 * one hit, the detection will be canceled.
-	 * @return WizardResult|bool
-	 */
-	public function detectEmailAttribute() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapBase',
-										   'ldapUserFilter',
-										   ))) {
-			return  false;
-		}
-
-		$attr = $this->configuration->ldapEmailAttribute;
-		if ($attr !== '') {
-			$count = (int)$this->countUsersWithAttribute($attr, true);
-			if($count > 0) {
-				return false;
-			}
-			$writeLog = true;
-		} else {
-			$writeLog = false;
-		}
-
-		$emailAttributes = array('mail', 'mailPrimaryAddress');
-		$winner = '';
-		$maxUsers = 0;
-		foreach($emailAttributes as $attr) {
-			$count = $this->countUsersWithAttribute($attr);
-			if($count > $maxUsers) {
-				$maxUsers = $count;
-				$winner = $attr;
-			}
-		}
-
-		if($winner !== '') {
-			$this->applyFind('ldap_email_attr', $winner);
-			if($writeLog) {
-				\OCP\Util::writeLog('user_ldap', 'The mail attribute has ' .
-					'automatically been reset, because the original value ' .
-					'did not return any results.', \OCP\Util::INFO);
-			}
-		}
-
-		return $this->result;
-	}
-
-	/**
-	 * @return WizardResult
-	 * @throws \Exception
-	 */
-	public function determineAttributes() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapBase',
-										   'ldapUserFilter',
-										   ))) {
-			return  false;
-		}
-
-		$attributes = $this->getUserAttributes();
-
-		natcasesort($attributes);
-		$attributes = array_values($attributes);
-
-		$this->result->addOptions('ldap_loginfilter_attributes', $attributes);
-
-		$selected = $this->configuration->ldapLoginFilterAttributes;
-		if(is_array($selected) && !empty($selected)) {
-			$this->result->addChange('ldap_loginfilter_attributes', $selected);
-		}
-
-		return $this->result;
-	}
-
-	/**
-	 * detects the available LDAP attributes
-	 * @return array|false The instance's WizardResult instance
-	 * @throws \Exception
-	 */
-	private function getUserAttributes() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapBase',
-										   'ldapUserFilter',
-										   ))) {
-			return  false;
-		}
-		$cr = $this->getConnection();
-		if(!$cr) {
-			throw new \Exception('Could not connect to LDAP');
-		}
-
-		$base = $this->configuration->ldapBase[0];
-		$filter = $this->configuration->ldapUserFilter;
-		$rr = $this->ldap->search($cr, $base, $filter, array(), 1, 1);
-		if(!$this->ldap->isResource($rr)) {
-			return false;
-		}
-		$er = $this->ldap->firstEntry($cr, $rr);
-		$attributes = $this->ldap->getAttributes($cr, $er);
-		$pureAttributes = array();
-		for($i = 0; $i < $attributes['count']; $i++) {
-			$pureAttributes[] = $attributes[$i];
-		}
-
-		return $pureAttributes;
-	}
-
-	/**
-	 * detects the available LDAP groups
-	 * @return WizardResult|false the instance's WizardResult instance
-	 */
-	public function determineGroupsForGroups() {
-		return $this->determineGroups('ldap_groupfilter_groups',
-									  'ldapGroupFilterGroups',
-									  false);
-	}
-
-	/**
-	 * detects the available LDAP groups
-	 * @return WizardResult|false the instance's WizardResult instance
-	 */
-	public function determineGroupsForUsers() {
-		return $this->determineGroups('ldap_userfilter_groups',
-									  'ldapUserFilterGroups');
-	}
-
-	/**
-	 * detects the available LDAP groups
-	 * @param string $dbKey
-	 * @param string $confKey
-	 * @param bool $testMemberOf
-	 * @return WizardResult|false the instance's WizardResult instance
-	 * @throws \Exception
-	 */
-	private function determineGroups($dbKey, $confKey, $testMemberOf = true) {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapBase',
-										   ))) {
-			return  false;
-		}
-		$cr = $this->getConnection();
-		if(!$cr) {
-			throw new \Exception('Could not connect to LDAP');
-		}
-
-		$this->fetchGroups($dbKey, $confKey);
-
-		if($testMemberOf) {
-			$this->configuration->hasMemberOfFilterSupport = $this->testMemberOf();
-			$this->result->markChange();
-			if(!$this->configuration->hasMemberOfFilterSupport) {
-				throw new \Exception('memberOf is not supported by the server');
-			}
-		}
-
-		return $this->result;
-	}
-
-	/**
-	 * fetches all groups from LDAP and adds them to the result object
-	 *
-	 * @param string $dbKey
-	 * @param string $confKey
-	 * @return array $groupEntries
-	 * @throws \Exception
-	 */
-	public function fetchGroups($dbKey, $confKey) {
-		$obclasses = array('posixGroup', 'group', 'zimbraDistributionList', 'groupOfNames', 'groupOfUniqueNames');
-
-		$filterParts = array();
-		foreach($obclasses as $obclass) {
-			$filterParts[] = 'objectclass='.$obclass;
-		}
-		//we filter for everything
-		//- that looks like a group and
-		//- has the group display name set
-		$filter = $this->access->combineFilterWithOr($filterParts);
-		$filter = $this->access->combineFilterWithAnd(array($filter, 'cn=*'));
-
-		$groupNames = array();
-		$groupEntries = array();
-		$limit = 400;
-		$offset = 0;
-		do {
-			// we need to request dn additionally here, otherwise memberOf
-			// detection will fail later
-			$result = $this->access->searchGroups($filter, array('cn', 'dn'), $limit, $offset);
-			foreach($result as $item) {
-				if(!isset($item['cn']) && !is_array($item['cn']) && !isset($item['cn'][0])) {
-					// just in case - no issue known
-					continue;
-				}
-				$groupNames[] = $item['cn'][0];
-				$groupEntries[] = $item;
-			}
-			$offset += $limit;
-		} while ($this->access->hasMoreResults());
-
-		if(count($groupNames) > 0) {
-			natsort($groupNames);
-			$this->result->addOptions($dbKey, array_values($groupNames));
-		} else {
-			throw new \Exception(self::$l->t('Could not find the desired feature'));
-		}
-
-		$setFeatures = $this->configuration->$confKey;
-		if(is_array($setFeatures) && !empty($setFeatures)) {
-			//something is already configured? pre-select it.
-			$this->result->addChange($dbKey, $setFeatures);
-		}
-		return $groupEntries;
-	}
-
-	public function determineGroupMemberAssoc() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapGroupFilter',
-										   ))) {
-			return  false;
-		}
-		$attribute = $this->detectGroupMemberAssoc();
-		if($attribute === false) {
-			return false;
-		}
-		$this->configuration->setConfiguration(array('ldapGroupMemberAssocAttr' => $attribute));
-		$this->result->addChange('ldap_group_member_assoc_attribute', $attribute);
-
-		return $this->result;
-	}
-
-	/**
-	 * Detects the available object classes
-	 * @return WizardResult|false the instance's WizardResult instance
-	 * @throws \Exception
-	 */
-	public function determineGroupObjectClasses() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapBase',
-										   ))) {
-			return  false;
-		}
-		$cr = $this->getConnection();
-		if(!$cr) {
-			throw new \Exception('Could not connect to LDAP');
-		}
-
-		$obclasses = array('groupOfNames', 'groupOfUniqueNames', 'group', 'posixGroup', '*');
-		$this->determineFeature($obclasses,
-								'objectclass',
-								'ldap_groupfilter_objectclass',
-								'ldapGroupFilterObjectclass',
-								false);
-
-		return $this->result;
-	}
-
-	/**
-	 * detects the available object classes
-	 * @return WizardResult
-	 * @throws \Exception
-	 */
-	public function determineUserObjectClasses() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapBase',
-										   ))) {
-			return  false;
-		}
-		$cr = $this->getConnection();
-		if(!$cr) {
-			throw new \Exception('Could not connect to LDAP');
-		}
-
-		$obclasses = array('inetOrgPerson', 'person', 'organizationalPerson',
-						   'user', 'posixAccount', '*');
-		$filter = $this->configuration->ldapUserFilter;
-		//if filter is empty, it is probably the first time the wizard is called
-		//then, apply suggestions.
-		$this->determineFeature($obclasses,
-								'objectclass',
-								'ldap_userfilter_objectclass',
-								'ldapUserFilterObjectclass',
-								empty($filter));
-
-		return $this->result;
-	}
-
-	/**
-	 * @return WizardResult|false
-	 * @throws \Exception
-	 */
-	public function getGroupFilter() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapBase',
-										   ))) {
-			return false;
-		}
-		//make sure the use display name is set
-		$displayName = $this->configuration->ldapGroupDisplayName;
-		if ($displayName === '') {
-			$d = $this->configuration->getDefaults();
-			$this->applyFind('ldap_group_display_name',
-							 $d['ldap_group_display_name']);
-		}
-		$filter = $this->composeLdapFilter(self::LFILTER_GROUP_LIST);
-
-		$this->applyFind('ldap_group_filter', $filter);
-		return $this->result;
-	}
-
-	/**
-	 * @return WizardResult|false
-	 * @throws \Exception
-	 */
-	public function getUserListFilter() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapBase',
-										   ))) {
-			return false;
-		}
-		//make sure the use display name is set
-		$displayName = $this->configuration->ldapUserDisplayName;
-		if ($displayName === '') {
-			$d = $this->configuration->getDefaults();
-			$this->applyFind('ldap_display_name', $d['ldap_display_name']);
-		}
-		$filter = $this->composeLdapFilter(self::LFILTER_USER_LIST);
-		if(!$filter) {
-			throw new \Exception('Cannot create filter');
-		}
-
-		$this->applyFind('ldap_userlist_filter', $filter);
-		return $this->result;
-	}
-
-	/**
-	 * @return bool|WizardResult
-	 * @throws \Exception
-	 */
-	public function getUserLoginFilter() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   'ldapBase',
-										   'ldapUserFilter',
-										   ))) {
-			return false;
-		}
-
-		$filter = $this->composeLdapFilter(self::LFILTER_LOGIN);
-		if(!$filter) {
-			throw new \Exception('Cannot create filter');
-		}
-
-		$this->applyFind('ldap_login_filter', $filter);
-		return $this->result;
-	}
-
-	/**
-	 * @return bool|WizardResult
-	 * @param string $loginName
-	 * @throws \Exception
-	 */
-	public function testLoginName($loginName) {
-		if(!$this->checkRequirements(array('ldapHost',
-			'ldapPort',
-			'ldapBase',
-			'ldapLoginFilter',
-		))) {
-			return false;
-		}
-
-		$cr = $this->access->connection->getConnectionResource();
-		if(!$this->ldap->isResource($cr)) {
-			throw new \Exception('connection error');
-		}
-
-		if(mb_strpos($this->access->connection->ldapLoginFilter, '%uid', 0, 'UTF-8')
-			=== false) {
-			throw new \Exception('missing placeholder');
-		}
-
-		$users = $this->access->countUsersByLoginName($loginName);
-		if($this->ldap->errno($cr) !== 0) {
-			throw new \Exception($this->ldap->error($cr));
-		}
-		$filter = str_replace('%uid', $loginName, $this->access->connection->ldapLoginFilter);
-		$this->result->addChange('ldap_test_loginname', $users);
-		$this->result->addChange('ldap_test_effective_filter', $filter);
-		return $this->result;
-	}
-
-	/**
-	 * Tries to determine the port, requires given Host, User DN and Password
-	 * @return WizardResult|false WizardResult on success, false otherwise
-	 * @throws \Exception
-	 */
-	public function guessPortAndTLS() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   ))) {
-			return false;
-		}
-		$this->checkHost();
-		$portSettings = $this->getPortSettingsToTry();
-
-		if(!is_array($portSettings)) {
-			throw new \Exception(print_r($portSettings, true));
-		}
-
-		//proceed from the best configuration and return on first success
-		foreach($portSettings as $setting) {
-			$p = $setting['port'];
-			$t = $setting['tls'];
-			\OCP\Util::writeLog('user_ldap', 'Wiz: trying port '. $p . ', TLS '. $t, \OCP\Util::DEBUG);
-			//connectAndBind may throw Exception, it needs to be catched by the
-			//callee of this method
-
-			try {
-				$settingsFound = $this->connectAndBind($p, $t);
-			} catch (\Exception $e) {
-				// any reply other than -1 (= cannot connect) is already okay,
-				// because then we found the server
-				// unavailable startTLS returns -11
-				if($e->getCode() > 0) {
-					$settingsFound = true;
-				} else {
-					throw $e;
-				}
-			}
-
-			if ($settingsFound === true) {
-				$config = array(
-					'ldapPort' => $p,
-					'ldapTLS' => (int)$t
-				);
-				$this->configuration->setConfiguration($config);
-				\OCP\Util::writeLog('user_ldap', 'Wiz: detected Port ' . $p, \OCP\Util::DEBUG);
-				$this->result->addChange('ldap_port', $p);
-				return $this->result;
-			}
-		}
-
-		//custom port, undetected (we do not brute force)
-		return false;
-	}
-
-	/**
-	 * tries to determine a base dn from User DN or LDAP Host
-	 * @return WizardResult|false WizardResult on success, false otherwise
-	 */
-	public function guessBaseDN() {
-		if(!$this->checkRequirements(array('ldapHost',
-										   'ldapPort',
-										   ))) {
-			return false;
-		}
-
-		//check whether a DN is given in the agent name (99.9% of all cases)
-		$base = null;
-		$i = stripos($this->configuration->ldapAgentName, 'dc=');
-		if($i !== false) {
-			$base = substr($this->configuration->ldapAgentName, $i);
-			if($this->testBaseDN($base)) {
-				$this->applyFind('ldap_base', $base);
-				return $this->result;
-			}
-		}
-
-		//this did not help :(
-		//Let's see whether we can parse the Host URL and convert the domain to
-		//a base DN
-		$helper = new Helper(\OC::$server->getConfig());
-		$domain = $helper->getDomainFromURL($this->configuration->ldapHost);
-		if(!$domain) {
-			return false;
-		}
-
-		$dparts = explode('.', $domain);
-		while(count($dparts) > 0) {
-			$base2 = 'dc=' . implode(',dc=', $dparts);
-			if ($base !== $base2 && $this->testBaseDN($base2)) {
-				$this->applyFind('ldap_base', $base2);
-				return $this->result;
-			}
-			array_shift($dparts);
-		}
-
-		return false;
-	}
-
-	/**
-	 * sets the found value for the configuration key in the WizardResult
-	 * as well as in the Configuration instance
-	 * @param string $key the configuration key
-	 * @param string $value the (detected) value
-	 *
-	 */
-	private function applyFind($key, $value) {
-		$this->result->addChange($key, $value);
-		$this->configuration->setConfiguration(array($key => $value));
-	}
-
-	/**
-	 * Checks, whether a port was entered in the Host configuration
-	 * field. In this case the port will be stripped off, but also stored as
-	 * setting.
-	 */
-	private function checkHost() {
-		$host = $this->configuration->ldapHost;
-		$hostInfo = parse_url($host);
-
-		//removes Port from Host
-		if(is_array($hostInfo) && isset($hostInfo['port'])) {
-			$port = $hostInfo['port'];
-			$host = str_replace(':'.$port, '', $host);
-			$this->applyFind('ldap_host', $host);
-			$this->applyFind('ldap_port', $port);
-		}
-	}
-
-	/**
-	 * tries to detect the group member association attribute which is
-	 * one of 'uniqueMember', 'memberUid', 'member', 'gidNumber'
-	 * @return string|false, string with the attribute name, false on error
-	 * @throws \Exception
-	 */
-	private function detectGroupMemberAssoc() {
-		$possibleAttrs = array('uniqueMember', 'memberUid', 'member', 'gidNumber');
-		$filter = $this->configuration->ldapGroupFilter;
-		if(empty($filter)) {
-			return false;
-		}
-		$cr = $this->getConnection();
-		if(!$cr) {
-			throw new \Exception('Could not connect to LDAP');
-		}
-		$base = $this->configuration->ldapBase[0];
-		$rr = $this->ldap->search($cr, $base, $filter, $possibleAttrs, 0, 1000);
-		if(!$this->ldap->isResource($rr)) {
-			return false;
-		}
-		$er = $this->ldap->firstEntry($cr, $rr);
-		while(is_resource($er)) {
-			$this->ldap->getDN($cr, $er);
-			$attrs = $this->ldap->getAttributes($cr, $er);
-			$result = array();
-			$possibleAttrsCount = count($possibleAttrs);
-			for($i = 0; $i < $possibleAttrsCount; $i++) {
-				if(isset($attrs[$possibleAttrs[$i]])) {
-					$result[$possibleAttrs[$i]] = $attrs[$possibleAttrs[$i]]['count'];
-				}
-			}
-			if(!empty($result)) {
-				natsort($result);
-				return key($result);
-			}
-
-			$er = $this->ldap->nextEntry($cr, $er);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks whether for a given BaseDN results will be returned
-	 * @param string $base the BaseDN to test
-	 * @return bool true on success, false otherwise
-	 * @throws \Exception
-	 */
-	private function testBaseDN($base) {
-		$cr = $this->getConnection();
-		if(!$cr) {
-			throw new \Exception('Could not connect to LDAP');
-		}
-
-		//base is there, let's validate it. If we search for anything, we should
-		//get a result set > 0 on a proper base
-		$rr = $this->ldap->search($cr, $base, 'objectClass=*', array('dn'), 0, 1);
-		if(!$this->ldap->isResource($rr)) {
-			$errorNo  = $this->ldap->errno($cr);
-			$errorMsg = $this->ldap->error($cr);
-			\OCP\Util::writeLog('user_ldap', 'Wiz: Could not search base '.$base.
-							' Error '.$errorNo.': '.$errorMsg, \OCP\Util::INFO);
-			return false;
-		}
-		$entries = $this->ldap->countEntries($cr, $rr);
-		return ($entries !== false) && ($entries > 0);
-	}
-
-	/**
-	 * Checks whether the server supports memberOf in LDAP Filter.
-	 * Note: at least in OpenLDAP, availability of memberOf is dependent on
-	 * a configured objectClass. I.e. not necessarily for all available groups
-	 * memberOf does work.
-	 *
-	 * @return bool true if it does, false otherwise
-	 * @throws \Exception
-	 */
-	private function testMemberOf() {
-		$cr = $this->getConnection();
-		if(!$cr) {
-			throw new \Exception('Could not connect to LDAP');
-		}
-		$result = $this->access->countUsers('memberOf=*', array('memberOf'), 1);
-		if(is_int($result) &&  $result > 0) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * creates an LDAP Filter from given configuration
-	 * @param integer $filterType int, for which use case the filter shall be created
-	 * can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or
-	 * self::LFILTER_GROUP_LIST
-	 * @return string|false string with the filter on success, false otherwise
-	 * @throws \Exception
-	 */
-	private function composeLdapFilter($filterType) {
-		$filter = '';
-		$parts = 0;
-		switch ($filterType) {
-			case self::LFILTER_USER_LIST:
-				$objcs = $this->configuration->ldapUserFilterObjectclass;
-				//glue objectclasses
-				if(is_array($objcs) && count($objcs) > 0) {
-					$filter .= '(|';
-					foreach($objcs as $objc) {
-						$filter .= '(objectclass=' . $objc . ')';
-					}
-					$filter .= ')';
-					$parts++;
-				}
-				//glue group memberships
-				if($this->configuration->hasMemberOfFilterSupport) {
-					$cns = $this->configuration->ldapUserFilterGroups;
-					if(is_array($cns) && count($cns) > 0) {
-						$filter .= '(|';
-						$cr = $this->getConnection();
-						if(!$cr) {
-							throw new \Exception('Could not connect to LDAP');
-						}
-						$base = $this->configuration->ldapBase[0];
-						foreach($cns as $cn) {
-							$rr = $this->ldap->search($cr, $base, 'cn=' . $cn, array('dn', 'primaryGroupToken'));
-							if(!$this->ldap->isResource($rr)) {
-								continue;
-							}
-							$er = $this->ldap->firstEntry($cr, $rr);
-							$attrs = $this->ldap->getAttributes($cr, $er);
-							$dn = $this->ldap->getDN($cr, $er);
-							if ($dn === false || $dn === '') {
-								continue;
-							}
-							$filterPart = '(memberof=' . $dn . ')';
-							if(isset($attrs['primaryGroupToken'])) {
-								$pgt = $attrs['primaryGroupToken'][0];
-								$primaryFilterPart = '(primaryGroupID=' . $pgt .')';
-								$filterPart = '(|' . $filterPart . $primaryFilterPart . ')';
-							}
-							$filter .= $filterPart;
-						}
-						$filter .= ')';
-					}
-					$parts++;
-				}
-				//wrap parts in AND condition
-				if($parts > 1) {
-					$filter = '(&' . $filter . ')';
-				}
-				if ($filter === '') {
-					$filter = '(objectclass=*)';
-				}
-				break;
-
-			case self::LFILTER_GROUP_LIST:
-				$objcs = $this->configuration->ldapGroupFilterObjectclass;
-				//glue objectclasses
-				if(is_array($objcs) && count($objcs) > 0) {
-					$filter .= '(|';
-					foreach($objcs as $objc) {
-						$filter .= '(objectclass=' . $objc . ')';
-					}
-					$filter .= ')';
-					$parts++;
-				}
-				//glue group memberships
-				$cns = $this->configuration->ldapGroupFilterGroups;
-				if(is_array($cns) && count($cns) > 0) {
-					$filter .= '(|';
-					foreach($cns as $cn) {
-						$filter .= '(cn=' . $cn . ')';
-					}
-					$filter .= ')';
-				}
-				$parts++;
-				//wrap parts in AND condition
-				if($parts > 1) {
-					$filter = '(&' . $filter . ')';
-				}
-				break;
-
-			case self::LFILTER_LOGIN:
-				$ulf = $this->configuration->ldapUserFilter;
-				$loginpart = '=%uid';
-				$filterUsername = '';
-				$userAttributes = $this->getUserAttributes();
-				$userAttributes = array_change_key_case(array_flip($userAttributes));
-				$parts = 0;
-
-				if($this->configuration->ldapLoginFilterUsername === '1') {
-					$attr = '';
-					if(isset($userAttributes['uid'])) {
-						$attr = 'uid';
-					} else if(isset($userAttributes['samaccountname'])) {
-						$attr = 'samaccountname';
-					} else if(isset($userAttributes['cn'])) {
-						//fallback
-						$attr = 'cn';
-					}
-					if ($attr !== '') {
-						$filterUsername = '(' . $attr . $loginpart . ')';
-						$parts++;
-					}
-				}
-
-				$filterEmail = '';
-				if($this->configuration->ldapLoginFilterEmail === '1') {
-					$filterEmail = '(|(mailPrimaryAddress=%uid)(mail=%uid))';
-					$parts++;
-				}
-
-				$filterAttributes = '';
-				$attrsToFilter = $this->configuration->ldapLoginFilterAttributes;
-				if(is_array($attrsToFilter) && count($attrsToFilter) > 0) {
-					$filterAttributes = '(|';
-					foreach($attrsToFilter as $attribute) {
-						$filterAttributes .= '(' . $attribute . $loginpart . ')';
-					}
-					$filterAttributes .= ')';
-					$parts++;
-				}
-
-				$filterLogin = '';
-				if($parts > 1) {
-					$filterLogin = '(|';
-				}
-				$filterLogin .= $filterUsername;
-				$filterLogin .= $filterEmail;
-				$filterLogin .= $filterAttributes;
-				if($parts > 1) {
-					$filterLogin .= ')';
-				}
-
-				$filter = '(&'.$ulf.$filterLogin.')';
-				break;
-		}
-
-		\OCP\Util::writeLog('user_ldap', 'Wiz: Final filter '.$filter, \OCP\Util::DEBUG);
-
-		return $filter;
-	}
-
-	/**
-	 * Connects and Binds to an LDAP Server
-	 *
-	 * @param int $port the port to connect with
-	 * @param bool $tls whether startTLS is to be used
-	 * @return bool
-	 * @throws \Exception
-	 */
-	private function connectAndBind($port, $tls) {
-		//connect, does not really trigger any server communication
-		$host = $this->configuration->ldapHost;
-		$hostInfo = parse_url($host);
-		if(!$hostInfo) {
-			throw new \Exception(self::$l->t('Invalid Host'));
-		}
-		\OCP\Util::writeLog('user_ldap', 'Wiz: Attempting to connect ', \OCP\Util::DEBUG);
-		$cr = $this->ldap->connect($host, $port);
-		if(!is_resource($cr)) {
-			throw new \Exception(self::$l->t('Invalid Host'));
-		}
-
-		//set LDAP options
-		$this->ldap->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3);
-		$this->ldap->setOption($cr, LDAP_OPT_REFERRALS, 0);
-		$this->ldap->setOption($cr, LDAP_OPT_NETWORK_TIMEOUT, self::LDAP_NW_TIMEOUT);
-
-		try {
-			if($tls) {
-				$isTlsWorking = @$this->ldap->startTls($cr);
-				if(!$isTlsWorking) {
-					return false;
-				}
-			}
-
-			\OCP\Util::writeLog('user_ldap', 'Wiz: Attemping to Bind ', \OCP\Util::DEBUG);
-			//interesting part: do the bind!
-			$login = $this->ldap->bind($cr,
-				$this->configuration->ldapAgentName,
-				$this->configuration->ldapAgentPassword
-			);
-			$errNo = $this->ldap->errno($cr);
-			$error = ldap_error($cr);
-			$this->ldap->unbind($cr);
-		} catch(ServerNotAvailableException $e) {
-			return false;
-		}
-
-		if($login === true) {
-			$this->ldap->unbind($cr);
-			\OCP\Util::writeLog('user_ldap', 'Wiz: Bind successful to Port '. $port . ' TLS ' . (int)$tls, \OCP\Util::DEBUG);
-			return true;
-		}
-
-		if($errNo === -1) {
-			//host, port or TLS wrong
-			return false;
-		}
-		throw new \Exception($error, $errNo);
-	}
-
-	/**
-	 * checks whether a valid combination of agent and password has been
-	 * provided (either two values or nothing for anonymous connect)
-	 * @return bool, true if everything is fine, false otherwise
-	 */
-	private function checkAgentRequirements() {
-		$agent = $this->configuration->ldapAgentName;
-		$pwd = $this->configuration->ldapAgentPassword;
-
-		return
-			($agent !== '' && $pwd !== '')
-			||  ($agent === '' && $pwd === '')
-		;
-	}
-
-	/**
-	 * @param array $reqs
-	 * @return bool
-	 */
-	private function checkRequirements($reqs) {
-		$this->checkAgentRequirements();
-		foreach($reqs as $option) {
-			$value = $this->configuration->$option;
-			if(empty($value)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * does a cumulativeSearch on LDAP to get different values of a
-	 * specified attribute
-	 * @param string[] $filters array, the filters that shall be used in the search
-	 * @param string $attr the attribute of which a list of values shall be returned
-	 * @param int $dnReadLimit the amount of how many DNs should be analyzed.
-	 * The lower, the faster
-	 * @param string $maxF string. if not null, this variable will have the filter that
-	 * yields most result entries
-	 * @return array|false an array with the values on success, false otherwise
-	 */
-	public function cumulativeSearchOnAttribute($filters, $attr, $dnReadLimit = 3, &$maxF = null) {
-		$dnRead = array();
-		$foundItems = array();
-		$maxEntries = 0;
-		if(!is_array($this->configuration->ldapBase)
-		   || !isset($this->configuration->ldapBase[0])) {
-			return false;
-		}
-		$base = $this->configuration->ldapBase[0];
-		$cr = $this->getConnection();
-		if(!$this->ldap->isResource($cr)) {
-			return false;
-		}
-		$lastFilter = null;
-		if(isset($filters[count($filters)-1])) {
-			$lastFilter = $filters[count($filters)-1];
-		}
-		foreach($filters as $filter) {
-			if($lastFilter === $filter && count($foundItems) > 0) {
-				//skip when the filter is a wildcard and results were found
-				continue;
-			}
-			// 20k limit for performance and reason
-			$rr = $this->ldap->search($cr, $base, $filter, array($attr), 0, 20000);
-			if(!$this->ldap->isResource($rr)) {
-				continue;
-			}
-			$entries = $this->ldap->countEntries($cr, $rr);
-			$getEntryFunc = 'firstEntry';
-			if(($entries !== false) && ($entries > 0)) {
-				if(!is_null($maxF) && $entries > $maxEntries) {
-					$maxEntries = $entries;
-					$maxF = $filter;
-				}
-				$dnReadCount = 0;
-				do {
-					$entry = $this->ldap->$getEntryFunc($cr, $rr);
-					$getEntryFunc = 'nextEntry';
-					if(!$this->ldap->isResource($entry)) {
-						continue 2;
-					}
-					$rr = $entry; //will be expected by nextEntry next round
-					$attributes = $this->ldap->getAttributes($cr, $entry);
-					$dn = $this->ldap->getDN($cr, $entry);
-					if($dn === false || in_array($dn, $dnRead)) {
-						continue;
-					}
-					$newItems = array();
-					$state = $this->getAttributeValuesFromEntry($attributes,
-																$attr,
-																$newItems);
-					$dnReadCount++;
-					$foundItems = array_merge($foundItems, $newItems);
-					$this->resultCache[$dn][$attr] = $newItems;
-					$dnRead[] = $dn;
-				} while(($state === self::LRESULT_PROCESSED_SKIP
-						|| $this->ldap->isResource($entry))
-						&& ($dnReadLimit === 0 || $dnReadCount < $dnReadLimit));
-			}
-		}
-
-		return array_unique($foundItems);
-	}
-
-	/**
-	 * determines if and which $attr are available on the LDAP server
-	 * @param string[] $objectclasses the objectclasses to use as search filter
-	 * @param string $attr the attribute to look for
-	 * @param string $dbkey the dbkey of the setting the feature is connected to
-	 * @param string $confkey the confkey counterpart for the $dbkey as used in the
-	 * Configuration class
-	 * @param bool $po whether the objectClass with most result entries
-	 * shall be pre-selected via the result
-	 * @return array|false list of found items.
-	 * @throws \Exception
-	 */
-	private function determineFeature($objectclasses, $attr, $dbkey, $confkey, $po = false) {
-		$cr = $this->getConnection();
-		if(!$cr) {
-			throw new \Exception('Could not connect to LDAP');
-		}
-		$p = 'objectclass=';
-		foreach($objectclasses as $key => $value) {
-			$objectclasses[$key] = $p.$value;
-		}
-		$maxEntryObjC = '';
-
-		//how deep to dig?
-		//When looking for objectclasses, testing few entries is sufficient,
-		$dig = 3;
-
-		$availableFeatures =
-			$this->cumulativeSearchOnAttribute($objectclasses, $attr,
-											   $dig, $maxEntryObjC);
-		if(is_array($availableFeatures)
-		   && count($availableFeatures) > 0) {
-			natcasesort($availableFeatures);
-			//natcasesort keeps indices, but we must get rid of them for proper
-			//sorting in the web UI. Therefore: array_values
-			$this->result->addOptions($dbkey, array_values($availableFeatures));
-		} else {
-			throw new \Exception(self::$l->t('Could not find the desired feature'));
-		}
-
-		$setFeatures = $this->configuration->$confkey;
-		if(is_array($setFeatures) && !empty($setFeatures)) {
-			//something is already configured? pre-select it.
-			$this->result->addChange($dbkey, $setFeatures);
-		} else if ($po && $maxEntryObjC !== '') {
-			//pre-select objectclass with most result entries
-			$maxEntryObjC = str_replace($p, '', $maxEntryObjC);
-			$this->applyFind($dbkey, $maxEntryObjC);
-			$this->result->addChange($dbkey, $maxEntryObjC);
-		}
-
-		return $availableFeatures;
-	}
-
-	/**
-	 * appends a list of values fr
-	 * @param resource $result the return value from ldap_get_attributes
-	 * @param string $attribute the attribute values to look for
-	 * @param array &$known new values will be appended here
-	 * @return int, state on of the class constants LRESULT_PROCESSED_OK,
-	 * LRESULT_PROCESSED_INVALID or LRESULT_PROCESSED_SKIP
-	 */
-	private function getAttributeValuesFromEntry($result, $attribute, &$known) {
-		if(!is_array($result)
-		   || !isset($result['count'])
-		   || !$result['count'] > 0) {
-			return self::LRESULT_PROCESSED_INVALID;
-		}
-
-		// strtolower on all keys for proper comparison
-		$result = \OCP\Util::mb_array_change_key_case($result);
-		$attribute = strtolower($attribute);
-		if(isset($result[$attribute])) {
-			foreach($result[$attribute] as $key => $val) {
-				if($key === 'count') {
-					continue;
-				}
-				if(!in_array($val, $known)) {
-					$known[] = $val;
-				}
-			}
-			return self::LRESULT_PROCESSED_OK;
-		} else {
-			return self::LRESULT_PROCESSED_SKIP;
-		}
-	}
-
-	/**
-	 * @return bool|mixed
-	 */
-	private function getConnection() {
-		if(!is_null($this->cr)) {
-			return $this->cr;
-		}
-
-		$cr = $this->ldap->connect(
-			$this->configuration->ldapHost,
-			$this->configuration->ldapPort
-		);
-
-		$this->ldap->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3);
-		$this->ldap->setOption($cr, LDAP_OPT_REFERRALS, 0);
-		$this->ldap->setOption($cr, LDAP_OPT_NETWORK_TIMEOUT, self::LDAP_NW_TIMEOUT);
-		if($this->configuration->ldapTLS === 1) {
-			$this->ldap->startTls($cr);
-		}
-
-		$lo = @$this->ldap->bind($cr,
-								 $this->configuration->ldapAgentName,
-								 $this->configuration->ldapAgentPassword);
-		if($lo === true) {
-			$this->$cr = $cr;
-			return $cr;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return array
-	 */
-	private function getDefaultLdapPortSettings() {
-		static $settings = array(
-								array('port' => 7636, 'tls' => false),
-								array('port' =>  636, 'tls' => false),
-								array('port' => 7389, 'tls' => true),
-								array('port' =>  389, 'tls' => true),
-								array('port' => 7389, 'tls' => false),
-								array('port' =>  389, 'tls' => false),
-						  );
-		return $settings;
-	}
-
-	/**
-	 * @return array
-	 */
-	private function getPortSettingsToTry() {
-		//389 ← LDAP / Unencrypted or StartTLS
-		//636 ← LDAPS / SSL
-		//7xxx ← UCS. need to be checked first, because both ports may be open
-		$host = $this->configuration->ldapHost;
-		$port = (int)$this->configuration->ldapPort;
-		$portSettings = array();
-
-		//In case the port is already provided, we will check this first
-		if($port > 0) {
-			$hostInfo = parse_url($host);
-			if(!(is_array($hostInfo)
-				&& isset($hostInfo['scheme'])
-				&& stripos($hostInfo['scheme'], 'ldaps') !== false)) {
-				$portSettings[] = array('port' => $port, 'tls' => true);
-			}
-			$portSettings[] =array('port' => $port, 'tls' => false);
-		}
-
-		//default ports
-		$portSettings = array_merge($portSettings,
-		                            $this->getDefaultLdapPortSettings());
-
-		return $portSettings;
-	}
+    /** @var \OCP\IL10N */
+    static protected $l;
+    protected $access;
+    protected $cr;
+    protected $configuration;
+    protected $result;
+    protected $resultCache = array();
+
+    const LRESULT_PROCESSED_OK = 2;
+    const LRESULT_PROCESSED_INVALID = 3;
+    const LRESULT_PROCESSED_SKIP = 4;
+
+    const LFILTER_LOGIN      = 2;
+    const LFILTER_USER_LIST  = 3;
+    const LFILTER_GROUP_LIST = 4;
+
+    const LFILTER_MODE_ASSISTED = 2;
+    const LFILTER_MODE_RAW = 1;
+
+    const LDAP_NW_TIMEOUT = 4;
+
+    /**
+     * Constructor
+     * @param Configuration $configuration an instance of Configuration
+     * @param ILDAPWrapper $ldap an instance of ILDAPWrapper
+     * @param Access $access
+     */
+    public function __construct(Configuration $configuration, ILDAPWrapper $ldap, Access $access) {
+        parent::__construct($ldap);
+        $this->configuration = $configuration;
+        if(is_null(Wizard::$l)) {
+            Wizard::$l = \OC::$server->getL10N('user_ldap');
+        }
+        $this->access = $access;
+        $this->result = new WizardResult();
+    }
+
+    public function  __destruct() {
+        if($this->result->hasChanges()) {
+            $this->configuration->saveConfiguration();
+        }
+    }
+
+    /**
+     * counts entries in the LDAP directory
+     *
+     * @param string $filter the LDAP search filter
+     * @param string $type a string being either 'users' or 'groups';
+     * @return int
+     * @throws \Exception
+     */
+    public function countEntries(string $filter, string $type): int {
+        $reqs = ['ldapHost', 'ldapPort', 'ldapBase'];
+        if($type === 'users') {
+            $reqs[] = 'ldapUserFilter';
+        }
+        if(!$this->checkRequirements($reqs)) {
+            throw new \Exception('Requirements not met', 400);
+        }
+
+        $attr = ['dn']; // default
+        $limit = 1001;
+        if($type === 'groups') {
+            $result =  $this->access->countGroups($filter, $attr, $limit);
+        } else if($type === 'users') {
+            $result = $this->access->countUsers($filter, $attr, $limit);
+        } else if ($type === 'objects') {
+            $result = $this->access->countObjects($limit);
+        } else {
+            throw new \Exception('Internal error: Invalid object type', 500);
+        }
+
+        return (int)$result;
+    }
+
+    /**
+     * formats the return value of a count operation to the string to be
+     * inserted.
+     *
+     * @param int $count
+     * @return string
+     */
+    private function formatCountResult(int $count): string {
+        if($count > 1000) {
+            return '> 1000';
+        }
+        return (string)$count;
+    }
+
+    public function countGroups() {
+        $filter = $this->configuration->ldapGroupFilter;
+
+        if(empty($filter)) {
+            $output = self::$l->n('%s group found', '%s groups found', 0, array(0));
+            $this->result->addChange('ldap_group_count', $output);
+            return $this->result;
+        }
+
+        try {
+            $groupsTotal = $this->countEntries($filter, 'groups');
+        } catch (\Exception $e) {
+            //400 can be ignored, 500 is forwarded
+            if($e->getCode() === 500) {
+                throw $e;
+            }
+            return false;
+        }
+        $output = self::$l->n(
+            '%s group found',
+            '%s groups found',
+            $groupsTotal,
+            [$this->formatCountResult($groupsTotal)]
+        );
+        $this->result->addChange('ldap_group_count', $output);
+        return $this->result;
+    }
+
+    /**
+     * @return WizardResult
+     * @throws \Exception
+     */
+    public function countUsers() {
+        $filter = $this->access->getFilterForUserCount();
+
+        $usersTotal = $this->countEntries($filter, 'users');
+        $output = self::$l->n(
+            '%s user found',
+            '%s users found',
+            $usersTotal,
+            [$this->formatCountResult($usersTotal)]
+        );
+        $this->result->addChange('ldap_user_count', $output);
+        return $this->result;
+    }
+
+    /**
+     * counts any objects in the currently set base dn
+     *
+     * @return WizardResult
+     * @throws \Exception
+     */
+    public function countInBaseDN() {
+        // we don't need to provide a filter in this case
+        $total = $this->countEntries('', 'objects');
+        if($total === false) {
+            throw new \Exception('invalid results received');
+        }
+        $this->result->addChange('ldap_test_base', $total);
+        return $this->result;
+    }
+
+    /**
+     * counts users with a specified attribute
+     * @param string $attr
+     * @param bool $existsCheck
+     * @return int|bool
+     */
+    public function countUsersWithAttribute($attr, $existsCheck = false) {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapBase',
+                                            'ldapUserFilter',
+                                            ))) {
+            return  false;
+        }
+
+        $filter = $this->access->combineFilterWithAnd(array(
+            $this->configuration->ldapUserFilter,
+            $attr . '=*'
+        ));
+
+        $limit = ($existsCheck === false) ? null : 1;
+
+        return $this->access->countUsers($filter, array('dn'), $limit);
+    }
+
+    /**
+     * detects the display name attribute. If a setting is already present that
+     * returns at least one hit, the detection will be canceled.
+     * @return WizardResult|bool
+     * @throws \Exception
+     */
+    public function detectUserDisplayNameAttribute() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                        'ldapPort',
+                                        'ldapBase',
+                                        'ldapUserFilter',
+                                        ))) {
+            return  false;
+        }
+
+        $attr = $this->configuration->ldapUserDisplayName;
+        if ($attr !== '' && $attr !== 'displayName') {
+            // most likely not the default value with upper case N,
+            // verify it still produces a result
+            $count = (int)$this->countUsersWithAttribute($attr, true);
+            if($count > 0) {
+                //no change, but we sent it back to make sure the user interface
+                //is still correct, even if the ajax call was cancelled meanwhile
+                $this->result->addChange('ldap_display_name', $attr);
+                return $this->result;
+            }
+        }
+
+        // first attribute that has at least one result wins
+        $displayNameAttrs = array('displayname', 'cn');
+        foreach ($displayNameAttrs as $attr) {
+            $count = (int)$this->countUsersWithAttribute($attr, true);
+
+            if($count > 0) {
+                $this->applyFind('ldap_display_name', $attr);
+                return $this->result;
+            }
+        }
+
+        throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings.'));
+    }
+
+    /**
+     * detects the most often used email attribute for users applying to the
+     * user list filter. If a setting is already present that returns at least
+     * one hit, the detection will be canceled.
+     * @return WizardResult|bool
+     */
+    public function detectEmailAttribute() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapBase',
+                                            'ldapUserFilter',
+                                            ))) {
+            return  false;
+        }
+
+        $attr = $this->configuration->ldapEmailAttribute;
+        if ($attr !== '') {
+            $count = (int)$this->countUsersWithAttribute($attr, true);
+            if($count > 0) {
+                return false;
+            }
+            $writeLog = true;
+        } else {
+            $writeLog = false;
+        }
+
+        $emailAttributes = array('mail', 'mailPrimaryAddress');
+        $winner = '';
+        $maxUsers = 0;
+        foreach($emailAttributes as $attr) {
+            $count = $this->countUsersWithAttribute($attr);
+            if($count > $maxUsers) {
+                $maxUsers = $count;
+                $winner = $attr;
+            }
+        }
+
+        if($winner !== '') {
+            $this->applyFind('ldap_email_attr', $winner);
+            if($writeLog) {
+                \OCP\Util::writeLog('user_ldap', 'The mail attribute has ' .
+                    'automatically been reset, because the original value ' .
+                    'did not return any results.', \OCP\Util::INFO);
+            }
+        }
+
+        return $this->result;
+    }
+
+    /**
+     * @return WizardResult
+     * @throws \Exception
+     */
+    public function determineAttributes() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapBase',
+                                            'ldapUserFilter',
+                                            ))) {
+            return  false;
+        }
+
+        $attributes = $this->getUserAttributes();
+
+        natcasesort($attributes);
+        $attributes = array_values($attributes);
+
+        $this->result->addOptions('ldap_loginfilter_attributes', $attributes);
+
+        $selected = $this->configuration->ldapLoginFilterAttributes;
+        if(is_array($selected) && !empty($selected)) {
+            $this->result->addChange('ldap_loginfilter_attributes', $selected);
+        }
+
+        return $this->result;
+    }
+
+    /**
+     * detects the available LDAP attributes
+     * @return array|false The instance's WizardResult instance
+     * @throws \Exception
+     */
+    private function getUserAttributes() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapBase',
+                                            'ldapUserFilter',
+                                            ))) {
+            return  false;
+        }
+        $cr = $this->getConnection();
+        if(!$cr) {
+            throw new \Exception('Could not connect to LDAP');
+        }
+
+        $base = $this->configuration->ldapBase[0];
+        $filter = $this->configuration->ldapUserFilter;
+        $rr = $this->ldap->search($cr, $base, $filter, array(), 1, 1);
+        if(!$this->ldap->isResource($rr)) {
+            return false;
+        }
+        $er = $this->ldap->firstEntry($cr, $rr);
+        $attributes = $this->ldap->getAttributes($cr, $er);
+        $pureAttributes = array();
+        for($i = 0; $i < $attributes['count']; $i++) {
+            $pureAttributes[] = $attributes[$i];
+        }
+
+        return $pureAttributes;
+    }
+
+    /**
+     * detects the available LDAP groups
+     * @return WizardResult|false the instance's WizardResult instance
+     */
+    public function determineGroupsForGroups() {
+        return $this->determineGroups('ldap_groupfilter_groups',
+                                        'ldapGroupFilterGroups',
+                                        false);
+    }
+
+    /**
+     * detects the available LDAP groups
+     * @return WizardResult|false the instance's WizardResult instance
+     */
+    public function determineGroupsForUsers() {
+        return $this->determineGroups('ldap_userfilter_groups',
+                                        'ldapUserFilterGroups');
+    }
+
+    /**
+     * detects the available LDAP groups
+     * @param string $dbKey
+     * @param string $confKey
+     * @param bool $testMemberOf
+     * @return WizardResult|false the instance's WizardResult instance
+     * @throws \Exception
+     */
+    private function determineGroups($dbKey, $confKey, $testMemberOf = true) {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapBase',
+                                            ))) {
+            return  false;
+        }
+        $cr = $this->getConnection();
+        if(!$cr) {
+            throw new \Exception('Could not connect to LDAP');
+        }
+
+        $this->fetchGroups($dbKey, $confKey);
+
+        if($testMemberOf) {
+            $this->configuration->hasMemberOfFilterSupport = $this->testMemberOf();
+            $this->result->markChange();
+            if(!$this->configuration->hasMemberOfFilterSupport) {
+                throw new \Exception('memberOf is not supported by the server');
+            }
+        }
+
+        return $this->result;
+    }
+
+    /**
+     * fetches all groups from LDAP and adds them to the result object
+     *
+     * @param string $dbKey
+     * @param string $confKey
+     * @return array $groupEntries
+     * @throws \Exception
+     */
+    public function fetchGroups($dbKey, $confKey) {
+        $obclasses = array('posixGroup', 'group', 'zimbraDistributionList', 'groupOfNames', 'groupOfUniqueNames');
+
+        $filterParts = array();
+        foreach($obclasses as $obclass) {
+            $filterParts[] = 'objectclass='.$obclass;
+        }
+        //we filter for everything
+        //- that looks like a group and
+        //- has the group display name set
+        $filter = $this->access->combineFilterWithOr($filterParts);
+        $filter = $this->access->combineFilterWithAnd(array($filter, 'cn=*'));
+
+        $groupNames = array();
+        $groupEntries = array();
+        $limit = 400;
+        $offset = 0;
+        do {
+            // we need to request dn additionally here, otherwise memberOf
+            // detection will fail later
+            $result = $this->access->searchGroups($filter, array('cn', 'dn'), $limit, $offset);
+            foreach($result as $item) {
+                if(!isset($item['cn']) && !is_array($item['cn']) && !isset($item['cn'][0])) {
+                    // just in case - no issue known
+                    continue;
+                }
+                $groupNames[] = $item['cn'][0];
+                $groupEntries[] = $item;
+            }
+            $offset += $limit;
+        } while ($this->access->hasMoreResults());
+
+        if(count($groupNames) > 0) {
+            natsort($groupNames);
+            $this->result->addOptions($dbKey, array_values($groupNames));
+        } else {
+            throw new \Exception(self::$l->t('Could not find the desired feature'));
+        }
+
+        $setFeatures = $this->configuration->$confKey;
+        if(is_array($setFeatures) && !empty($setFeatures)) {
+            //something is already configured? pre-select it.
+            $this->result->addChange($dbKey, $setFeatures);
+        }
+        return $groupEntries;
+    }
+
+    public function determineGroupMemberAssoc() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapGroupFilter',
+                                            ))) {
+            return  false;
+        }
+        $attribute = $this->detectGroupMemberAssoc();
+        if($attribute === false) {
+            return false;
+        }
+        $this->configuration->setConfiguration(array('ldapGroupMemberAssocAttr' => $attribute));
+        $this->result->addChange('ldap_group_member_assoc_attribute', $attribute);
+
+        return $this->result;
+    }
+
+    /**
+     * Detects the available object classes
+     * @return WizardResult|false the instance's WizardResult instance
+     * @throws \Exception
+     */
+    public function determineGroupObjectClasses() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapBase',
+                                            ))) {
+            return  false;
+        }
+        $cr = $this->getConnection();
+        if(!$cr) {
+            throw new \Exception('Could not connect to LDAP');
+        }
+
+        $obclasses = array('groupOfNames', 'groupOfUniqueNames', 'group', 'posixGroup', '*');
+        $this->determineFeature($obclasses,
+                                'objectclass',
+                                'ldap_groupfilter_objectclass',
+                                'ldapGroupFilterObjectclass',
+                                false);
+
+        return $this->result;
+    }
+
+    /**
+     * detects the available object classes
+     * @return WizardResult
+     * @throws \Exception
+     */
+    public function determineUserObjectClasses() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapBase',
+                                            ))) {
+            return  false;
+        }
+        $cr = $this->getConnection();
+        if(!$cr) {
+            throw new \Exception('Could not connect to LDAP');
+        }
+
+        $obclasses = array('inetOrgPerson', 'person', 'organizationalPerson',
+                            'user', 'posixAccount', '*');
+        $filter = $this->configuration->ldapUserFilter;
+        //if filter is empty, it is probably the first time the wizard is called
+        //then, apply suggestions.
+        $this->determineFeature($obclasses,
+                                'objectclass',
+                                'ldap_userfilter_objectclass',
+                                'ldapUserFilterObjectclass',
+                                empty($filter));
+
+        return $this->result;
+    }
+
+    /**
+     * @return WizardResult|false
+     * @throws \Exception
+     */
+    public function getGroupFilter() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapBase',
+                                            ))) {
+            return false;
+        }
+        //make sure the use display name is set
+        $displayName = $this->configuration->ldapGroupDisplayName;
+        if ($displayName === '') {
+            $d = $this->configuration->getDefaults();
+            $this->applyFind('ldap_group_display_name',
+                                $d['ldap_group_display_name']);
+        }
+        $filter = $this->composeLdapFilter(self::LFILTER_GROUP_LIST);
+
+        $this->applyFind('ldap_group_filter', $filter);
+        return $this->result;
+    }
+
+    /**
+     * @return WizardResult|false
+     * @throws \Exception
+     */
+    public function getUserListFilter() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapBase',
+                                            ))) {
+            return false;
+        }
+        //make sure the use display name is set
+        $displayName = $this->configuration->ldapUserDisplayName;
+        if ($displayName === '') {
+            $d = $this->configuration->getDefaults();
+            $this->applyFind('ldap_display_name', $d['ldap_display_name']);
+        }
+        $filter = $this->composeLdapFilter(self::LFILTER_USER_LIST);
+        if(!$filter) {
+            throw new \Exception('Cannot create filter');
+        }
+
+        $this->applyFind('ldap_userlist_filter', $filter);
+        return $this->result;
+    }
+
+    /**
+     * @return bool|WizardResult
+     * @throws \Exception
+     */
+    public function getUserLoginFilter() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            'ldapBase',
+                                            'ldapUserFilter',
+                                            ))) {
+            return false;
+        }
+
+        $filter = $this->composeLdapFilter(self::LFILTER_LOGIN);
+        if(!$filter) {
+            throw new \Exception('Cannot create filter');
+        }
+
+        $this->applyFind('ldap_login_filter', $filter);
+        return $this->result;
+    }
+
+    /**
+     * @return bool|WizardResult
+     * @param string $loginName
+     * @throws \Exception
+     */
+    public function testLoginName($loginName) {
+        if(!$this->checkRequirements(array('ldapHost',
+            'ldapPort',
+            'ldapBase',
+            'ldapLoginFilter',
+        ))) {
+            return false;
+        }
+
+        $cr = $this->access->connection->getConnectionResource();
+        if(!$this->ldap->isResource($cr)) {
+            throw new \Exception('connection error');
+        }
+
+        if(mb_strpos($this->access->connection->ldapLoginFilter, '%uid', 0, 'UTF-8')
+            === false) {
+            throw new \Exception('missing placeholder');
+        }
+
+        $users = $this->access->countUsersByLoginName($loginName);
+        if($this->ldap->errno($cr) !== 0) {
+            throw new \Exception($this->ldap->error($cr));
+        }
+        $filter = str_replace('%uid', $loginName, $this->access->connection->ldapLoginFilter);
+        $this->result->addChange('ldap_test_loginname', $users);
+        $this->result->addChange('ldap_test_effective_filter', $filter);
+        return $this->result;
+    }
+
+    /**
+     * Tries to determine the port, requires given Host, User DN and Password
+     * @return WizardResult|false WizardResult on success, false otherwise
+     * @throws \Exception
+     */
+    public function guessPortAndTLS() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            ))) {
+            return false;
+        }
+        $this->checkHost();
+        $portSettings = $this->getPortSettingsToTry();
+
+        if(!is_array($portSettings)) {
+            throw new \Exception(print_r($portSettings, true));
+        }
+
+        //proceed from the best configuration and return on first success
+        foreach($portSettings as $setting) {
+            $p = $setting['port'];
+            $t = $setting['tls'];
+            \OCP\Util::writeLog('user_ldap', 'Wiz: trying port '. $p . ', TLS '. $t, \OCP\Util::DEBUG);
+            //connectAndBind may throw Exception, it needs to be catched by the
+            //callee of this method
+
+            try {
+                $settingsFound = $this->connectAndBind($p, $t);
+            } catch (\Exception $e) {
+                // any reply other than -1 (= cannot connect) is already okay,
+                // because then we found the server
+                // unavailable startTLS returns -11
+                if($e->getCode() > 0) {
+                    $settingsFound = true;
+                } else {
+                    throw $e;
+                }
+            }
+
+            if ($settingsFound === true) {
+                $config = array(
+                    'ldapPort' => $p,
+                    'ldapTLS' => (int)$t
+                );
+                $this->configuration->setConfiguration($config);
+                \OCP\Util::writeLog('user_ldap', 'Wiz: detected Port ' . $p, \OCP\Util::DEBUG);
+                $this->result->addChange('ldap_port', $p);
+                return $this->result;
+            }
+        }
+
+        //custom port, undetected (we do not brute force)
+        return false;
+    }
+
+    /**
+     * tries to determine a base dn from User DN or LDAP Host
+     * @return WizardResult|false WizardResult on success, false otherwise
+     */
+    public function guessBaseDN() {
+        if(!$this->checkRequirements(array('ldapHost',
+                                            'ldapPort',
+                                            ))) {
+            return false;
+        }
+
+        //check whether a DN is given in the agent name (99.9% of all cases)
+        $base = null;
+        $i = stripos($this->configuration->ldapAgentName, 'dc=');
+        if($i !== false) {
+            $base = substr($this->configuration->ldapAgentName, $i);
+            if($this->testBaseDN($base)) {
+                $this->applyFind('ldap_base', $base);
+                return $this->result;
+            }
+        }
+
+        //this did not help :(
+        //Let's see whether we can parse the Host URL and convert the domain to
+        //a base DN
+        $helper = new Helper(\OC::$server->getConfig());
+        $domain = $helper->getDomainFromURL($this->configuration->ldapHost);
+        if(!$domain) {
+            return false;
+        }
+
+        $dparts = explode('.', $domain);
+        while(count($dparts) > 0) {
+            $base2 = 'dc=' . implode(',dc=', $dparts);
+            if ($base !== $base2 && $this->testBaseDN($base2)) {
+                $this->applyFind('ldap_base', $base2);
+                return $this->result;
+            }
+            array_shift($dparts);
+        }
+
+        return false;
+    }
+
+    /**
+     * sets the found value for the configuration key in the WizardResult
+     * as well as in the Configuration instance
+     * @param string $key the configuration key
+     * @param string $value the (detected) value
+     *
+     */
+    private function applyFind($key, $value) {
+        $this->result->addChange($key, $value);
+        $this->configuration->setConfiguration(array($key => $value));
+    }
+
+    /**
+     * Checks, whether a port was entered in the Host configuration
+     * field. In this case the port will be stripped off, but also stored as
+     * setting.
+     */
+    private function checkHost() {
+        $host = $this->configuration->ldapHost;
+        $hostInfo = parse_url($host);
+
+        //removes Port from Host
+        if(is_array($hostInfo) && isset($hostInfo['port'])) {
+            $port = $hostInfo['port'];
+            $host = str_replace(':'.$port, '', $host);
+            $this->applyFind('ldap_host', $host);
+            $this->applyFind('ldap_port', $port);
+        }
+    }
+
+    /**
+     * tries to detect the group member association attribute which is
+     * one of 'uniqueMember', 'memberUid', 'member', 'gidNumber'
+     * @return string|false, string with the attribute name, false on error
+     * @throws \Exception
+     */
+    private function detectGroupMemberAssoc() {
+        $possibleAttrs = array('uniqueMember', 'memberUid', 'member', 'gidNumber');
+        $filter = $this->configuration->ldapGroupFilter;
+        if(empty($filter)) {
+            return false;
+        }
+        $cr = $this->getConnection();
+        if(!$cr) {
+            throw new \Exception('Could not connect to LDAP');
+        }
+        $base = $this->configuration->ldapBase[0];
+        $rr = $this->ldap->search($cr, $base, $filter, $possibleAttrs, 0, 1000);
+        if(!$this->ldap->isResource($rr)) {
+            return false;
+        }
+        $er = $this->ldap->firstEntry($cr, $rr);
+        while(is_resource($er)) {
+            $this->ldap->getDN($cr, $er);
+            $attrs = $this->ldap->getAttributes($cr, $er);
+            $result = array();
+            $possibleAttrsCount = count($possibleAttrs);
+            for($i = 0; $i < $possibleAttrsCount; $i++) {
+                if(isset($attrs[$possibleAttrs[$i]])) {
+                    $result[$possibleAttrs[$i]] = $attrs[$possibleAttrs[$i]]['count'];
+                }
+            }
+            if(!empty($result)) {
+                natsort($result);
+                return key($result);
+            }
+
+            $er = $this->ldap->nextEntry($cr, $er);
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether for a given BaseDN results will be returned
+     * @param string $base the BaseDN to test
+     * @return bool true on success, false otherwise
+     * @throws \Exception
+     */
+    private function testBaseDN($base) {
+        $cr = $this->getConnection();
+        if(!$cr) {
+            throw new \Exception('Could not connect to LDAP');
+        }
+
+        //base is there, let's validate it. If we search for anything, we should
+        //get a result set > 0 on a proper base
+        $rr = $this->ldap->search($cr, $base, 'objectClass=*', array('dn'), 0, 1);
+        if(!$this->ldap->isResource($rr)) {
+            $errorNo  = $this->ldap->errno($cr);
+            $errorMsg = $this->ldap->error($cr);
+            \OCP\Util::writeLog('user_ldap', 'Wiz: Could not search base '.$base.
+                            ' Error '.$errorNo.': '.$errorMsg, \OCP\Util::INFO);
+            return false;
+        }
+        $entries = $this->ldap->countEntries($cr, $rr);
+        return ($entries !== false) && ($entries > 0);
+    }
+
+    /**
+     * Checks whether the server supports memberOf in LDAP Filter.
+     * Note: at least in OpenLDAP, availability of memberOf is dependent on
+     * a configured objectClass. I.e. not necessarily for all available groups
+     * memberOf does work.
+     *
+     * @return bool true if it does, false otherwise
+     * @throws \Exception
+     */
+    private function testMemberOf() {
+        $cr = $this->getConnection();
+        if(!$cr) {
+            throw new \Exception('Could not connect to LDAP');
+        }
+        $result = $this->access->countUsers('memberOf=*', array('memberOf'), 1);
+        if(is_int($result) &&  $result > 0) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * creates an LDAP Filter from given configuration
+     * @param integer $filterType int, for which use case the filter shall be created
+     * can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or
+     * self::LFILTER_GROUP_LIST
+     * @return string|false string with the filter on success, false otherwise
+     * @throws \Exception
+     */
+    private function composeLdapFilter($filterType) {
+        $filter = '';
+        $parts = 0;
+        switch ($filterType) {
+            case self::LFILTER_USER_LIST:
+                $objcs = $this->configuration->ldapUserFilterObjectclass;
+                //glue objectclasses
+                if(is_array($objcs) && count($objcs) > 0) {
+                    $filter .= '(|';
+                    foreach($objcs as $objc) {
+                        $filter .= '(objectclass=' . $objc . ')';
+                    }
+                    $filter .= ')';
+                    $parts++;
+                }
+                //glue group memberships
+                if($this->configuration->hasMemberOfFilterSupport) {
+                    $cns = $this->configuration->ldapUserFilterGroups;
+                    if(is_array($cns) && count($cns) > 0) {
+                        $filter .= '(|';
+                        $cr = $this->getConnection();
+                        if(!$cr) {
+                            throw new \Exception('Could not connect to LDAP');
+                        }
+                        $base = $this->configuration->ldapBase[0];
+                        foreach($cns as $cn) {
+                            $rr = $this->ldap->search($cr, $base, 'cn=' . $cn, array('dn', 'primaryGroupToken'));
+                            if(!$this->ldap->isResource($rr)) {
+                                continue;
+                            }
+                            $er = $this->ldap->firstEntry($cr, $rr);
+                            $attrs = $this->ldap->getAttributes($cr, $er);
+                            $dn = $this->ldap->getDN($cr, $er);
+                            if ($dn === false || $dn === '') {
+                                continue;
+                            }
+                            $filterPart = '(memberof=' . $dn . ')';
+                            if(isset($attrs['primaryGroupToken'])) {
+                                $pgt = $attrs['primaryGroupToken'][0];
+                                $primaryFilterPart = '(primaryGroupID=' . $pgt .')';
+                                $filterPart = '(|' . $filterPart . $primaryFilterPart . ')';
+                            }
+                            $filter .= $filterPart;
+                        }
+                        $filter .= ')';
+                    }
+                    $parts++;
+                }
+                //wrap parts in AND condition
+                if($parts > 1) {
+                    $filter = '(&' . $filter . ')';
+                }
+                if ($filter === '') {
+                    $filter = '(objectclass=*)';
+                }
+                break;
+
+            case self::LFILTER_GROUP_LIST:
+                $objcs = $this->configuration->ldapGroupFilterObjectclass;
+                //glue objectclasses
+                if(is_array($objcs) && count($objcs) > 0) {
+                    $filter .= '(|';
+                    foreach($objcs as $objc) {
+                        $filter .= '(objectclass=' . $objc . ')';
+                    }
+                    $filter .= ')';
+                    $parts++;
+                }
+                //glue group memberships
+                $cns = $this->configuration->ldapGroupFilterGroups;
+                if(is_array($cns) && count($cns) > 0) {
+                    $filter .= '(|';
+                    foreach($cns as $cn) {
+                        $filter .= '(cn=' . $cn . ')';
+                    }
+                    $filter .= ')';
+                }
+                $parts++;
+                //wrap parts in AND condition
+                if($parts > 1) {
+                    $filter = '(&' . $filter . ')';
+                }
+                break;
+
+            case self::LFILTER_LOGIN:
+                $ulf = $this->configuration->ldapUserFilter;
+                $loginpart = '=%uid';
+                $filterUsername = '';
+                $userAttributes = $this->getUserAttributes();
+                $userAttributes = array_change_key_case(array_flip($userAttributes));
+                $parts = 0;
+
+                if($this->configuration->ldapLoginFilterUsername === '1') {
+                    $attr = '';
+                    if(isset($userAttributes['uid'])) {
+                        $attr = 'uid';
+                    } else if(isset($userAttributes['samaccountname'])) {
+                        $attr = 'samaccountname';
+                    } else if(isset($userAttributes['cn'])) {
+                        //fallback
+                        $attr = 'cn';
+                    }
+                    if ($attr !== '') {
+                        $filterUsername = '(' . $attr . $loginpart . ')';
+                        $parts++;
+                    }
+                }
+
+                $filterEmail = '';
+                if($this->configuration->ldapLoginFilterEmail === '1') {
+                    $filterEmail = '(|(mailPrimaryAddress=%uid)(mail=%uid))';
+                    $parts++;
+                }
+
+                $filterAttributes = '';
+                $attrsToFilter = $this->configuration->ldapLoginFilterAttributes;
+                if(is_array($attrsToFilter) && count($attrsToFilter) > 0) {
+                    $filterAttributes = '(|';
+                    foreach($attrsToFilter as $attribute) {
+                        $filterAttributes .= '(' . $attribute . $loginpart . ')';
+                    }
+                    $filterAttributes .= ')';
+                    $parts++;
+                }
+
+                $filterLogin = '';
+                if($parts > 1) {
+                    $filterLogin = '(|';
+                }
+                $filterLogin .= $filterUsername;
+                $filterLogin .= $filterEmail;
+                $filterLogin .= $filterAttributes;
+                if($parts > 1) {
+                    $filterLogin .= ')';
+                }
+
+                $filter = '(&'.$ulf.$filterLogin.')';
+                break;
+        }
+
+        \OCP\Util::writeLog('user_ldap', 'Wiz: Final filter '.$filter, \OCP\Util::DEBUG);
+
+        return $filter;
+    }
+
+    /**
+     * Connects and Binds to an LDAP Server
+     *
+     * @param int $port the port to connect with
+     * @param bool $tls whether startTLS is to be used
+     * @return bool
+     * @throws \Exception
+     */
+    private function connectAndBind($port, $tls) {
+        //connect, does not really trigger any server communication
+        $host = $this->configuration->ldapHost;
+        $hostInfo = parse_url($host);
+        if(!$hostInfo) {
+            throw new \Exception(self::$l->t('Invalid Host'));
+        }
+        \OCP\Util::writeLog('user_ldap', 'Wiz: Attempting to connect ', \OCP\Util::DEBUG);
+        $cr = $this->ldap->connect($host, $port);
+        if(!is_resource($cr)) {
+            throw new \Exception(self::$l->t('Invalid Host'));
+        }
+
+        //set LDAP options
+        $this->ldap->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3);
+        $this->ldap->setOption($cr, LDAP_OPT_REFERRALS, 0);
+        $this->ldap->setOption($cr, LDAP_OPT_NETWORK_TIMEOUT, self::LDAP_NW_TIMEOUT);
+
+        try {
+            if($tls) {
+                $isTlsWorking = @$this->ldap->startTls($cr);
+                if(!$isTlsWorking) {
+                    return false;
+                }
+            }
+
+            \OCP\Util::writeLog('user_ldap', 'Wiz: Attemping to Bind ', \OCP\Util::DEBUG);
+            //interesting part: do the bind!
+            $login = $this->ldap->bind($cr,
+                $this->configuration->ldapAgentName,
+                $this->configuration->ldapAgentPassword
+            );
+            $errNo = $this->ldap->errno($cr);
+            $error = ldap_error($cr);
+            $this->ldap->unbind($cr);
+        } catch(ServerNotAvailableException $e) {
+            return false;
+        }
+
+        if($login === true) {
+            $this->ldap->unbind($cr);
+            \OCP\Util::writeLog('user_ldap', 'Wiz: Bind successful to Port '. $port . ' TLS ' . (int)$tls, \OCP\Util::DEBUG);
+            return true;
+        }
+
+        if($errNo === -1) {
+            //host, port or TLS wrong
+            return false;
+        }
+        throw new \Exception($error, $errNo);
+    }
+
+    /**
+     * checks whether a valid combination of agent and password has been
+     * provided (either two values or nothing for anonymous connect)
+     * @return bool, true if everything is fine, false otherwise
+     */
+    private function checkAgentRequirements() {
+        $agent = $this->configuration->ldapAgentName;
+        $pwd = $this->configuration->ldapAgentPassword;
+
+        return
+            ($agent !== '' && $pwd !== '')
+            ||  ($agent === '' && $pwd === '')
+        ;
+    }
+
+    /**
+     * @param array $reqs
+     * @return bool
+     */
+    private function checkRequirements($reqs) {
+        $this->checkAgentRequirements();
+        foreach($reqs as $option) {
+            $value = $this->configuration->$option;
+            if(empty($value)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * does a cumulativeSearch on LDAP to get different values of a
+     * specified attribute
+     * @param string[] $filters array, the filters that shall be used in the search
+     * @param string $attr the attribute of which a list of values shall be returned
+     * @param int $dnReadLimit the amount of how many DNs should be analyzed.
+     * The lower, the faster
+     * @param string $maxF string. if not null, this variable will have the filter that
+     * yields most result entries
+     * @return array|false an array with the values on success, false otherwise
+     */
+    public function cumulativeSearchOnAttribute($filters, $attr, $dnReadLimit = 3, &$maxF = null) {
+        $dnRead = array();
+        $foundItems = array();
+        $maxEntries = 0;
+        if(!is_array($this->configuration->ldapBase)
+           || !isset($this->configuration->ldapBase[0])) {
+            return false;
+        }
+        $base = $this->configuration->ldapBase[0];
+        $cr = $this->getConnection();
+        if(!$this->ldap->isResource($cr)) {
+            return false;
+        }
+        $lastFilter = null;
+        if(isset($filters[count($filters)-1])) {
+            $lastFilter = $filters[count($filters)-1];
+        }
+        foreach($filters as $filter) {
+            if($lastFilter === $filter && count($foundItems) > 0) {
+                //skip when the filter is a wildcard and results were found
+                continue;
+            }
+            // 20k limit for performance and reason
+            $rr = $this->ldap->search($cr, $base, $filter, array($attr), 0, 20000);
+            if(!$this->ldap->isResource($rr)) {
+                continue;
+            }
+            $entries = $this->ldap->countEntries($cr, $rr);
+            $getEntryFunc = 'firstEntry';
+            if(($entries !== false) && ($entries > 0)) {
+                if(!is_null($maxF) && $entries > $maxEntries) {
+                    $maxEntries = $entries;
+                    $maxF = $filter;
+                }
+                $dnReadCount = 0;
+                do {
+                    $entry = $this->ldap->$getEntryFunc($cr, $rr);
+                    $getEntryFunc = 'nextEntry';
+                    if(!$this->ldap->isResource($entry)) {
+                        continue 2;
+                    }
+                    $rr = $entry; //will be expected by nextEntry next round
+                    $attributes = $this->ldap->getAttributes($cr, $entry);
+                    $dn = $this->ldap->getDN($cr, $entry);
+                    if($dn === false || in_array($dn, $dnRead)) {
+                        continue;
+                    }
+                    $newItems = array();
+                    $state = $this->getAttributeValuesFromEntry($attributes,
+                                                                $attr,
+                                                                $newItems);
+                    $dnReadCount++;
+                    $foundItems = array_merge($foundItems, $newItems);
+                    $this->resultCache[$dn][$attr] = $newItems;
+                    $dnRead[] = $dn;
+                } while(($state === self::LRESULT_PROCESSED_SKIP
+                        || $this->ldap->isResource($entry))
+                        && ($dnReadLimit === 0 || $dnReadCount < $dnReadLimit));
+            }
+        }
+
+        return array_unique($foundItems);
+    }
+
+    /**
+     * determines if and which $attr are available on the LDAP server
+     * @param string[] $objectclasses the objectclasses to use as search filter
+     * @param string $attr the attribute to look for
+     * @param string $dbkey the dbkey of the setting the feature is connected to
+     * @param string $confkey the confkey counterpart for the $dbkey as used in the
+     * Configuration class
+     * @param bool $po whether the objectClass with most result entries
+     * shall be pre-selected via the result
+     * @return array|false list of found items.
+     * @throws \Exception
+     */
+    private function determineFeature($objectclasses, $attr, $dbkey, $confkey, $po = false) {
+        $cr = $this->getConnection();
+        if(!$cr) {
+            throw new \Exception('Could not connect to LDAP');
+        }
+        $p = 'objectclass=';
+        foreach($objectclasses as $key => $value) {
+            $objectclasses[$key] = $p.$value;
+        }
+        $maxEntryObjC = '';
+
+        //how deep to dig?
+        //When looking for objectclasses, testing few entries is sufficient,
+        $dig = 3;
+
+        $availableFeatures =
+            $this->cumulativeSearchOnAttribute($objectclasses, $attr,
+                                                $dig, $maxEntryObjC);
+        if(is_array($availableFeatures)
+           && count($availableFeatures) > 0) {
+            natcasesort($availableFeatures);
+            //natcasesort keeps indices, but we must get rid of them for proper
+            //sorting in the web UI. Therefore: array_values
+            $this->result->addOptions($dbkey, array_values($availableFeatures));
+        } else {
+            throw new \Exception(self::$l->t('Could not find the desired feature'));
+        }
+
+        $setFeatures = $this->configuration->$confkey;
+        if(is_array($setFeatures) && !empty($setFeatures)) {
+            //something is already configured? pre-select it.
+            $this->result->addChange($dbkey, $setFeatures);
+        } else if ($po && $maxEntryObjC !== '') {
+            //pre-select objectclass with most result entries
+            $maxEntryObjC = str_replace($p, '', $maxEntryObjC);
+            $this->applyFind($dbkey, $maxEntryObjC);
+            $this->result->addChange($dbkey, $maxEntryObjC);
+        }
+
+        return $availableFeatures;
+    }
+
+    /**
+     * appends a list of values fr
+     * @param resource $result the return value from ldap_get_attributes
+     * @param string $attribute the attribute values to look for
+     * @param array &$known new values will be appended here
+     * @return int, state on of the class constants LRESULT_PROCESSED_OK,
+     * LRESULT_PROCESSED_INVALID or LRESULT_PROCESSED_SKIP
+     */
+    private function getAttributeValuesFromEntry($result, $attribute, &$known) {
+        if(!is_array($result)
+           || !isset($result['count'])
+           || !$result['count'] > 0) {
+            return self::LRESULT_PROCESSED_INVALID;
+        }
+
+        // strtolower on all keys for proper comparison
+        $result = \OCP\Util::mb_array_change_key_case($result);
+        $attribute = strtolower($attribute);
+        if(isset($result[$attribute])) {
+            foreach($result[$attribute] as $key => $val) {
+                if($key === 'count') {
+                    continue;
+                }
+                if(!in_array($val, $known)) {
+                    $known[] = $val;
+                }
+            }
+            return self::LRESULT_PROCESSED_OK;
+        } else {
+            return self::LRESULT_PROCESSED_SKIP;
+        }
+    }
+
+    /**
+     * @return bool|mixed
+     */
+    private function getConnection() {
+        if(!is_null($this->cr)) {
+            return $this->cr;
+        }
+
+        $cr = $this->ldap->connect(
+            $this->configuration->ldapHost,
+            $this->configuration->ldapPort
+        );
+
+        $this->ldap->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3);
+        $this->ldap->setOption($cr, LDAP_OPT_REFERRALS, 0);
+        $this->ldap->setOption($cr, LDAP_OPT_NETWORK_TIMEOUT, self::LDAP_NW_TIMEOUT);
+        if($this->configuration->ldapTLS === 1) {
+            $this->ldap->startTls($cr);
+        }
+
+        $lo = @$this->ldap->bind($cr,
+                                    $this->configuration->ldapAgentName,
+                                    $this->configuration->ldapAgentPassword);
+        if($lo === true) {
+            $this->$cr = $cr;
+            return $cr;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    private function getDefaultLdapPortSettings() {
+        static $settings = array(
+                                array('port' => 7636, 'tls' => false),
+                                array('port' =>  636, 'tls' => false),
+                                array('port' => 7389, 'tls' => true),
+                                array('port' =>  389, 'tls' => true),
+                                array('port' => 7389, 'tls' => false),
+                                array('port' =>  389, 'tls' => false),
+                            );
+        return $settings;
+    }
+
+    /**
+     * @return array
+     */
+    private function getPortSettingsToTry() {
+        //389 ← LDAP / Unencrypted or StartTLS
+        //636 ← LDAPS / SSL
+        //7xxx ← UCS. need to be checked first, because both ports may be open
+        $host = $this->configuration->ldapHost;
+        $port = (int)$this->configuration->ldapPort;
+        $portSettings = array();
+
+        //In case the port is already provided, we will check this first
+        if($port > 0) {
+            $hostInfo = parse_url($host);
+            if(!(is_array($hostInfo)
+                && isset($hostInfo['scheme'])
+                && stripos($hostInfo['scheme'], 'ldaps') !== false)) {
+                $portSettings[] = array('port' => $port, 'tls' => true);
+            }
+            $portSettings[] =array('port' => $port, 'tls' => false);
+        }
+
+        //default ports
+        $portSettings = array_merge($portSettings,
+                                    $this->getDefaultLdapPortSettings());
+
+        return $portSettings;
+    }
 
 
 }

Spacing +156 added lines, -156 removed lines

@@ -71,7 +71,7 @@ 
 	public function __construct(Configuration $configuration, ILDAPWrapper $ldap, Access $access) {
 		parent::__construct($ldap);
 		$this->configuration = $configuration;
-		if(is_null(Wizard::$l)) {
+		if (is_null(Wizard::$l)) {
 			Wizard::$l = \OC::$server->getL10N('user_ldap');
 		}
 		$this->access = $access;
@@ -79,7 +79,7 @@ 
 	}
 
 	public function  __destruct() {
-		if($this->result->hasChanges()) {
+		if ($this->result->hasChanges()) {
 			$this->configuration->saveConfiguration();
 		}
 	}
@@ -94,18 +94,18 @@ 
 	 */
 	public function countEntries(string $filter, string $type): int {
 		$reqs = ['ldapHost', 'ldapPort', 'ldapBase'];
-		if($type === 'users') {
+		if ($type === 'users') {
 			$reqs[] = 'ldapUserFilter';
 		}
-		if(!$this->checkRequirements($reqs)) {
+		if (!$this->checkRequirements($reqs)) {
 			throw new \Exception('Requirements not met', 400);
 		}
 
 		$attr = ['dn']; // default
 		$limit = 1001;
-		if($type === 'groups') {
-			$result =  $this->access->countGroups($filter, $attr, $limit);
-		} else if($type === 'users') {
+		if ($type === 'groups') {
+			$result = $this->access->countGroups($filter, $attr, $limit);
+		} else if ($type === 'users') {
 			$result = $this->access->countUsers($filter, $attr, $limit);
 		} else if ($type === 'objects') {
 			$result = $this->access->countObjects($limit);
@@ -113,7 +113,7 @@ 
 			throw new \Exception('Internal error: Invalid object type', 500);
 		}
 
-		return (int)$result;
+		return (int) $result;
 	}
 
 	/**
@@ -124,16 +124,16 @@ 
 	 * @return string
 	 */
 	private function formatCountResult(int $count): string {
-		if($count > 1000) {
+		if ($count > 1000) {
 			return '> 1000';
 		}
-		return (string)$count;
+		return (string) $count;
 	}
 
 	public function countGroups() {
 		$filter = $this->configuration->ldapGroupFilter;
 
-		if(empty($filter)) {
+		if (empty($filter)) {
 			$output = self::$l->n('%s group found', '%s groups found', 0, array(0));
 			$this->result->addChange('ldap_group_count', $output);
 			return $this->result;
@@ -143,7 +143,7 @@ 
 			$groupsTotal = $this->countEntries($filter, 'groups');
 		} catch (\Exception $e) {
 			//400 can be ignored, 500 is forwarded
-			if($e->getCode() === 500) {
+			if ($e->getCode() === 500) {
 				throw $e;
 			}
 			return false;
@@ -185,7 +185,7 @@ 
 	public function countInBaseDN() {
 		// we don't need to provide a filter in this case
 		$total = $this->countEntries('', 'objects');
-		if($total === false) {
+		if ($total === false) {
 			throw new \Exception('invalid results received');
 		}
 		$this->result->addChange('ldap_test_base', $total);
@@ -199,7 +199,7 @@ 
 	 * @return int|bool
 	 */
 	public function countUsersWithAttribute($attr, $existsCheck = false) {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
 										   'ldapUserFilter',
@@ -209,7 +209,7 @@ 
 
 		$filter = $this->access->combineFilterWithAnd(array(
 			$this->configuration->ldapUserFilter,
-			$attr . '=*'
+			$attr.'=*'
 		));
 
 		$limit = ($existsCheck === false) ? null : 1;
@@ -224,7 +224,7 @@ 
 	 * @throws \Exception
 	 */
 	public function detectUserDisplayNameAttribute() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										'ldapPort',
 										'ldapBase',
 										'ldapUserFilter',
@@ -236,8 +236,8 @@ 
 		if ($attr !== '' && $attr !== 'displayName') {
 			// most likely not the default value with upper case N,
 			// verify it still produces a result
-			$count = (int)$this->countUsersWithAttribute($attr, true);
-			if($count > 0) {
+			$count = (int) $this->countUsersWithAttribute($attr, true);
+			if ($count > 0) {
 				//no change, but we sent it back to make sure the user interface
 				//is still correct, even if the ajax call was cancelled meanwhile
 				$this->result->addChange('ldap_display_name', $attr);
@@ -248,9 +248,9 @@ 
 		// first attribute that has at least one result wins
 		$displayNameAttrs = array('displayname', 'cn');
 		foreach ($displayNameAttrs as $attr) {
-			$count = (int)$this->countUsersWithAttribute($attr, true);
+			$count = (int) $this->countUsersWithAttribute($attr, true);
 
-			if($count > 0) {
+			if ($count > 0) {
 				$this->applyFind('ldap_display_name', $attr);
 				return $this->result;
 			}
@@ -266,7 +266,7 @@ 
 	 * @return WizardResult|bool
 	 */
 	public function detectEmailAttribute() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
 										   'ldapUserFilter',
@@ -276,8 +276,8 @@ 
 
 		$attr = $this->configuration->ldapEmailAttribute;
 		if ($attr !== '') {
-			$count = (int)$this->countUsersWithAttribute($attr, true);
-			if($count > 0) {
+			$count = (int) $this->countUsersWithAttribute($attr, true);
+			if ($count > 0) {
 				return false;
 			}
 			$writeLog = true;
@@ -288,19 +288,19 @@ 
 		$emailAttributes = array('mail', 'mailPrimaryAddress');
 		$winner = '';
 		$maxUsers = 0;
-		foreach($emailAttributes as $attr) {
+		foreach ($emailAttributes as $attr) {
 			$count = $this->countUsersWithAttribute($attr);
-			if($count > $maxUsers) {
+			if ($count > $maxUsers) {
 				$maxUsers = $count;
 				$winner = $attr;
 			}
 		}
 
-		if($winner !== '') {
+		if ($winner !== '') {
 			$this->applyFind('ldap_email_attr', $winner);
-			if($writeLog) {
-				\OCP\Util::writeLog('user_ldap', 'The mail attribute has ' .
-					'automatically been reset, because the original value ' .
+			if ($writeLog) {
+				\OCP\Util::writeLog('user_ldap', 'The mail attribute has '.
+					'automatically been reset, because the original value '.
 					'did not return any results.', \OCP\Util::INFO);
 			}
 		}
@@ -313,7 +313,7 @@ 
 	 * @throws \Exception
 	 */
 	public function determineAttributes() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
 										   'ldapUserFilter',
@@ -329,7 +329,7 @@ 
 		$this->result->addOptions('ldap_loginfilter_attributes', $attributes);
 
 		$selected = $this->configuration->ldapLoginFilterAttributes;
-		if(is_array($selected) && !empty($selected)) {
+		if (is_array($selected) && !empty($selected)) {
 			$this->result->addChange('ldap_loginfilter_attributes', $selected);
 		}
 
@@ -342,7 +342,7 @@ 
 	 * @throws \Exception
 	 */
 	private function getUserAttributes() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
 										   'ldapUserFilter',
@@ -350,20 +350,20 @@ 
 			return  false;
 		}
 		$cr = $this->getConnection();
-		if(!$cr) {
+		if (!$cr) {
 			throw new \Exception('Could not connect to LDAP');
 		}
 
 		$base = $this->configuration->ldapBase[0];
 		$filter = $this->configuration->ldapUserFilter;
 		$rr = $this->ldap->search($cr, $base, $filter, array(), 1, 1);
-		if(!$this->ldap->isResource($rr)) {
+		if (!$this->ldap->isResource($rr)) {
 			return false;
 		}
 		$er = $this->ldap->firstEntry($cr, $rr);
 		$attributes = $this->ldap->getAttributes($cr, $er);
 		$pureAttributes = array();
-		for($i = 0; $i < $attributes['count']; $i++) {
+		for ($i = 0; $i < $attributes['count']; $i++) {
 			$pureAttributes[] = $attributes[$i];
 		}
 
@@ -398,23 +398,23 @@ 
 	 * @throws \Exception
 	 */
 	private function determineGroups($dbKey, $confKey, $testMemberOf = true) {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
 										   ))) {
 			return  false;
 		}
 		$cr = $this->getConnection();
-		if(!$cr) {
+		if (!$cr) {
 			throw new \Exception('Could not connect to LDAP');
 		}
 
 		$this->fetchGroups($dbKey, $confKey);
 
-		if($testMemberOf) {
+		if ($testMemberOf) {
 			$this->configuration->hasMemberOfFilterSupport = $this->testMemberOf();
 			$this->result->markChange();
-			if(!$this->configuration->hasMemberOfFilterSupport) {
+			if (!$this->configuration->hasMemberOfFilterSupport) {
 				throw new \Exception('memberOf is not supported by the server');
 			}
 		}
@@ -434,7 +434,7 @@ 
 		$obclasses = array('posixGroup', 'group', 'zimbraDistributionList', 'groupOfNames', 'groupOfUniqueNames');
 
 		$filterParts = array();
-		foreach($obclasses as $obclass) {
+		foreach ($obclasses as $obclass) {
 			$filterParts[] = 'objectclass='.$obclass;
 		}
 		//we filter for everything
@@ -451,8 +451,8 @@ 
 			// we need to request dn additionally here, otherwise memberOf
 			// detection will fail later
 			$result = $this->access->searchGroups($filter, array('cn', 'dn'), $limit, $offset);
-			foreach($result as $item) {
-				if(!isset($item['cn']) && !is_array($item['cn']) && !isset($item['cn'][0])) {
+			foreach ($result as $item) {
+				if (!isset($item['cn']) && !is_array($item['cn']) && !isset($item['cn'][0])) {
 					// just in case - no issue known
 					continue;
 				}
@@ -462,7 +462,7 @@ 
 			$offset += $limit;
 		} while ($this->access->hasMoreResults());
 
-		if(count($groupNames) > 0) {
+		if (count($groupNames) > 0) {
 			natsort($groupNames);
 			$this->result->addOptions($dbKey, array_values($groupNames));
 		} else {
@@ -470,7 +470,7 @@ 
 		}
 
 		$setFeatures = $this->configuration->$confKey;
-		if(is_array($setFeatures) && !empty($setFeatures)) {
+		if (is_array($setFeatures) && !empty($setFeatures)) {
 			//something is already configured? pre-select it.
 			$this->result->addChange($dbKey, $setFeatures);
 		}
@@ -478,14 +478,14 @@ 
 	}
 
 	public function determineGroupMemberAssoc() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapGroupFilter',
 										   ))) {
 			return  false;
 		}
 		$attribute = $this->detectGroupMemberAssoc();
-		if($attribute === false) {
+		if ($attribute === false) {
 			return false;
 		}
 		$this->configuration->setConfiguration(array('ldapGroupMemberAssocAttr' => $attribute));
@@ -500,14 +500,14 @@ 
 	 * @throws \Exception
 	 */
 	public function determineGroupObjectClasses() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
 										   ))) {
 			return  false;
 		}
 		$cr = $this->getConnection();
-		if(!$cr) {
+		if (!$cr) {
 			throw new \Exception('Could not connect to LDAP');
 		}
 
@@ -527,14 +527,14 @@ 
 	 * @throws \Exception
 	 */
 	public function determineUserObjectClasses() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
 										   ))) {
 			return  false;
 		}
 		$cr = $this->getConnection();
-		if(!$cr) {
+		if (!$cr) {
 			throw new \Exception('Could not connect to LDAP');
 		}
 
@@ -557,7 +557,7 @@ 
 	 * @throws \Exception
 	 */
 	public function getGroupFilter() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
 										   ))) {
@@ -581,7 +581,7 @@ 
 	 * @throws \Exception
 	 */
 	public function getUserListFilter() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
 										   ))) {
@@ -594,7 +594,7 @@ 
 			$this->applyFind('ldap_display_name', $d['ldap_display_name']);
 		}
 		$filter = $this->composeLdapFilter(self::LFILTER_USER_LIST);
-		if(!$filter) {
+		if (!$filter) {
 			throw new \Exception('Cannot create filter');
 		}
 
@@ -607,7 +607,7 @@ 
 	 * @throws \Exception
 	 */
 	public function getUserLoginFilter() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
 										   'ldapUserFilter',
@@ -616,7 +616,7 @@ 
 		}
 
 		$filter = $this->composeLdapFilter(self::LFILTER_LOGIN);
-		if(!$filter) {
+		if (!$filter) {
 			throw new \Exception('Cannot create filter');
 		}
 
@@ -630,7 +630,7 @@ 
 	 * @throws \Exception
 	 */
 	public function testLoginName($loginName) {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 			'ldapPort',
 			'ldapBase',
 			'ldapLoginFilter',
@@ -639,17 +639,17 @@ 
 		}
 
 		$cr = $this->access->connection->getConnectionResource();
-		if(!$this->ldap->isResource($cr)) {
+		if (!$this->ldap->isResource($cr)) {
 			throw new \Exception('connection error');
 		}
 
-		if(mb_strpos($this->access->connection->ldapLoginFilter, '%uid', 0, 'UTF-8')
+		if (mb_strpos($this->access->connection->ldapLoginFilter, '%uid', 0, 'UTF-8')
 			=== false) {
 			throw new \Exception('missing placeholder');
 		}
 
 		$users = $this->access->countUsersByLoginName($loginName);
-		if($this->ldap->errno($cr) !== 0) {
+		if ($this->ldap->errno($cr) !== 0) {
 			throw new \Exception($this->ldap->error($cr));
 		}
 		$filter = str_replace('%uid', $loginName, $this->access->connection->ldapLoginFilter);
@@ -664,22 +664,22 @@ 
 	 * @throws \Exception
 	 */
 	public function guessPortAndTLS() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   ))) {
 			return false;
 		}
 		$this->checkHost();
 		$portSettings = $this->getPortSettingsToTry();
 
-		if(!is_array($portSettings)) {
+		if (!is_array($portSettings)) {
 			throw new \Exception(print_r($portSettings, true));
 		}
 
 		//proceed from the best configuration and return on first success
-		foreach($portSettings as $setting) {
+		foreach ($portSettings as $setting) {
 			$p = $setting['port'];
 			$t = $setting['tls'];
-			\OCP\Util::writeLog('user_ldap', 'Wiz: trying port '. $p . ', TLS '. $t, \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('user_ldap', 'Wiz: trying port '.$p.', TLS '.$t, \OCP\Util::DEBUG);
 			//connectAndBind may throw Exception, it needs to be catched by the
 			//callee of this method
 
@@ -689,7 +689,7 @@ 
 				// any reply other than -1 (= cannot connect) is already okay,
 				// because then we found the server
 				// unavailable startTLS returns -11
-				if($e->getCode() > 0) {
+				if ($e->getCode() > 0) {
 					$settingsFound = true;
 				} else {
 					throw $e;
@@ -699,10 +699,10 @@ 
 			if ($settingsFound === true) {
 				$config = array(
 					'ldapPort' => $p,
-					'ldapTLS' => (int)$t
+					'ldapTLS' => (int) $t
 				);
 				$this->configuration->setConfiguration($config);
-				\OCP\Util::writeLog('user_ldap', 'Wiz: detected Port ' . $p, \OCP\Util::DEBUG);
+				\OCP\Util::writeLog('user_ldap', 'Wiz: detected Port '.$p, \OCP\Util::DEBUG);
 				$this->result->addChange('ldap_port', $p);
 				return $this->result;
 			}
@@ -717,7 +717,7 @@ 
 	 * @return WizardResult|false WizardResult on success, false otherwise
 	 */
 	public function guessBaseDN() {
-		if(!$this->checkRequirements(array('ldapHost',
+		if (!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   ))) {
 			return false;
@@ -726,9 +726,9 @@ 
 		//check whether a DN is given in the agent name (99.9% of all cases)
 		$base = null;
 		$i = stripos($this->configuration->ldapAgentName, 'dc=');
-		if($i !== false) {
+		if ($i !== false) {
 			$base = substr($this->configuration->ldapAgentName, $i);
-			if($this->testBaseDN($base)) {
+			if ($this->testBaseDN($base)) {
 				$this->applyFind('ldap_base', $base);
 				return $this->result;
 			}
@@ -739,13 +739,13 @@ 
 		//a base DN
 		$helper = new Helper(\OC::$server->getConfig());
 		$domain = $helper->getDomainFromURL($this->configuration->ldapHost);
-		if(!$domain) {
+		if (!$domain) {
 			return false;
 		}
 
 		$dparts = explode('.', $domain);
-		while(count($dparts) > 0) {
-			$base2 = 'dc=' . implode(',dc=', $dparts);
+		while (count($dparts) > 0) {
+			$base2 = 'dc='.implode(',dc=', $dparts);
 			if ($base !== $base2 && $this->testBaseDN($base2)) {
 				$this->applyFind('ldap_base', $base2);
 				return $this->result;
@@ -778,7 +778,7 @@ 
 		$hostInfo = parse_url($host);
 
 		//removes Port from Host
-		if(is_array($hostInfo) && isset($hostInfo['port'])) {
+		if (is_array($hostInfo) && isset($hostInfo['port'])) {
 			$port = $hostInfo['port'];
 			$host = str_replace(':'.$port, '', $host);
 			$this->applyFind('ldap_host', $host);
@@ -795,30 +795,30 @@ 
 	private function detectGroupMemberAssoc() {
 		$possibleAttrs = array('uniqueMember', 'memberUid', 'member', 'gidNumber');
 		$filter = $this->configuration->ldapGroupFilter;
-		if(empty($filter)) {
+		if (empty($filter)) {
 			return false;
 		}
 		$cr = $this->getConnection();
-		if(!$cr) {
+		if (!$cr) {
 			throw new \Exception('Could not connect to LDAP');
 		}
 		$base = $this->configuration->ldapBase[0];
 		$rr = $this->ldap->search($cr, $base, $filter, $possibleAttrs, 0, 1000);
-		if(!$this->ldap->isResource($rr)) {
+		if (!$this->ldap->isResource($rr)) {
 			return false;
 		}
 		$er = $this->ldap->firstEntry($cr, $rr);
-		while(is_resource($er)) {
+		while (is_resource($er)) {
 			$this->ldap->getDN($cr, $er);
 			$attrs = $this->ldap->getAttributes($cr, $er);
 			$result = array();
 			$possibleAttrsCount = count($possibleAttrs);
-			for($i = 0; $i < $possibleAttrsCount; $i++) {
-				if(isset($attrs[$possibleAttrs[$i]])) {
+			for ($i = 0; $i < $possibleAttrsCount; $i++) {
+				if (isset($attrs[$possibleAttrs[$i]])) {
 					$result[$possibleAttrs[$i]] = $attrs[$possibleAttrs[$i]]['count'];
 				}
 			}
-			if(!empty($result)) {
+			if (!empty($result)) {
 				natsort($result);
 				return key($result);
 			}
@@ -837,14 +837,14 @@ 
 	 */
 	private function testBaseDN($base) {
 		$cr = $this->getConnection();
-		if(!$cr) {
+		if (!$cr) {
 			throw new \Exception('Could not connect to LDAP');
 		}
 
 		//base is there, let's validate it. If we search for anything, we should
 		//get a result set > 0 on a proper base
 		$rr = $this->ldap->search($cr, $base, 'objectClass=*', array('dn'), 0, 1);
-		if(!$this->ldap->isResource($rr)) {
+		if (!$this->ldap->isResource($rr)) {
 			$errorNo  = $this->ldap->errno($cr);
 			$errorMsg = $this->ldap->error($cr);
 			\OCP\Util::writeLog('user_ldap', 'Wiz: Could not search base '.$base.
@@ -866,11 +866,11 @@ 
 	 */
 	private function testMemberOf() {
 		$cr = $this->getConnection();
-		if(!$cr) {
+		if (!$cr) {
 			throw new \Exception('Could not connect to LDAP');
 		}
 		$result = $this->access->countUsers('memberOf=*', array('memberOf'), 1);
-		if(is_int($result) &&  $result > 0) {
+		if (is_int($result) && $result > 0) {
 			return true;
 		}
 		return false;
@@ -891,27 +891,27 @@ 
 			case self::LFILTER_USER_LIST:
 				$objcs = $this->configuration->ldapUserFilterObjectclass;
 				//glue objectclasses
-				if(is_array($objcs) && count($objcs) > 0) {
+				if (is_array($objcs) && count($objcs) > 0) {
 					$filter .= '(|';
-					foreach($objcs as $objc) {
-						$filter .= '(objectclass=' . $objc . ')';
+					foreach ($objcs as $objc) {
+						$filter .= '(objectclass='.$objc.')';
 					}
 					$filter .= ')';
 					$parts++;
 				}
 				//glue group memberships
-				if($this->configuration->hasMemberOfFilterSupport) {
+				if ($this->configuration->hasMemberOfFilterSupport) {
 					$cns = $this->configuration->ldapUserFilterGroups;
-					if(is_array($cns) && count($cns) > 0) {
+					if (is_array($cns) && count($cns) > 0) {
 						$filter .= '(|';
 						$cr = $this->getConnection();
-						if(!$cr) {
+						if (!$cr) {
 							throw new \Exception('Could not connect to LDAP');
 						}
 						$base = $this->configuration->ldapBase[0];
-						foreach($cns as $cn) {
-							$rr = $this->ldap->search($cr, $base, 'cn=' . $cn, array('dn', 'primaryGroupToken'));
-							if(!$this->ldap->isResource($rr)) {
+						foreach ($cns as $cn) {
+							$rr = $this->ldap->search($cr, $base, 'cn='.$cn, array('dn', 'primaryGroupToken'));
+							if (!$this->ldap->isResource($rr)) {
 								continue;
 							}
 							$er = $this->ldap->firstEntry($cr, $rr);
@@ -920,11 +920,11 @@ 
 							if ($dn === false || $dn === '') {
 								continue;
 							}
-							$filterPart = '(memberof=' . $dn . ')';
-							if(isset($attrs['primaryGroupToken'])) {
+							$filterPart = '(memberof='.$dn.')';
+							if (isset($attrs['primaryGroupToken'])) {
 								$pgt = $attrs['primaryGroupToken'][0];
-								$primaryFilterPart = '(primaryGroupID=' . $pgt .')';
-								$filterPart = '(|' . $filterPart . $primaryFilterPart . ')';
+								$primaryFilterPart = '(primaryGroupID='.$pgt.')';
+								$filterPart = '(|'.$filterPart.$primaryFilterPart.')';
 							}
 							$filter .= $filterPart;
 						}
@@ -933,8 +933,8 @@ 
 					$parts++;
 				}
 				//wrap parts in AND condition
-				if($parts > 1) {
-					$filter = '(&' . $filter . ')';
+				if ($parts > 1) {
+					$filter = '(&'.$filter.')';
 				}
 				if ($filter === '') {
 					$filter = '(objectclass=*)';
@@ -944,27 +944,27 @@ 
 			case self::LFILTER_GROUP_LIST:
 				$objcs = $this->configuration->ldapGroupFilterObjectclass;
 				//glue objectclasses
-				if(is_array($objcs) && count($objcs) > 0) {
+				if (is_array($objcs) && count($objcs) > 0) {
 					$filter .= '(|';
-					foreach($objcs as $objc) {
-						$filter .= '(objectclass=' . $objc . ')';
+					foreach ($objcs as $objc) {
+						$filter .= '(objectclass='.$objc.')';
 					}
 					$filter .= ')';
 					$parts++;
 				}
 				//glue group memberships
 				$cns = $this->configuration->ldapGroupFilterGroups;
-				if(is_array($cns) && count($cns) > 0) {
+				if (is_array($cns) && count($cns) > 0) {
 					$filter .= '(|';
-					foreach($cns as $cn) {
-						$filter .= '(cn=' . $cn . ')';
+					foreach ($cns as $cn) {
+						$filter .= '(cn='.$cn.')';
 					}
 					$filter .= ')';
 				}
 				$parts++;
 				//wrap parts in AND condition
-				if($parts > 1) {
-					$filter = '(&' . $filter . ')';
+				if ($parts > 1) {
+					$filter = '(&'.$filter.')';
 				}
 				break;
 
@@ -976,47 +976,47 @@ 
 				$userAttributes = array_change_key_case(array_flip($userAttributes));
 				$parts = 0;
 
-				if($this->configuration->ldapLoginFilterUsername === '1') {
+				if ($this->configuration->ldapLoginFilterUsername === '1') {
 					$attr = '';
-					if(isset($userAttributes['uid'])) {
+					if (isset($userAttributes['uid'])) {
 						$attr = 'uid';
-					} else if(isset($userAttributes['samaccountname'])) {
+					} else if (isset($userAttributes['samaccountname'])) {
 						$attr = 'samaccountname';
-					} else if(isset($userAttributes['cn'])) {
+					} else if (isset($userAttributes['cn'])) {
 						//fallback
 						$attr = 'cn';
 					}
 					if ($attr !== '') {
-						$filterUsername = '(' . $attr . $loginpart . ')';
+						$filterUsername = '('.$attr.$loginpart.')';
 						$parts++;
 					}
 				}
 
 				$filterEmail = '';
-				if($this->configuration->ldapLoginFilterEmail === '1') {
+				if ($this->configuration->ldapLoginFilterEmail === '1') {
 					$filterEmail = '(|(mailPrimaryAddress=%uid)(mail=%uid))';
 					$parts++;
 				}
 
 				$filterAttributes = '';
 				$attrsToFilter = $this->configuration->ldapLoginFilterAttributes;
-				if(is_array($attrsToFilter) && count($attrsToFilter) > 0) {
+				if (is_array($attrsToFilter) && count($attrsToFilter) > 0) {
 					$filterAttributes = '(|';
-					foreach($attrsToFilter as $attribute) {
-						$filterAttributes .= '(' . $attribute . $loginpart . ')';
+					foreach ($attrsToFilter as $attribute) {
+						$filterAttributes .= '('.$attribute.$loginpart.')';
 					}
 					$filterAttributes .= ')';
 					$parts++;
 				}
 
 				$filterLogin = '';
-				if($parts > 1) {
+				if ($parts > 1) {
 					$filterLogin = '(|';
 				}
 				$filterLogin .= $filterUsername;
 				$filterLogin .= $filterEmail;
 				$filterLogin .= $filterAttributes;
-				if($parts > 1) {
+				if ($parts > 1) {
 					$filterLogin .= ')';
 				}
 
@@ -1041,12 +1041,12 @@ 
 		//connect, does not really trigger any server communication
 		$host = $this->configuration->ldapHost;
 		$hostInfo = parse_url($host);
-		if(!$hostInfo) {
+		if (!$hostInfo) {
 			throw new \Exception(self::$l->t('Invalid Host'));
 		}
 		\OCP\Util::writeLog('user_ldap', 'Wiz: Attempting to connect ', \OCP\Util::DEBUG);
 		$cr = $this->ldap->connect($host, $port);
-		if(!is_resource($cr)) {
+		if (!is_resource($cr)) {
 			throw new \Exception(self::$l->t('Invalid Host'));
 		}
 
@@ -1056,9 +1056,9 @@ 
 		$this->ldap->setOption($cr, LDAP_OPT_NETWORK_TIMEOUT, self::LDAP_NW_TIMEOUT);
 
 		try {
-			if($tls) {
+			if ($tls) {
 				$isTlsWorking = @$this->ldap->startTls($cr);
-				if(!$isTlsWorking) {
+				if (!$isTlsWorking) {
 					return false;
 				}
 			}
@@ -1072,17 +1072,17 @@ 
 			$errNo = $this->ldap->errno($cr);
 			$error = ldap_error($cr);
 			$this->ldap->unbind($cr);
-		} catch(ServerNotAvailableException $e) {
+		} catch (ServerNotAvailableException $e) {
 			return false;
 		}
 
-		if($login === true) {
+		if ($login === true) {
 			$this->ldap->unbind($cr);
-			\OCP\Util::writeLog('user_ldap', 'Wiz: Bind successful to Port '. $port . ' TLS ' . (int)$tls, \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('user_ldap', 'Wiz: Bind successful to Port '.$port.' TLS '.(int) $tls, \OCP\Util::DEBUG);
 			return true;
 		}
 
-		if($errNo === -1) {
+		if ($errNo === -1) {
 			//host, port or TLS wrong
 			return false;
 		}
@@ -1110,9 +1110,9 @@ 
 	 */
 	private function checkRequirements($reqs) {
 		$this->checkAgentRequirements();
-		foreach($reqs as $option) {
+		foreach ($reqs as $option) {
 			$value = $this->configuration->$option;
-			if(empty($value)) {
+			if (empty($value)) {
 				return false;
 			}
 		}
@@ -1134,33 +1134,33 @@ 
 		$dnRead = array();
 		$foundItems = array();
 		$maxEntries = 0;
-		if(!is_array($this->configuration->ldapBase)
+		if (!is_array($this->configuration->ldapBase)
 		   || !isset($this->configuration->ldapBase[0])) {
 			return false;
 		}
 		$base = $this->configuration->ldapBase[0];
 		$cr = $this->getConnection();
-		if(!$this->ldap->isResource($cr)) {
+		if (!$this->ldap->isResource($cr)) {
 			return false;
 		}
 		$lastFilter = null;
-		if(isset($filters[count($filters)-1])) {
-			$lastFilter = $filters[count($filters)-1];
+		if (isset($filters[count($filters) - 1])) {
+			$lastFilter = $filters[count($filters) - 1];
 		}
-		foreach($filters as $filter) {
-			if($lastFilter === $filter && count($foundItems) > 0) {
+		foreach ($filters as $filter) {
+			if ($lastFilter === $filter && count($foundItems) > 0) {
 				//skip when the filter is a wildcard and results were found
 				continue;
 			}
 			// 20k limit for performance and reason
 			$rr = $this->ldap->search($cr, $base, $filter, array($attr), 0, 20000);
-			if(!$this->ldap->isResource($rr)) {
+			if (!$this->ldap->isResource($rr)) {
 				continue;
 			}
 			$entries = $this->ldap->countEntries($cr, $rr);
 			$getEntryFunc = 'firstEntry';
-			if(($entries !== false) && ($entries > 0)) {
-				if(!is_null($maxF) && $entries > $maxEntries) {
+			if (($entries !== false) && ($entries > 0)) {
+				if (!is_null($maxF) && $entries > $maxEntries) {
 					$maxEntries = $entries;
 					$maxF = $filter;
 				}
@@ -1168,13 +1168,13 @@ 
 				do {
 					$entry = $this->ldap->$getEntryFunc($cr, $rr);
 					$getEntryFunc = 'nextEntry';
-					if(!$this->ldap->isResource($entry)) {
+					if (!$this->ldap->isResource($entry)) {
 						continue 2;
 					}
 					$rr = $entry; //will be expected by nextEntry next round
 					$attributes = $this->ldap->getAttributes($cr, $entry);
 					$dn = $this->ldap->getDN($cr, $entry);
-					if($dn === false || in_array($dn, $dnRead)) {
+					if ($dn === false || in_array($dn, $dnRead)) {
 						continue;
 					}
 					$newItems = array();
@@ -1185,7 +1185,7 @@ 
 					$foundItems = array_merge($foundItems, $newItems);
 					$this->resultCache[$dn][$attr] = $newItems;
 					$dnRead[] = $dn;
-				} while(($state === self::LRESULT_PROCESSED_SKIP
+				} while (($state === self::LRESULT_PROCESSED_SKIP
 						|| $this->ldap->isResource($entry))
 						&& ($dnReadLimit === 0 || $dnReadCount < $dnReadLimit));
 			}
@@ -1208,11 +1208,11 @@ 
 	 */
 	private function determineFeature($objectclasses, $attr, $dbkey, $confkey, $po = false) {
 		$cr = $this->getConnection();
-		if(!$cr) {
+		if (!$cr) {
 			throw new \Exception('Could not connect to LDAP');
 		}
 		$p = 'objectclass=';
-		foreach($objectclasses as $key => $value) {
+		foreach ($objectclasses as $key => $value) {
 			$objectclasses[$key] = $p.$value;
 		}
 		$maxEntryObjC = '';
@@ -1224,7 +1224,7 @@ 
 		$availableFeatures =
 			$this->cumulativeSearchOnAttribute($objectclasses, $attr,
 											   $dig, $maxEntryObjC);
-		if(is_array($availableFeatures)
+		if (is_array($availableFeatures)
 		   && count($availableFeatures) > 0) {
 			natcasesort($availableFeatures);
 			//natcasesort keeps indices, but we must get rid of them for proper
@@ -1235,7 +1235,7 @@ 
 		}
 
 		$setFeatures = $this->configuration->$confkey;
-		if(is_array($setFeatures) && !empty($setFeatures)) {
+		if (is_array($setFeatures) && !empty($setFeatures)) {
 			//something is already configured? pre-select it.
 			$this->result->addChange($dbkey, $setFeatures);
 		} else if ($po && $maxEntryObjC !== '') {
@@ -1257,7 +1257,7 @@ 
 	 * LRESULT_PROCESSED_INVALID or LRESULT_PROCESSED_SKIP
 	 */
 	private function getAttributeValuesFromEntry($result, $attribute, &$known) {
-		if(!is_array($result)
+		if (!is_array($result)
 		   || !isset($result['count'])
 		   || !$result['count'] > 0) {
 			return self::LRESULT_PROCESSED_INVALID;
@@ -1266,12 +1266,12 @@ 
 		// strtolower on all keys for proper comparison
 		$result = \OCP\Util::mb_array_change_key_case($result);
 		$attribute = strtolower($attribute);
-		if(isset($result[$attribute])) {
-			foreach($result[$attribute] as $key => $val) {
-				if($key === 'count') {
+		if (isset($result[$attribute])) {
+			foreach ($result[$attribute] as $key => $val) {
+				if ($key === 'count') {
 					continue;
 				}
-				if(!in_array($val, $known)) {
+				if (!in_array($val, $known)) {
 					$known[] = $val;
 				}
 			}
@@ -1285,7 +1285,7 @@ 
 	 * @return bool|mixed
 	 */
 	private function getConnection() {
-		if(!is_null($this->cr)) {
+		if (!is_null($this->cr)) {
 			return $this->cr;
 		}
 
@@ -1297,14 +1297,14 @@ 
 		$this->ldap->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3);
 		$this->ldap->setOption($cr, LDAP_OPT_REFERRALS, 0);
 		$this->ldap->setOption($cr, LDAP_OPT_NETWORK_TIMEOUT, self::LDAP_NW_TIMEOUT);
-		if($this->configuration->ldapTLS === 1) {
+		if ($this->configuration->ldapTLS === 1) {
 			$this->ldap->startTls($cr);
 		}
 
 		$lo = @$this->ldap->bind($cr,
 								 $this->configuration->ldapAgentName,
 								 $this->configuration->ldapAgentPassword);
-		if($lo === true) {
+		if ($lo === true) {
 			$this->$cr = $cr;
 			return $cr;
 		}
@@ -1335,18 +1335,18 @@ 
 		//636 ← LDAPS / SSL
 		//7xxx ← UCS. need to be checked first, because both ports may be open
 		$host = $this->configuration->ldapHost;
-		$port = (int)$this->configuration->ldapPort;
+		$port = (int) $this->configuration->ldapPort;
 		$portSettings = array();
 
 		//In case the port is already provided, we will check this first
-		if($port > 0) {
+		if ($port > 0) {
 			$hostInfo = parse_url($host);
-			if(!(is_array($hostInfo)
+			if (!(is_array($hostInfo)
 				&& isset($hostInfo['scheme'])
 				&& stripos($hostInfo['scheme'], 'ldaps') !== false)) {
 				$portSettings[] = array('port' => $port, 'tls' => true);
 			}
-			$portSettings[] =array('port' => $port, 'tls' => false);
+			$portSettings[] = array('port' => $port, 'tls' => false);
 		}
 
 		//default ports

apps/files_sharing/lib/SharedMount.php

Doc Comments +2 added lines, -2 removed lines

@@ -110,7 +110,7 @@ 
 	 *
 	 * @param string $newPath
 	 * @param \OCP\Share\IShare $share
-	 * @return bool
+	 * @return boolean|null
 	 */
 	private function updateFileTarget($newPath, &$share) {
 		$share->setTarget($newPath);
@@ -126,7 +126,7 @@ 
 	 * @param string $path
 	 * @param View $view
 	 * @param SharedMount[] $mountpoints
-	 * @return mixed
+	 * @return string
 	 */
 	private function generateUniqueTarget($path, $view, array $mountpoints) {
 		$pathinfo = pathinfo($path);

Indentation +226 added lines, -226 removed lines

@@ -37,230 +37,230 @@
  * Shared mount points can be moved by the user
  */
 class SharedMount extends MountPoint implements MoveableMount {
-	/**
-	 * @var \OCA\Files_Sharing\SharedStorage $storage
-	 */
-	protected $storage = null;
-
-	/**
-	 * @var \OC\Files\View
-	 */
-	private $recipientView;
-
-	/**
-	 * @var string
-	 */
-	private $user;
-
-	/** @var \OCP\Share\IShare */
-	private $superShare;
-
-	/** @var \OCP\Share\IShare[] */
-	private $groupedShares;
-
-	/**
-	 * @param string $storage
-	 * @param SharedMount[] $mountpoints
-	 * @param array|null $arguments
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 */
-	public function __construct($storage, array $mountpoints, $arguments = null, $loader = null) {
-		$this->user = $arguments['user'];
-		$this->recipientView = new View('/' . $this->user . '/files');
-
-		$this->superShare = $arguments['superShare'];
-		$this->groupedShares = $arguments['groupedShares'];
-
-		$newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints);
-		$absMountPoint = '/' . $this->user . '/files' . $newMountPoint;
-		$arguments['ownerView'] = new View('/' . $this->superShare->getShareOwner() . '/files');
-		parent::__construct($storage, $absMountPoint, $arguments, $loader);
-	}
-
-	/**
-	 * check if the parent folder exists otherwise move the mount point up
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param SharedMount[] $mountpoints
-	 * @return string
-	 */
-	private function verifyMountPoint(\OCP\Share\IShare $share, array $mountpoints) {
-
-		$mountPoint = basename($share->getTarget());
-		$parent = dirname($share->getTarget());
-
-		if (!$this->recipientView->is_dir($parent)) {
-			$parent = Helper::getShareFolder($this->recipientView);
-		}
-
-		$newMountPoint = $this->generateUniqueTarget(
-			\OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
-			$this->recipientView,
-			$mountpoints
-		);
-
-		if ($newMountPoint !== $share->getTarget()) {
-			$this->updateFileTarget($newMountPoint, $share);
-		}
-
-		return $newMountPoint;
-	}
-
-	/**
-	 * update fileTarget in the database if the mount point changed
-	 *
-	 * @param string $newPath
-	 * @param \OCP\Share\IShare $share
-	 * @return bool
-	 */
-	private function updateFileTarget($newPath, &$share) {
-		$share->setTarget($newPath);
-
-		foreach ($this->groupedShares as $tmpShare) {
-			$tmpShare->setTarget($newPath);
-			\OC::$server->getShareManager()->moveShare($tmpShare, $this->user);
-		}
-	}
-
-
-	/**
-	 * @param string $path
-	 * @param View $view
-	 * @param SharedMount[] $mountpoints
-	 * @return mixed
-	 */
-	private function generateUniqueTarget($path, $view, array $mountpoints) {
-		$pathinfo = pathinfo($path);
-		$ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
-		$name = $pathinfo['filename'];
-		$dir = $pathinfo['dirname'];
-
-		// Helper function to find existing mount points
-		$mountpointExists = function ($path) use ($mountpoints) {
-			foreach ($mountpoints as $mountpoint) {
-				if ($mountpoint->getShare()->getTarget() === $path) {
-					return true;
-				}
-			}
-			return false;
-		};
-
-		$i = 2;
-		while ($view->file_exists($path) || $mountpointExists($path)) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
-			$i++;
-		}
-
-		return $path;
-	}
-
-	/**
-	 * 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'
-	 * @throws \OCA\Files_Sharing\Exceptions\BrokenPath
-	 */
-	protected 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') {
-			\OCP\Util::writeLog('file sharing',
-				'Can not strip userid and "files/" from path: ' . $path,
-				\OCP\Util::ERROR);
-			throw new \OCA\Files_Sharing\Exceptions\BrokenPath('Path does not start with /user/files', 10);
-		}
-
-		// skip 'user' and 'files'
-		$sliced = array_slice($split, 2);
-		$relPath = implode('/', $sliced);
-
-		return '/' . $relPath;
-	}
-
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target) {
-
-		$relTargetPath = $this->stripUserFilesPath($target);
-		$share = $this->storage->getShare();
-
-		$result = true;
-
-		try {
-			$this->updateFileTarget($relTargetPath, $share);
-			$this->setMountPoint($target);
-			$this->storage->setMountPoint($relTargetPath);
-		} catch (\Exception $e) {
-			\OCP\Util::writeLog('file sharing',
-				'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"',
-				\OCP\Util::ERROR);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Remove the mount points
-	 *
-	 * @return bool
-	 */
-	public function removeMount() {
-		$mountManager = \OC\Files\Filesystem::getMountManager();
-		/** @var $storage \OCA\Files_Sharing\SharedStorage */
-		$storage = $this->getStorage();
-		$result = $storage->unshareStorage();
-		$mountManager->removeMount($this->mountPoint);
-
-		return $result;
-	}
-
-	/**
-	 * @return \OCP\Share\IShare
-	 */
-	public function getShare() {
-		return $this->superShare;
-	}
-
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 */
-	public function getStorageRootId() {
-		return $this->getShare()->getNodeId();
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getNumericStorageId() {
-		if (!is_null($this->getShare()->getNodeCacheEntry())) {
-			return $this->getShare()->getNodeCacheEntry()->getStorageId();
-		} else {
-			$builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-
-			$query = $builder->select('storage')
-				->from('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
-
-			$result = $query->execute();
-			$row = $result->fetch();
-			$result->closeCursor();
-			if ($row) {
-				return (int)$row['storage'];
-			}
-			return -1;
-		}
-	}
-
-	public function getMountType() {
-		return 'shared';
-	}
+    /**
+     * @var \OCA\Files_Sharing\SharedStorage $storage
+     */
+    protected $storage = null;
+
+    /**
+     * @var \OC\Files\View
+     */
+    private $recipientView;
+
+    /**
+     * @var string
+     */
+    private $user;
+
+    /** @var \OCP\Share\IShare */
+    private $superShare;
+
+    /** @var \OCP\Share\IShare[] */
+    private $groupedShares;
+
+    /**
+     * @param string $storage
+     * @param SharedMount[] $mountpoints
+     * @param array|null $arguments
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     */
+    public function __construct($storage, array $mountpoints, $arguments = null, $loader = null) {
+        $this->user = $arguments['user'];
+        $this->recipientView = new View('/' . $this->user . '/files');
+
+        $this->superShare = $arguments['superShare'];
+        $this->groupedShares = $arguments['groupedShares'];
+
+        $newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints);
+        $absMountPoint = '/' . $this->user . '/files' . $newMountPoint;
+        $arguments['ownerView'] = new View('/' . $this->superShare->getShareOwner() . '/files');
+        parent::__construct($storage, $absMountPoint, $arguments, $loader);
+    }
+
+    /**
+     * check if the parent folder exists otherwise move the mount point up
+     *
+     * @param \OCP\Share\IShare $share
+     * @param SharedMount[] $mountpoints
+     * @return string
+     */
+    private function verifyMountPoint(\OCP\Share\IShare $share, array $mountpoints) {
+
+        $mountPoint = basename($share->getTarget());
+        $parent = dirname($share->getTarget());
+
+        if (!$this->recipientView->is_dir($parent)) {
+            $parent = Helper::getShareFolder($this->recipientView);
+        }
+
+        $newMountPoint = $this->generateUniqueTarget(
+            \OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
+            $this->recipientView,
+            $mountpoints
+        );
+
+        if ($newMountPoint !== $share->getTarget()) {
+            $this->updateFileTarget($newMountPoint, $share);
+        }
+
+        return $newMountPoint;
+    }
+
+    /**
+     * update fileTarget in the database if the mount point changed
+     *
+     * @param string $newPath
+     * @param \OCP\Share\IShare $share
+     * @return bool
+     */
+    private function updateFileTarget($newPath, &$share) {
+        $share->setTarget($newPath);
+
+        foreach ($this->groupedShares as $tmpShare) {
+            $tmpShare->setTarget($newPath);
+            \OC::$server->getShareManager()->moveShare($tmpShare, $this->user);
+        }
+    }
+
+
+    /**
+     * @param string $path
+     * @param View $view
+     * @param SharedMount[] $mountpoints
+     * @return mixed
+     */
+    private function generateUniqueTarget($path, $view, array $mountpoints) {
+        $pathinfo = pathinfo($path);
+        $ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
+        $name = $pathinfo['filename'];
+        $dir = $pathinfo['dirname'];
+
+        // Helper function to find existing mount points
+        $mountpointExists = function ($path) use ($mountpoints) {
+            foreach ($mountpoints as $mountpoint) {
+                if ($mountpoint->getShare()->getTarget() === $path) {
+                    return true;
+                }
+            }
+            return false;
+        };
+
+        $i = 2;
+        while ($view->file_exists($path) || $mountpointExists($path)) {
+            $path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
+            $i++;
+        }
+
+        return $path;
+    }
+
+    /**
+     * 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'
+     * @throws \OCA\Files_Sharing\Exceptions\BrokenPath
+     */
+    protected 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') {
+            \OCP\Util::writeLog('file sharing',
+                'Can not strip userid and "files/" from path: ' . $path,
+                \OCP\Util::ERROR);
+            throw new \OCA\Files_Sharing\Exceptions\BrokenPath('Path does not start with /user/files', 10);
+        }
+
+        // skip 'user' and 'files'
+        $sliced = array_slice($split, 2);
+        $relPath = implode('/', $sliced);
+
+        return '/' . $relPath;
+    }
+
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target) {
+
+        $relTargetPath = $this->stripUserFilesPath($target);
+        $share = $this->storage->getShare();
+
+        $result = true;
+
+        try {
+            $this->updateFileTarget($relTargetPath, $share);
+            $this->setMountPoint($target);
+            $this->storage->setMountPoint($relTargetPath);
+        } catch (\Exception $e) {
+            \OCP\Util::writeLog('file sharing',
+                'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"',
+                \OCP\Util::ERROR);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove the mount points
+     *
+     * @return bool
+     */
+    public function removeMount() {
+        $mountManager = \OC\Files\Filesystem::getMountManager();
+        /** @var $storage \OCA\Files_Sharing\SharedStorage */
+        $storage = $this->getStorage();
+        $result = $storage->unshareStorage();
+        $mountManager->removeMount($this->mountPoint);
+
+        return $result;
+    }
+
+    /**
+     * @return \OCP\Share\IShare
+     */
+    public function getShare() {
+        return $this->superShare;
+    }
+
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     */
+    public function getStorageRootId() {
+        return $this->getShare()->getNodeId();
+    }
+
+    /**
+     * @return int
+     */
+    public function getNumericStorageId() {
+        if (!is_null($this->getShare()->getNodeCacheEntry())) {
+            return $this->getShare()->getNodeCacheEntry()->getStorageId();
+        } else {
+            $builder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+
+            $query = $builder->select('storage')
+                ->from('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
+
+            $result = $query->execute();
+            $row = $result->fetch();
+            $result->closeCursor();
+            if ($row) {
+                return (int)$row['storage'];
+            }
+            return -1;
+        }
+    }
+
+    public function getMountType() {
+        return 'shared';
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -66,14 +66,14 @@ 
 	 */
 	public function __construct($storage, array $mountpoints, $arguments = null, $loader = null) {
 		$this->user = $arguments['user'];
-		$this->recipientView = new View('/' . $this->user . '/files');
+		$this->recipientView = new View('/'.$this->user.'/files');
 
 		$this->superShare = $arguments['superShare'];
 		$this->groupedShares = $arguments['groupedShares'];
 
 		$newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints);
-		$absMountPoint = '/' . $this->user . '/files' . $newMountPoint;
-		$arguments['ownerView'] = new View('/' . $this->superShare->getShareOwner() . '/files');
+		$absMountPoint = '/'.$this->user.'/files'.$newMountPoint;
+		$arguments['ownerView'] = new View('/'.$this->superShare->getShareOwner().'/files');
 		parent::__construct($storage, $absMountPoint, $arguments, $loader);
 	}
 
@@ -94,7 +94,7 @@ 
 		}
 
 		$newMountPoint = $this->generateUniqueTarget(
-			\OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
+			\OC\Files\Filesystem::normalizePath($parent.'/'.$mountPoint),
 			$this->recipientView,
 			$mountpoints
 		);
@@ -131,12 +131,12 @@ 
 	 */
 	private function generateUniqueTarget($path, $view, array $mountpoints) {
 		$pathinfo = pathinfo($path);
-		$ext = isset($pathinfo['extension']) ? '.' . $pathinfo['extension'] : '';
+		$ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : '';
 		$name = $pathinfo['filename'];
 		$dir = $pathinfo['dirname'];
 
 		// Helper function to find existing mount points
-		$mountpointExists = function ($path) use ($mountpoints) {
+		$mountpointExists = function($path) use ($mountpoints) {
 			foreach ($mountpoints as $mountpoint) {
 				if ($mountpoint->getShare()->getTarget() === $path) {
 					return true;
@@ -147,7 +147,7 @@ 
 
 		$i = 2;
 		while ($view->file_exists($path) || $mountpointExists($path)) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext);
+			$path = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext);
 			$i++;
 		}
 
@@ -168,7 +168,7 @@ 
 		// it is not a file relative to data/user/files
 		if (count($split) < 3 || $split[1] !== 'files') {
 			\OCP\Util::writeLog('file sharing',
-				'Can not strip userid and "files/" from path: ' . $path,
+				'Can not strip userid and "files/" from path: '.$path,
 				\OCP\Util::ERROR);
 			throw new \OCA\Files_Sharing\Exceptions\BrokenPath('Path does not start with /user/files', 10);
 		}
@@ -177,7 +177,7 @@ 
 		$sliced = array_slice($split, 2);
 		$relPath = implode('/', $sliced);
 
-		return '/' . $relPath;
+		return '/'.$relPath;
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 			$this->storage->setMountPoint($relTargetPath);
 		} catch (\Exception $e) {
 			\OCP\Util::writeLog('file sharing',
-				'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"',
+				'Could not rename mount point for shared folder "'.$this->getMountPoint().'" to "'.$target.'"',
 				\OCP\Util::ERROR);
 		}
 
@@ -254,7 +254,7 @@ 
 			$row = $result->fetch();
 			$result->closeCursor();
 			if ($row) {
-				return (int)$row['storage'];
+				return (int) $row['storage'];
 			}
 			return -1;
 		}

lib/private/Cache/File.php

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 	 * @param string $key
 	 * @param mixed $value
 	 * @param int $ttl
-	 * @return bool|mixed
+	 * @return boolean
 	 * @throws \OC\ForbiddenException
 	 */
 	public function set($key, $value, $ttl = 0) {

Spacing +11 added lines, -11 removed lines

@@ -51,10 +51,10 @@ 
 			$rootView = new View();
 			$user = \OC::$server->getUserSession()->getUser();
 			Filesystem::initMountPoints($user->getUID());
-			if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
-				$rootView->mkdir('/' . $user->getUID() . '/cache');
+			if (!$rootView->file_exists('/'.$user->getUID().'/cache')) {
+				$rootView->mkdir('/'.$user->getUID().'/cache');
 			}
-			$this->storage = new View('/' . $user->getUID() . '/cache');
+			$this->storage = new View('/'.$user->getUID().'/cache');
 			return $this->storage;
 		} else {
 			\OCP\Util::writeLog('core', 'Can\'t get cache storage, user not logged in', \OCP\Util::ERROR);
@@ -104,12 +104,12 @@ 
 		// unique id to avoid chunk collision, just in case
 		$uniqueId = \OC::$server->getSecureRandom()->generate(
 			16,
-			ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER
+			ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER
 		);
 
 		// use part file to prevent hasKey() to find the key
 		// while it is being written
-		$keyPart = $key . '.' . $uniqueId . '.part';
+		$keyPart = $key.'.'.$uniqueId.'.part';
 		if ($storage and $storage->file_put_contents($keyPart, $value)) {
 			if ($ttl === 0) {
 				$ttl = 86400; // 60*60*24
@@ -158,7 +158,7 @@ 
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
 					if ($file != '.' and $file != '..' and ($prefix === '' || strpos($file, $prefix) === 0)) {
-						$storage->unlink('/' . $file);
+						$storage->unlink('/'.$file);
 					}
 				}
 			}
@@ -183,17 +183,17 @@ 
 			while (($file = readdir($dh)) !== false) {
 				if ($file != '.' and $file != '..') {
 					try {
-						$mtime = $storage->filemtime('/' . $file);
+						$mtime = $storage->filemtime('/'.$file);
 						if ($mtime < $now) {
-							$storage->unlink('/' . $file);
+							$storage->unlink('/'.$file);
 						}
 					} catch (\OCP\Lock\LockedException $e) {
 						// ignore locked chunks
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', array('app' => 'core'));
+						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', array('app' => 'core'));
 					} catch (\OCP\Files\ForbiddenException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', array('app' => 'core'));
+						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "'.$file.'"', array('app' => 'core'));
 					} catch (\OCP\Files\LockNotAcquiredException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', array('app' => 'core'));
+						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "'.$file.'"', array('app' => 'core'));
 					}
 				}
 			}

Indentation +157 added lines, -157 removed lines

@@ -33,170 +33,170 @@
 
 class File implements ICache {
 
-	/** @var View */
-	protected $storage;
+    /** @var View */
+    protected $storage;
 
-	/**
-	 * Returns the cache storage for the logged in user
-	 *
-	 * @return \OC\Files\View cache storage
-	 * @throws \OC\ForbiddenException
-	 * @throws \OC\User\NoUserException
-	 */
-	protected function getStorage() {
-		if (isset($this->storage)) {
-			return $this->storage;
-		}
-		if (\OC::$server->getUserSession()->isLoggedIn()) {
-			$rootView = new View();
-			$user = \OC::$server->getUserSession()->getUser();
-			Filesystem::initMountPoints($user->getUID());
-			if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
-				$rootView->mkdir('/' . $user->getUID() . '/cache');
-			}
-			$this->storage = new View('/' . $user->getUID() . '/cache');
-			return $this->storage;
-		} else {
-			\OCP\Util::writeLog('core', 'Can\'t get cache storage, user not logged in', \OCP\Util::ERROR);
-			throw new \OC\ForbiddenException('Can\t get cache storage, user not logged in');
-		}
-	}
+    /**
+     * Returns the cache storage for the logged in user
+     *
+     * @return \OC\Files\View cache storage
+     * @throws \OC\ForbiddenException
+     * @throws \OC\User\NoUserException
+     */
+    protected function getStorage() {
+        if (isset($this->storage)) {
+            return $this->storage;
+        }
+        if (\OC::$server->getUserSession()->isLoggedIn()) {
+            $rootView = new View();
+            $user = \OC::$server->getUserSession()->getUser();
+            Filesystem::initMountPoints($user->getUID());
+            if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
+                $rootView->mkdir('/' . $user->getUID() . '/cache');
+            }
+            $this->storage = new View('/' . $user->getUID() . '/cache');
+            return $this->storage;
+        } else {
+            \OCP\Util::writeLog('core', 'Can\'t get cache storage, user not logged in', \OCP\Util::ERROR);
+            throw new \OC\ForbiddenException('Can\t get cache storage, user not logged in');
+        }
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed|null
-	 * @throws \OC\ForbiddenException
-	 */
-	public function get($key) {
-		$result = null;
-		if ($this->hasKey($key)) {
-			$storage = $this->getStorage();
-			$result = $storage->file_get_contents($key);
-		}
-		return $result;
-	}
+    /**
+     * @param string $key
+     * @return mixed|null
+     * @throws \OC\ForbiddenException
+     */
+    public function get($key) {
+        $result = null;
+        if ($this->hasKey($key)) {
+            $storage = $this->getStorage();
+            $result = $storage->file_get_contents($key);
+        }
+        return $result;
+    }
 
-	/**
-	 * Returns the size of the stored/cached data
-	 *
-	 * @param string $key
-	 * @return int
-	 */
-	public function size($key) {
-		$result = 0;
-		if ($this->hasKey($key)) {
-			$storage = $this->getStorage();
-			$result = $storage->filesize($key);
-		}
-		return $result;
-	}
+    /**
+     * Returns the size of the stored/cached data
+     *
+     * @param string $key
+     * @return int
+     */
+    public function size($key) {
+        $result = 0;
+        if ($this->hasKey($key)) {
+            $storage = $this->getStorage();
+            $result = $storage->filesize($key);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl
-	 * @return bool|mixed
-	 * @throws \OC\ForbiddenException
-	 */
-	public function set($key, $value, $ttl = 0) {
-		$storage = $this->getStorage();
-		$result = false;
-		// unique id to avoid chunk collision, just in case
-		$uniqueId = \OC::$server->getSecureRandom()->generate(
-			16,
-			ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER
-		);
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl
+     * @return bool|mixed
+     * @throws \OC\ForbiddenException
+     */
+    public function set($key, $value, $ttl = 0) {
+        $storage = $this->getStorage();
+        $result = false;
+        // unique id to avoid chunk collision, just in case
+        $uniqueId = \OC::$server->getSecureRandom()->generate(
+            16,
+            ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER
+        );
 
-		// use part file to prevent hasKey() to find the key
-		// while it is being written
-		$keyPart = $key . '.' . $uniqueId . '.part';
-		if ($storage and $storage->file_put_contents($keyPart, $value)) {
-			if ($ttl === 0) {
-				$ttl = 86400; // 60*60*24
-			}
-			$result = $storage->touch($keyPart, time() + $ttl);
-			$result &= $storage->rename($keyPart, $key);
-		}
-		return $result;
-	}
+        // use part file to prevent hasKey() to find the key
+        // while it is being written
+        $keyPart = $key . '.' . $uniqueId . '.part';
+        if ($storage and $storage->file_put_contents($keyPart, $value)) {
+            if ($ttl === 0) {
+                $ttl = 86400; // 60*60*24
+            }
+            $result = $storage->touch($keyPart, time() + $ttl);
+            $result &= $storage->rename($keyPart, $key);
+        }
+        return $result;
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool
-	 * @throws \OC\ForbiddenException
-	 */
-	public function hasKey($key) {
-		$storage = $this->getStorage();
-		if ($storage && $storage->is_file($key) && $storage->isReadable($key)) {
-			return true;
-		}
-		return false;
-	}
+    /**
+     * @param string $key
+     * @return bool
+     * @throws \OC\ForbiddenException
+     */
+    public function hasKey($key) {
+        $storage = $this->getStorage();
+        if ($storage && $storage->is_file($key) && $storage->isReadable($key)) {
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool|mixed
-	 * @throws \OC\ForbiddenException
-	 */
-	public function remove($key) {
-		$storage = $this->getStorage();
-		if (!$storage) {
-			return false;
-		}
-		return $storage->unlink($key);
-	}
+    /**
+     * @param string $key
+     * @return bool|mixed
+     * @throws \OC\ForbiddenException
+     */
+    public function remove($key) {
+        $storage = $this->getStorage();
+        if (!$storage) {
+            return false;
+        }
+        return $storage->unlink($key);
+    }
 
-	/**
-	 * @param string $prefix
-	 * @return bool
-	 * @throws \OC\ForbiddenException
-	 */
-	public function clear($prefix = '') {
-		$storage = $this->getStorage();
-		if ($storage and $storage->is_dir('/')) {
-			$dh = $storage->opendir('/');
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if ($file != '.' and $file != '..' and ($prefix === '' || strpos($file, $prefix) === 0)) {
-						$storage->unlink('/' . $file);
-					}
-				}
-			}
-		}
-		return true;
-	}
+    /**
+     * @param string $prefix
+     * @return bool
+     * @throws \OC\ForbiddenException
+     */
+    public function clear($prefix = '') {
+        $storage = $this->getStorage();
+        if ($storage and $storage->is_dir('/')) {
+            $dh = $storage->opendir('/');
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if ($file != '.' and $file != '..' and ($prefix === '' || strpos($file, $prefix) === 0)) {
+                        $storage->unlink('/' . $file);
+                    }
+                }
+            }
+        }
+        return true;
+    }
 
-	/**
-	 * Runs GC
-	 * @throws \OC\ForbiddenException
-	 */
-	public function gc() {
-		$storage = $this->getStorage();
-		if ($storage and $storage->is_dir('/')) {
-			// extra hour safety, in case of stray part chunks that take longer to write,
-			// because touch() is only called after the chunk was finished
-			$now = time() - 3600;
-			$dh = $storage->opendir('/');
-			if (!is_resource($dh)) {
-				return null;
-			}
-			while (($file = readdir($dh)) !== false) {
-				if ($file != '.' and $file != '..') {
-					try {
-						$mtime = $storage->filemtime('/' . $file);
-						if ($mtime < $now) {
-							$storage->unlink('/' . $file);
-						}
-					} catch (\OCP\Lock\LockedException $e) {
-						// ignore locked chunks
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', array('app' => 'core'));
-					} catch (\OCP\Files\ForbiddenException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', array('app' => 'core'));
-					} catch (\OCP\Files\LockNotAcquiredException $e) {
-						\OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', array('app' => 'core'));
-					}
-				}
-			}
-		}
-	}
+    /**
+     * Runs GC
+     * @throws \OC\ForbiddenException
+     */
+    public function gc() {
+        $storage = $this->getStorage();
+        if ($storage and $storage->is_dir('/')) {
+            // extra hour safety, in case of stray part chunks that take longer to write,
+            // because touch() is only called after the chunk was finished
+            $now = time() - 3600;
+            $dh = $storage->opendir('/');
+            if (!is_resource($dh)) {
+                return null;
+            }
+            while (($file = readdir($dh)) !== false) {
+                if ($file != '.' and $file != '..') {
+                    try {
+                        $mtime = $storage->filemtime('/' . $file);
+                        if ($mtime < $now) {
+                            $storage->unlink('/' . $file);
+                        }
+                    } catch (\OCP\Lock\LockedException $e) {
+                        // ignore locked chunks
+                        \OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', array('app' => 'core'));
+                    } catch (\OCP\Files\ForbiddenException $e) {
+                        \OC::$server->getLogger()->debug('Could not cleanup forbidden chunk "' . $file . '"', array('app' => 'core'));
+                    } catch (\OCP\Files\LockNotAcquiredException $e) {
+                        \OC::$server->getLogger()->debug('Could not cleanup locked chunk "' . $file . '"', array('app' => 'core'));
+                    }
+                }
+            }
+        }
+    }
 }

core/Controller/LostController.php

Doc Comments +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
 	}
 
 	/**
-	 * @param $message
+	 * @param string $message
 	 * @param array $additional
 	 * @return array
 	 */

Spacing +9 added lines, -9 removed lines

@@ -167,7 +167,7 @@ 
 	 */
 	protected function checkPasswordResetToken($token, $userId) {
 		$user = $this->userManager->get($userId);
-		if($user === null || !$user->isEnabled()) {
+		if ($user === null || !$user->isEnabled()) {
 			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
 		}
 
@@ -180,11 +180,11 @@ 
 		}
 
 		$splittedToken = explode(':', $decryptedToken);
-		if(count($splittedToken) !== 2) {
+		if (count($splittedToken) !== 2) {
 			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
 		}
 
-		if ($splittedToken[0] < ($this->timeFactory->getTime() - 60*60*12) ||
+		if ($splittedToken[0] < ($this->timeFactory->getTime() - 60 * 60 * 12) ||
 			$user->getLastLogin() > $splittedToken[0]) {
 			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is expired'));
 		}
@@ -199,7 +199,7 @@ 
 	 * @param array $additional
 	 * @return array
 	 */
-	private function error($message, array $additional=array()) {
+	private function error($message, array $additional = array()) {
 		return array_merge(array('status' => 'error', 'msg' => $message), $additional);
 	}
 
@@ -218,7 +218,7 @@ 
 	 * @param string $user
 	 * @return JSONResponse
 	 */
-	public function email($user){
+	public function email($user) {
 		if ($this->config->getSystemValue('lost_password_link', '') !== '') {
 			return new JSONResponse($this->error($this->l10n->t('Password reset is disabled')));
 		}
@@ -226,7 +226,7 @@ 
 		// FIXME: use HTTP error codes
 		try {
 			$this->sendEmail($user);
-		} catch (\Exception $e){
+		} catch (\Exception $e) {
 			$response = new JSONResponse($this->error($e->getMessage()));
 			$response->throttle();
 			return $response;
@@ -268,7 +268,7 @@ 
 
 			$this->config->deleteUserValue($userId, 'core', 'lostpassword');
 			@\OC::$server->getUserSession()->unsetMagicInCookie();
-		} catch (\Exception $e){
+		} catch (\Exception $e) {
 			return $this->error($e->getMessage());
 		}
 
@@ -299,8 +299,8 @@ 
 			ISecureRandom::CHAR_LOWER.
 			ISecureRandom::CHAR_UPPER
 		);
-		$tokenValue = $this->timeFactory->getTime() .':'. $token;
-		$encryptedValue = $this->crypto->encrypt($tokenValue, $email . $this->config->getSystemValue('secret'));
+		$tokenValue = $this->timeFactory->getTime().':'.$token;
+		$encryptedValue = $this->crypto->encrypt($tokenValue, $email.$this->config->getSystemValue('secret'));
 		$this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
 
 		$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user->getUID(), 'token' => $token));

Indentation +315 added lines, -315 removed lines

@@ -56,319 +56,319 @@
  */
 class LostController extends Controller {
 
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var Defaults */
-	protected $defaults;
-	/** @var IL10N */
-	protected $l10n;
-	/** @var string */
-	protected $from;
-	/** @var IManager */
-	protected $encryptionManager;
-	/** @var IConfig */
-	protected $config;
-	/** @var ISecureRandom */
-	protected $secureRandom;
-	/** @var IMailer */
-	protected $mailer;
-	/** @var ITimeFactory */
-	protected $timeFactory;
-	/** @var ICrypto */
-	protected $crypto;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IURLGenerator $urlGenerator
-	 * @param IUserManager $userManager
-	 * @param Defaults $defaults
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param ISecureRandom $secureRandom
-	 * @param string $defaultMailAddress
-	 * @param IManager $encryptionManager
-	 * @param IMailer $mailer
-	 * @param ITimeFactory $timeFactory
-	 * @param ICrypto $crypto
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IURLGenerator $urlGenerator,
-								IUserManager $userManager,
-								Defaults $defaults,
-								IL10N $l10n,
-								IConfig $config,
-								ISecureRandom $secureRandom,
-								$defaultMailAddress,
-								IManager $encryptionManager,
-								IMailer $mailer,
-								ITimeFactory $timeFactory,
-								ICrypto $crypto) {
-		parent::__construct($appName, $request);
-		$this->urlGenerator = $urlGenerator;
-		$this->userManager = $userManager;
-		$this->defaults = $defaults;
-		$this->l10n = $l10n;
-		$this->secureRandom = $secureRandom;
-		$this->from = $defaultMailAddress;
-		$this->encryptionManager = $encryptionManager;
-		$this->config = $config;
-		$this->mailer = $mailer;
-		$this->timeFactory = $timeFactory;
-		$this->crypto = $crypto;
-	}
-
-	/**
-	 * Someone wants to reset their password:
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $token
-	 * @param string $userId
-	 * @return TemplateResponse
-	 */
-	public function resetform($token, $userId) {
-		if ($this->config->getSystemValue('lost_password_link', '') !== '') {
-			return new TemplateResponse('core', 'error', [
-					'errors' => [['error' => $this->l10n->t('Password reset is disabled')]]
-				],
-				'guest'
-			);
-		}
-
-		try {
-			$this->checkPasswordResetToken($token, $userId);
-		} catch (\Exception $e) {
-			return new TemplateResponse(
-				'core', 'error', [
-					"errors" => array(array("error" => $e->getMessage()))
-				],
-				'guest'
-			);
-		}
-
-		return new TemplateResponse(
-			'core',
-			'lostpassword/resetpassword',
-			array(
-				'link' => $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $userId, 'token' => $token)),
-			),
-			'guest'
-		);
-	}
-
-	/**
-	 * @param string $token
-	 * @param string $userId
-	 * @throws \Exception
-	 */
-	protected function checkPasswordResetToken($token, $userId) {
-		$user = $this->userManager->get($userId);
-		if($user === null || !$user->isEnabled()) {
-			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
-		}
-
-		try {
-			$encryptedToken = $this->config->getUserValue($userId, 'core', 'lostpassword', null);
-			$mailAddress = !is_null($user->getEMailAddress()) ? $user->getEMailAddress() : '';
-			$decryptedToken = $this->crypto->decrypt($encryptedToken, $mailAddress.$this->config->getSystemValue('secret'));
-		} catch (\Exception $e) {
-			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
-		}
-
-		$splittedToken = explode(':', $decryptedToken);
-		if(count($splittedToken) !== 2) {
-			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
-		}
-
-		if ($splittedToken[0] < ($this->timeFactory->getTime() - 60*60*12) ||
-			$user->getLastLogin() > $splittedToken[0]) {
-			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is expired'));
-		}
-
-		if (!hash_equals($splittedToken[1], $token)) {
-			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
-		}
-	}
-
-	/**
-	 * @param $message
-	 * @param array $additional
-	 * @return array
-	 */
-	private function error($message, array $additional=array()) {
-		return array_merge(array('status' => 'error', 'msg' => $message), $additional);
-	}
-
-	/**
-	 * @return array
-	 */
-	private function success() {
-		return array('status'=>'success');
-	}
-
-	/**
-	 * @PublicPage
-	 * @BruteForceProtection(action=passwordResetEmail)
-	 * @AnonRateThrottle(limit=10, period=300)
-	 *
-	 * @param string $user
-	 * @return JSONResponse
-	 */
-	public function email($user){
-		if ($this->config->getSystemValue('lost_password_link', '') !== '') {
-			return new JSONResponse($this->error($this->l10n->t('Password reset is disabled')));
-		}
-
-		\OCP\Util::emitHook(
-			'\OCA\Files_Sharing\API\Server2Server',
-			'preLoginNameUsedAsUserName',
-			['uid' => &$user]
-		);
-
-		// FIXME: use HTTP error codes
-		try {
-			$this->sendEmail($user);
-		} catch (\Exception $e){
-			$response = new JSONResponse($this->error($e->getMessage()));
-			$response->throttle();
-			return $response;
-		}
-
-		$response = new JSONResponse($this->success());
-		$response->throttle();
-		return $response;
-	}
-
-	/**
-	 * @PublicPage
-	 * @param string $token
-	 * @param string $userId
-	 * @param string $password
-	 * @param boolean $proceed
-	 * @return array
-	 */
-	public function setPassword($token, $userId, $password, $proceed) {
-		if ($this->config->getSystemValue('lost_password_link', '') !== '') {
-			return $this->error($this->l10n->t('Password reset is disabled'));
-		}
-
-		if ($this->encryptionManager->isEnabled() && !$proceed) {
-			return $this->error('', array('encryption' => true));
-		}
-
-		try {
-			$this->checkPasswordResetToken($token, $userId);
-			$user = $this->userManager->get($userId);
-
-			\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'pre_passwordReset', array('uid' => $userId, 'password' => $password));
-
-			if (!$user->setPassword($password)) {
-				throw new \Exception();
-			}
-
-			\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array('uid' => $userId, 'password' => $password));
-
-			$this->config->deleteUserValue($userId, 'core', 'lostpassword');
-			@\OC::$server->getUserSession()->unsetMagicInCookie();
-		} catch (\Exception $e){
-			return $this->error($e->getMessage());
-		}
-
-		return $this->success();
-	}
-
-	/**
-	 * @param string $input
-	 * @throws \Exception
-	 */
-	protected function sendEmail($input) {
-		$user = $this->findUserByIdOrMail($input);
-		$email = $user->getEMailAddress();
-
-		if (empty($email)) {
-			throw new \Exception(
-				$this->l10n->t('Could not send reset email because there is no email address for this username. Please contact your administrator.')
-			);
-		}
-
-		// Generate the token. It is stored encrypted in the database with the
-		// secret being the users' email address appended with the system secret.
-		// This makes the token automatically invalidate once the user changes
-		// their email address.
-		$token = $this->secureRandom->generate(
-			21,
-			ISecureRandom::CHAR_DIGITS.
-			ISecureRandom::CHAR_LOWER.
-			ISecureRandom::CHAR_UPPER
-		);
-		$tokenValue = $this->timeFactory->getTime() .':'. $token;
-		$encryptedValue = $this->crypto->encrypt($tokenValue, $email . $this->config->getSystemValue('secret'));
-		$this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
-
-		$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user->getUID(), 'token' => $token));
-
-		$emailTemplate = $this->mailer->createEMailTemplate('core.ResetPassword', [
-			'link' => $link,
-		]);
-
-		$emailTemplate->setSubject($this->l10n->t('%s password reset', [$this->defaults->getName()]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l10n->t('Password reset'));
-
-		$emailTemplate->addBodyText(
-			htmlspecialchars($this->l10n->t('Click the following button to reset your password. If you have not requested the password reset, then ignore this email.')),
-			$this->l10n->t('Click the following link to reset your password. If you have not requested the password reset, then ignore this email.')
-		);
-
-		$emailTemplate->addBodyButton(
-			htmlspecialchars($this->l10n->t('Reset your password')),
-			$link,
-			false
-		);
-		$emailTemplate->addFooter();
-
-		try {
-			$message = $this->mailer->createMessage();
-			$message->setTo([$email => $user->getUID()]);
-			$message->setFrom([$this->from => $this->defaults->getName()]);
-			$message->useTemplate($emailTemplate);
-			$this->mailer->send($message);
-		} catch (\Exception $e) {
-			throw new \Exception($this->l10n->t(
-				'Couldn\'t send reset email. Please contact your administrator.'
-			));
-		}
-	}
-
-	/**
-	 * @param string $input
-	 * @return IUser
-	 * @throws \InvalidArgumentException
-	 */
-	protected function findUserByIdOrMail($input) {
-		$user = $this->userManager->get($input);
-		if ($user instanceof IUser) {
-			if (!$user->isEnabled()) {
-				throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
-			}
-
-			return $user;
-		}
-		$users = $this->userManager->getByEmail($input);
-		if (count($users) === 1) {
-			$user = $users[0];
-			if (!$user->isEnabled()) {
-				throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
-			}
-
-			return $user;
-		}
-
-		throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
-	}
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var Defaults */
+    protected $defaults;
+    /** @var IL10N */
+    protected $l10n;
+    /** @var string */
+    protected $from;
+    /** @var IManager */
+    protected $encryptionManager;
+    /** @var IConfig */
+    protected $config;
+    /** @var ISecureRandom */
+    protected $secureRandom;
+    /** @var IMailer */
+    protected $mailer;
+    /** @var ITimeFactory */
+    protected $timeFactory;
+    /** @var ICrypto */
+    protected $crypto;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IURLGenerator $urlGenerator
+     * @param IUserManager $userManager
+     * @param Defaults $defaults
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param ISecureRandom $secureRandom
+     * @param string $defaultMailAddress
+     * @param IManager $encryptionManager
+     * @param IMailer $mailer
+     * @param ITimeFactory $timeFactory
+     * @param ICrypto $crypto
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IURLGenerator $urlGenerator,
+                                IUserManager $userManager,
+                                Defaults $defaults,
+                                IL10N $l10n,
+                                IConfig $config,
+                                ISecureRandom $secureRandom,
+                                $defaultMailAddress,
+                                IManager $encryptionManager,
+                                IMailer $mailer,
+                                ITimeFactory $timeFactory,
+                                ICrypto $crypto) {
+        parent::__construct($appName, $request);
+        $this->urlGenerator = $urlGenerator;
+        $this->userManager = $userManager;
+        $this->defaults = $defaults;
+        $this->l10n = $l10n;
+        $this->secureRandom = $secureRandom;
+        $this->from = $defaultMailAddress;
+        $this->encryptionManager = $encryptionManager;
+        $this->config = $config;
+        $this->mailer = $mailer;
+        $this->timeFactory = $timeFactory;
+        $this->crypto = $crypto;
+    }
+
+    /**
+     * Someone wants to reset their password:
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $token
+     * @param string $userId
+     * @return TemplateResponse
+     */
+    public function resetform($token, $userId) {
+        if ($this->config->getSystemValue('lost_password_link', '') !== '') {
+            return new TemplateResponse('core', 'error', [
+                    'errors' => [['error' => $this->l10n->t('Password reset is disabled')]]
+                ],
+                'guest'
+            );
+        }
+
+        try {
+            $this->checkPasswordResetToken($token, $userId);
+        } catch (\Exception $e) {
+            return new TemplateResponse(
+                'core', 'error', [
+                    "errors" => array(array("error" => $e->getMessage()))
+                ],
+                'guest'
+            );
+        }
+
+        return new TemplateResponse(
+            'core',
+            'lostpassword/resetpassword',
+            array(
+                'link' => $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $userId, 'token' => $token)),
+            ),
+            'guest'
+        );
+    }
+
+    /**
+     * @param string $token
+     * @param string $userId
+     * @throws \Exception
+     */
+    protected function checkPasswordResetToken($token, $userId) {
+        $user = $this->userManager->get($userId);
+        if($user === null || !$user->isEnabled()) {
+            throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
+        }
+
+        try {
+            $encryptedToken = $this->config->getUserValue($userId, 'core', 'lostpassword', null);
+            $mailAddress = !is_null($user->getEMailAddress()) ? $user->getEMailAddress() : '';
+            $decryptedToken = $this->crypto->decrypt($encryptedToken, $mailAddress.$this->config->getSystemValue('secret'));
+        } catch (\Exception $e) {
+            throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
+        }
+
+        $splittedToken = explode(':', $decryptedToken);
+        if(count($splittedToken) !== 2) {
+            throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
+        }
+
+        if ($splittedToken[0] < ($this->timeFactory->getTime() - 60*60*12) ||
+            $user->getLastLogin() > $splittedToken[0]) {
+            throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is expired'));
+        }
+
+        if (!hash_equals($splittedToken[1], $token)) {
+            throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
+        }
+    }
+
+    /**
+     * @param $message
+     * @param array $additional
+     * @return array
+     */
+    private function error($message, array $additional=array()) {
+        return array_merge(array('status' => 'error', 'msg' => $message), $additional);
+    }
+
+    /**
+     * @return array
+     */
+    private function success() {
+        return array('status'=>'success');
+    }
+
+    /**
+     * @PublicPage
+     * @BruteForceProtection(action=passwordResetEmail)
+     * @AnonRateThrottle(limit=10, period=300)
+     *
+     * @param string $user
+     * @return JSONResponse
+     */
+    public function email($user){
+        if ($this->config->getSystemValue('lost_password_link', '') !== '') {
+            return new JSONResponse($this->error($this->l10n->t('Password reset is disabled')));
+        }
+
+        \OCP\Util::emitHook(
+            '\OCA\Files_Sharing\API\Server2Server',
+            'preLoginNameUsedAsUserName',
+            ['uid' => &$user]
+        );
+
+        // FIXME: use HTTP error codes
+        try {
+            $this->sendEmail($user);
+        } catch (\Exception $e){
+            $response = new JSONResponse($this->error($e->getMessage()));
+            $response->throttle();
+            return $response;
+        }
+
+        $response = new JSONResponse($this->success());
+        $response->throttle();
+        return $response;
+    }
+
+    /**
+     * @PublicPage
+     * @param string $token
+     * @param string $userId
+     * @param string $password
+     * @param boolean $proceed
+     * @return array
+     */
+    public function setPassword($token, $userId, $password, $proceed) {
+        if ($this->config->getSystemValue('lost_password_link', '') !== '') {
+            return $this->error($this->l10n->t('Password reset is disabled'));
+        }
+
+        if ($this->encryptionManager->isEnabled() && !$proceed) {
+            return $this->error('', array('encryption' => true));
+        }
+
+        try {
+            $this->checkPasswordResetToken($token, $userId);
+            $user = $this->userManager->get($userId);
+
+            \OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'pre_passwordReset', array('uid' => $userId, 'password' => $password));
+
+            if (!$user->setPassword($password)) {
+                throw new \Exception();
+            }
+
+            \OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array('uid' => $userId, 'password' => $password));
+
+            $this->config->deleteUserValue($userId, 'core', 'lostpassword');
+            @\OC::$server->getUserSession()->unsetMagicInCookie();
+        } catch (\Exception $e){
+            return $this->error($e->getMessage());
+        }
+
+        return $this->success();
+    }
+
+    /**
+     * @param string $input
+     * @throws \Exception
+     */
+    protected function sendEmail($input) {
+        $user = $this->findUserByIdOrMail($input);
+        $email = $user->getEMailAddress();
+
+        if (empty($email)) {
+            throw new \Exception(
+                $this->l10n->t('Could not send reset email because there is no email address for this username. Please contact your administrator.')
+            );
+        }
+
+        // Generate the token. It is stored encrypted in the database with the
+        // secret being the users' email address appended with the system secret.
+        // This makes the token automatically invalidate once the user changes
+        // their email address.
+        $token = $this->secureRandom->generate(
+            21,
+            ISecureRandom::CHAR_DIGITS.
+            ISecureRandom::CHAR_LOWER.
+            ISecureRandom::CHAR_UPPER
+        );
+        $tokenValue = $this->timeFactory->getTime() .':'. $token;
+        $encryptedValue = $this->crypto->encrypt($tokenValue, $email . $this->config->getSystemValue('secret'));
+        $this->config->setUserValue($user->getUID(), 'core', 'lostpassword', $encryptedValue);
+
+        $link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user->getUID(), 'token' => $token));
+
+        $emailTemplate = $this->mailer->createEMailTemplate('core.ResetPassword', [
+            'link' => $link,
+        ]);
+
+        $emailTemplate->setSubject($this->l10n->t('%s password reset', [$this->defaults->getName()]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l10n->t('Password reset'));
+
+        $emailTemplate->addBodyText(
+            htmlspecialchars($this->l10n->t('Click the following button to reset your password. If you have not requested the password reset, then ignore this email.')),
+            $this->l10n->t('Click the following link to reset your password. If you have not requested the password reset, then ignore this email.')
+        );
+
+        $emailTemplate->addBodyButton(
+            htmlspecialchars($this->l10n->t('Reset your password')),
+            $link,
+            false
+        );
+        $emailTemplate->addFooter();
+
+        try {
+            $message = $this->mailer->createMessage();
+            $message->setTo([$email => $user->getUID()]);
+            $message->setFrom([$this->from => $this->defaults->getName()]);
+            $message->useTemplate($emailTemplate);
+            $this->mailer->send($message);
+        } catch (\Exception $e) {
+            throw new \Exception($this->l10n->t(
+                'Couldn\'t send reset email. Please contact your administrator.'
+            ));
+        }
+    }
+
+    /**
+     * @param string $input
+     * @return IUser
+     * @throws \InvalidArgumentException
+     */
+    protected function findUserByIdOrMail($input) {
+        $user = $this->userManager->get($input);
+        if ($user instanceof IUser) {
+            if (!$user->isEnabled()) {
+                throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
+            }
+
+            return $user;
+        }
+        $users = $this->userManager->getByEmail($input);
+        if (count($users) === 1) {
+            $user = $users[0];
+            if (!$user->isEnabled()) {
+                throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
+            }
+
+            return $user;
+        }
+
+        throw new \InvalidArgumentException($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
+    }
 }

lib/private/AppFramework/OCS/BaseResponse.php

Doc Comments +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	/**
 	 * BaseResponse constructor.
 	 *
-	 * @param DataResponse|null $dataResponse
+	 * @param DataResponse $dataResponse
 	 * @param string $format
 	 * @param string|null $statusMessage
 	 * @param int|null $itemsCount

Indentation +56 added lines, -56 removed lines

@@ -27,70 +27,70 @@
 use OCP\AppFramework\Http\Response;
 
 abstract class BaseResponse extends Response   {
-	/** @var array */
-	protected $data;
+    /** @var array */
+    protected $data;
 
-	/** @var string */
-	protected $format;
+    /** @var string */
+    protected $format;
 
-	/** @var string */
-	protected $statusMessage;
+    /** @var string */
+    protected $statusMessage;
 
-	/** @var int */
-	protected $itemsCount;
+    /** @var int */
+    protected $itemsCount;
 
-	/** @var int */
-	protected $itemsPerPage;
+    /** @var int */
+    protected $itemsPerPage;
 
-	/**
-	 * BaseResponse constructor.
-	 *
-	 * @param DataResponse|null $dataResponse
-	 * @param string $format
-	 * @param string|null $statusMessage
-	 * @param int|null $itemsCount
-	 * @param int|null $itemsPerPage
-	 */
-	public function __construct(DataResponse $dataResponse,
-								$format = 'xml',
-								$statusMessage = null,
-								$itemsCount = null,
-								$itemsPerPage = null) {
-		$this->format = $format;
-		$this->statusMessage = $statusMessage;
-		$this->itemsCount = $itemsCount;
-		$this->itemsPerPage = $itemsPerPage;
+    /**
+     * BaseResponse constructor.
+     *
+     * @param DataResponse|null $dataResponse
+     * @param string $format
+     * @param string|null $statusMessage
+     * @param int|null $itemsCount
+     * @param int|null $itemsPerPage
+     */
+    public function __construct(DataResponse $dataResponse,
+                                $format = 'xml',
+                                $statusMessage = null,
+                                $itemsCount = null,
+                                $itemsPerPage = null) {
+        $this->format = $format;
+        $this->statusMessage = $statusMessage;
+        $this->itemsCount = $itemsCount;
+        $this->itemsPerPage = $itemsPerPage;
 
-		$this->data = $dataResponse->getData();
+        $this->data = $dataResponse->getData();
 
-		$this->setHeaders($dataResponse->getHeaders());
-		$this->setStatus($dataResponse->getStatus());
-		$this->setETag($dataResponse->getETag());
-		$this->setLastModified($dataResponse->getLastModified());
-		$this->setCookies($dataResponse->getCookies());
-		$this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
+        $this->setHeaders($dataResponse->getHeaders());
+        $this->setStatus($dataResponse->getStatus());
+        $this->setETag($dataResponse->getETag());
+        $this->setLastModified($dataResponse->getLastModified());
+        $this->setCookies($dataResponse->getCookies());
+        $this->setContentSecurityPolicy(new EmptyContentSecurityPolicy());
 
-		if ($format === 'json') {
-			$this->addHeader(
-				'Content-Type', 'application/json; charset=utf-8'
-			);
-		} else {
-			$this->addHeader(
-				'Content-Type', 'application/xml; charset=utf-8'
-			);
-		}
-	}
+        if ($format === 'json') {
+            $this->addHeader(
+                'Content-Type', 'application/json; charset=utf-8'
+            );
+        } else {
+            $this->addHeader(
+                'Content-Type', 'application/xml; charset=utf-8'
+            );
+        }
+    }
 
-	/**
-	 * @param string[] $meta
-	 * @return string
-	 */
-	protected function renderResult($meta) {
-		// TODO rewrite functions
-		return \OC_API::renderResult($this->format, $meta, $this->data);
-	}
+    /**
+     * @param string[] $meta
+     * @return string
+     */
+    protected function renderResult($meta) {
+        // TODO rewrite functions
+        return \OC_API::renderResult($this->format, $meta, $this->data);
+    }
 
-	public function getOCSStatus() {
-		return parent::getStatus();
-	}
+    public function getOCSStatus() {
+        return parent::getStatus();
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
 use OCP\AppFramework\Http\Response;
 
-abstract class BaseResponse extends Response   {
+abstract class BaseResponse extends Response {
 	/** @var array */
 	protected $data;
 

lib/private/Server.php

Doc Comments +2 added lines, -1 removed lines

@@ -1143,7 +1143,7 @@ 
 	 * Get the certificate manager for the user
 	 *
 	 * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
-	 * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
+	 * @return null|CertificateManager | null if $uid is null and no user is logged in
 	 */
 	public function getCertificateManager($userId = '') {
 		if ($userId === '') {
@@ -1464,6 +1464,7 @@ 
 	}
 
 	/**
+	 * @param string $app
 	 * @return \OCP\Files\IAppData
 	 */
 	public function getAppDataDir($app) {

Unused Use Statements -1 removed lines

@@ -115,7 +115,6 @@
 use OC\Template\JSCombiner;
 use OC\Template\SCSSCacher;
 use OCA\Theming\ThemingDefaults;
-
 use OCP\App\IAppManager;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Collaboration\AutoComplete\IManager;

Indentation +1807 added lines, -1807 removed lines

@@ -150,1816 +150,1816 @@
  * TODO: hookup all manager classes
  */
 class Server extends ServerContainer implements IServerContainer {
-	/** @var string */
-	private $webRoot;
-
-	/**
-	 * @param string $webRoot
-	 * @param \OC\Config $config
-	 */
-	public function __construct($webRoot, \OC\Config $config) {
-		parent::__construct();
-		$this->webRoot = $webRoot;
-
-		$this->registerService(\OCP\IServerContainer::class, function (IServerContainer $c) {
-			return $c;
-		});
-
-		$this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
-		$this->registerAlias('CalendarManager', \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-		$this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-
-		$this->registerService(\OCP\IPreview::class, function (Server $c) {
-			return new PreviewManager(
-				$c->getConfig(),
-				$c->getRootFolder(),
-				$c->getAppDataDir('preview'),
-				$c->getEventDispatcher(),
-				$c->getSession()->get('user_id')
-			);
-		});
-		$this->registerAlias('PreviewManager', \OCP\IPreview::class);
-
-		$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
-			return new \OC\Preview\Watcher(
-				$c->getAppDataDir('preview')
-			);
-		});
-
-		$this->registerService('EncryptionManager', function (Server $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-			return new Encryption\Manager(
-				$c->getConfig(),
-				$c->getLogger(),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-			return new Encryption\File(
-				$util,
-				$c->getRootFolder(),
-				$c->getShareManager()
-			);
-		});
-
-		$this->registerService('EncryptionKeyStorage', function (Server $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->getUserManager(),
-				$c->getGroupManager(),
-				$c->getConfig()
-			);
-
-			return new Encryption\Keys\Storage($view, $util);
-		});
-		$this->registerService('TagMapper', function (Server $c) {
-			return new TagMapper($c->getDatabaseConnection());
-		});
-
-		$this->registerService(\OCP\ITagManager::class, function (Server $c) {
-			$tagMapper = $c->query('TagMapper');
-			return new TagManager($tagMapper, $c->getUserSession());
-		});
-		$this->registerAlias('TagManager', \OCP\ITagManager::class);
-
-		$this->registerService('SystemTagManagerFactory', function (Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
-			return new $factoryClass($this);
-		});
-		$this->registerService(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
-			return $c->query('SystemTagManagerFactory')->getManager();
-		});
-		$this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
-
-		$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
-			return $c->query('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerService('RootFolder', function (Server $c) {
-			$manager = \OC\Files\Filesystem::getMountManager(null);
-			$view = new View();
-			$root = new Root(
-				$manager,
-				$view,
-				null,
-				$c->getUserMountCache(),
-				$this->getLogger(),
-				$this->getUserManager()
-			);
-			$connector = new HookConnector($root, $view);
-			$connector->viewToNode();
-
-			$previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
-
-		$this->registerService(\OCP\Files\IRootFolder::class, function (Server $c) {
-			return new LazyRoot(function () use ($c) {
-				return $c->query('RootFolder');
-			});
-		});
-		$this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
-
-		$this->registerService(\OC\User\Manager::class, function (Server $c) {
-			$config = $c->getConfig();
-			return new \OC\User\Manager($config);
-		});
-		$this->registerAlias('UserManager', \OC\User\Manager::class);
-		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
-
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
-			$groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
-				\OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
-			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
-				\OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
-				\OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
-				\OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				\OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
-			});
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
-				\OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
-				//Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
-				\OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
-			});
-			return $groupManager;
-		});
-		$this->registerAlias('GroupManager', \OCP\IGroupManager::class);
-
-		$this->registerService(Store::class, function (Server $c) {
-			$session = $c->getSession();
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$tokenProvider = $c->query(IProvider::class);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->getLogger();
-			return new Store($session, $logger, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerService(Authentication\Token\DefaultTokenMapper::class, function (Server $c) {
-			$dbConnection = $c->getDatabaseConnection();
-			return new Authentication\Token\DefaultTokenMapper($dbConnection);
-		});
-		$this->registerService(Authentication\Token\DefaultTokenProvider::class, function (Server $c) {
-			$mapper = $c->query(Authentication\Token\DefaultTokenMapper::class);
-			$crypto = $c->getCrypto();
-			$config = $c->getConfig();
-			$logger = $c->getLogger();
-			$timeFactory = new TimeFactory();
-			return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory);
-		});
-		$this->registerAlias(IProvider::class, Authentication\Token\DefaultTokenProvider::class);
-
-		$this->registerService(\OCP\IUserSession::class, function (Server $c) {
-			$manager = $c->getUserManager();
-			$session = new \OC\Session\Memory('');
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when ownCloud is not yet setup.
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$defaultTokenProvider = $c->query(IProvider::class);
-			} else {
-				$defaultTokenProvider = null;
-			}
-
-			$dispatcher = $c->getEventDispatcher();
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$defaultTokenProvider,
-				$c->getConfig(),
-				$c->getSecureRandom(),
-				$c->getLockdownManager(),
-				$c->getLogger()
-			);
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'preDelete', function ($user) use ($dispatcher) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
-				$dispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
-			});
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
-			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
-			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
-			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
-			});
-			$userSession->listen('\OC\User', 'logout', function () {
-				\OC_Hook::emit('OC_User', 'logout', array());
-			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) use ($dispatcher) {
-				/** @var $user \OC\User\User */
-				\OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue));
-				$dispatcher->dispatch('OCP\IUser::changeUser', new GenericEvent($user, ['feature' => $feature, 'oldValue' => $oldValue, 'value' => $value]));
-			});
-			return $userSession;
-		});
-		$this->registerAlias('UserSession', \OCP\IUserSession::class);
-
-		$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
-			return new \OC\Authentication\TwoFactorAuth\Manager(
-				$c->getAppManager(),
-				$c->getSession(),
-				$c->getConfig(),
-				$c->getActivityManager(),
-				$c->getLogger(),
-				$c->query(IProvider::class),
-				$c->query(ITimeFactory::class),
-				$c->query(EventDispatcherInterface::class)
-			);
-		});
-
-		$this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
-		$this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
-
-		$this->registerService(\OC\AllConfig::class, function (Server $c) {
-			return new \OC\AllConfig(
-				$c->getSystemConfig()
-			);
-		});
-		$this->registerAlias('AllConfig', \OC\AllConfig::class);
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService('SystemConfig', function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-
-		$this->registerService(\OC\AppConfig::class, function (Server $c) {
-			return new \OC\AppConfig($c->getDatabaseConnection());
-		});
-		$this->registerAlias('AppConfig', \OC\AppConfig::class);
-		$this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
-
-		$this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->getConfig(),
-				$c->getRequest(),
-				$c->getUserSession(),
-				\OC::$SERVERROOT
-			);
-		});
-		$this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
-
-		$this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
-			$config = $c->getConfig();
-			$cacheFactory = $c->getMemCacheFactory();
-			$request = $c->getRequest();
-			return new \OC\URLGenerator(
-				$config,
-				$cacheFactory,
-				$request
-			);
-		});
-		$this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
-
-		$this->registerAlias('AppFetcher', AppFetcher::class);
-		$this->registerAlias('CategoryFetcher', CategoryFetcher::class);
-
-		$this->registerService(\OCP\ICache::class, function ($c) {
-			return new Cache\File();
-		});
-		$this->registerAlias('UserCache', \OCP\ICache::class);
-
-		$this->registerService(Factory::class, function (Server $c) {
-
-			$arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(),
-				ArrayCache::class,
-				ArrayCache::class,
-				ArrayCache::class
-			);
-			$config = $c->getConfig();
-			$request = $c->getRequest();
-			$urlGenerator = new URLGenerator($config, $arrayCacheFactory, $request);
-
-			if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				$v = \OC_App::getAppVersions();
-				$v['core'] = implode(',', \OC_Util::getVersion());
-				$version = implode(',', $v);
-				$instanceId = \OC_Util::getInstanceId();
-				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
-				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
-					$config->getSystemValue('memcache.local', null),
-					$config->getSystemValue('memcache.distributed', null),
-					$config->getSystemValue('memcache.locking', null)
-				);
-			}
-			return $arrayCacheFactory;
-
-		});
-		$this->registerAlias('MemCacheFactory', Factory::class);
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->getSystemConfig();
-			return new RedisFactory($systemConfig);
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->getUserSession(),
-				$c->getConfig(),
-				$c->query(IValidator::class)
-			);
-		});
-		$this->registerAlias('ActivityManager', \OCP\Activity\IManager::class);
-
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
-			return new \OC\Activity\EventMerger(
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias(IValidator::class, Validator::class);
-
-		$this->registerService(\OCP\IAvatarManager::class, function (Server $c) {
-			return new AvatarManager(
-				$c->query(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-
-		$this->registerService(\OCP\ILogger::class, function (Server $c) {
-			$logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
-			$logger = Log::getLogClass($logType);
-			call_user_func(array($logger, 'init'));
-			$config = $this->getSystemConfig();
-			$registry = $c->query(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $config, null, $registry);
-		});
-		$this->registerAlias('Logger', \OCP\ILogger::class);
-
-		$this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
-			$config = $c->getConfig();
-			return new \OC\BackgroundJob\JobList(
-				$c->getDatabaseConnection(),
-				$config,
-				new TimeFactory()
-			);
-		});
-		$this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
-
-		$this->registerService(\OCP\Route\IRouter::class, function (Server $c) {
-			$cacheFactory = $c->getMemCacheFactory();
-			$logger = $c->getLogger();
-			if ($cacheFactory->isLocalCacheAvailable()) {
-				$router = new \OC\Route\CachingRouter($cacheFactory->createLocal('route'), $logger);
-			} else {
-				$router = new \OC\Route\Router($logger);
-			}
-			return $router;
-		});
-		$this->registerAlias('Router', \OCP\Route\IRouter::class);
-
-		$this->registerService(\OCP\ISearch::class, function ($c) {
-			return new Search();
-		});
-		$this->registerAlias('Search', \OCP\ISearch::class);
-
-		$this->registerService(\OC\Security\RateLimiting\Limiter::class, function (Server $c) {
-			return new \OC\Security\RateLimiting\Limiter(
-				$this->getUserSession(),
-				$this->getRequest(),
-				new \OC\AppFramework\Utility\TimeFactory(),
-				$c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
-			);
-		});
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
-			return new \OC\Security\RateLimiting\Backend\MemoryCache(
-				$this->getMemCacheFactory(),
-				new \OC\AppFramework\Utility\TimeFactory()
-			);
-		});
-
-		$this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
-			return new SecureRandom();
-		});
-		$this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
-
-		$this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
-			return new Crypto($c->getConfig(), $c->getSecureRandom());
-		});
-		$this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
-
-		$this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
-			return new Hasher($c->getConfig());
-		});
-		$this->registerAlias('Hasher', \OCP\Security\IHasher::class);
-
-		$this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
-			return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
-		});
-		$this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
-
-		$this->registerService(IDBConnection::class, function (Server $c) {
-			$systemConfig = $c->getSystemConfig();
-			$factory = new \OC\DB\ConnectionFactory($systemConfig);
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connectionParams = $factory->createConnectionParams();
-			$connection = $factory->getConnection($type, $connectionParams);
-			$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
-			return $connection;
-		});
-		$this->registerAlias('DatabaseConnection', IDBConnection::class);
-
-
-		$this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) {
-			$user = \OC_User::getUser();
-			$uid = $user ? $user : null;
-			return new ClientService(
-				$c->getConfig(),
-				new \OC\Security\CertificateManager(
-					$uid,
-					new View(),
-					$c->getConfig(),
-					$c->getLogger(),
-					$c->getSecureRandom()
-				)
-			);
-		});
-		$this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
-		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
-			$eventLogger = new EventLogger();
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$eventLogger->activate();
-			}
-			return $eventLogger;
-		});
-		$this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
-
-		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
-			$queryLogger = new QueryLogger();
-			if ($c->getSystemConfig()->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-		$this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
-
-		$this->registerService(TempManager::class, function (Server $c) {
-			return new TempManager(
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerAlias('TempManager', TempManager::class);
-		$this->registerAlias(ITempManager::class, TempManager::class);
-
-		$this->registerService(AppManager::class, function (Server $c) {
-			return new \OC\App\AppManager(
-				$c->getUserSession(),
-				$c->query(\OC\AppConfig::class),
-				$c->getGroupManager(),
-				$c->getMemCacheFactory(),
-				$c->getEventDispatcher()
-			);
-		});
-		$this->registerAlias('AppManager', AppManager::class);
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
-			return new DateTimeZone(
-				$c->getConfig(),
-				$c->getSession()
-			);
-		});
-		$this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
-
-		$this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) {
-			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->getDateTimeZone()->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-		$this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
-
-		$this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
-			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->getUserManager());
-			return $mountCache;
-		});
-		$this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
-
-		$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
-			$loader = \OC\Files\Filesystem::getLoader();
-			$mountCache = $c->query('UserMountCache');
-			$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
-
-			// builtin providers
-
-			$config = $c->getConfig();
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($config));
-
-			return $manager;
-		});
-		$this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
-
-		$this->registerService('IniWrapper', function ($c) {
-			return new IniGetWrapper();
-		});
-		$this->registerService('AsyncCommandBus', function (Server $c) {
-			$busClass = $c->getConfig()->getSystemValue('commandbus');
-			if ($busClass) {
-				list($app, $class) = explode('::', $busClass, 2);
-				if ($c->getAppManager()->isInstalled($app)) {
-					\OC_App::loadApp($app);
-					return $c->query($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->getJobList();
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerService('TrustedDomainHelper', function ($c) {
-			return new TrustedDomainHelper($this->getConfig());
-		});
-		$this->registerService('Throttler', function (Server $c) {
-			return new Throttler(
-				$c->getDatabaseConnection(),
-				new TimeFactory(),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-		$this->registerService('IntegrityCodeChecker', function (Server $c) {
-			// IConfig and IAppManager requires a working database. This code
-			// might however be called when ownCloud is not yet setup.
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
-				$config = $c->getConfig();
-				$appManager = $c->getAppManager();
-			} else {
-				$config = null;
-				$appManager = null;
-			}
-
-			return new Checker(
-				new EnvironmentHelper(),
-				new FileAccessHelper(),
-				new AppLocator(),
-				$config,
-				$c->getMemCacheFactory(),
-				$appManager,
-				$c->getTempManager()
-			);
-		});
-		$this->registerService(\OCP\IRequest::class, function ($c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: '',
-					'urlParams' => $urlParams,
-				],
-				$this->getSecureRandom(),
-				$this->getConfig(),
-				$this->getCsrfTokenManager(),
-				$stream
-			);
-		});
-		$this->registerAlias('Request', \OCP\IRequest::class);
-
-		$this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->getConfig(),
-				$c->getLogger(),
-				$c->query(Defaults::class),
-				$c->getURLGenerator(),
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
-
-		$this->registerService('LDAPProvider', function (Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if (is_null($factoryClass)) {
-				throw new \Exception('ldapProviderFactory not set');
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			$factory = new $factoryClass($this);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService(ILockingProvider::class, function (Server $c) {
-			$ini = $c->getIniWrapper();
-			$config = $c->getConfig();
-			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->getMemCacheFactory();
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					return new MemcacheLockingProvider($memcache, $ttl);
-				}
-				return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl);
-			}
-			return new NoopLockingProvider();
-		});
-		$this->registerAlias('LockingProvider', ILockingProvider::class);
-
-		$this->registerService(\OCP\Files\Mount\IMountManager::class, function () {
-			return new \OC\Files\Mount\Manager();
-		});
-		$this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
-
-		$this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
-			return new \OC\Files\Type\Detection(
-				$c->getURLGenerator(),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-		$this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
-
-		$this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
-			return new \OC\Files\Type\Loader(
-				$c->getDatabaseConnection()
-			);
-		});
-		$this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
-		$this->registerService(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
-			return new Manager(
-				$c->query(IValidator::class)
-			);
-		});
-		$this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
-
-		$this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
-			$manager = new \OC\CapabilitiesManager($c->getLogger());
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->getConfig());
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->query(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-		$this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
-
-		$this->registerService(\OCP\Comments\ICommentsManager::class, function (Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			$manager = $factory->getManager();
-
-			$manager->registerDisplayNameResolver('user', function($id) use ($c) {
-				$manager = $c->getUserManager();
-				$user = $manager->get($id);
-				if(is_null($user)) {
-					$l = $c->getL10N('core');
-					$displayName = $l->t('Unknown user');
-				} else {
-					$displayName = $user->getDisplayName();
-				}
-				return $displayName;
-			});
-
-			return $manager;
-		});
-		$this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
-
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			/*
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        $this->registerService(\OCP\IServerContainer::class, function (IServerContainer $c) {
+            return $c;
+        });
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+        $this->registerAlias('CalendarManager', \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+        $this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+
+        $this->registerService(\OCP\IPreview::class, function (Server $c) {
+            return new PreviewManager(
+                $c->getConfig(),
+                $c->getRootFolder(),
+                $c->getAppDataDir('preview'),
+                $c->getEventDispatcher(),
+                $c->getSession()->get('user_id')
+            );
+        });
+        $this->registerAlias('PreviewManager', \OCP\IPreview::class);
+
+        $this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
+            return new \OC\Preview\Watcher(
+                $c->getAppDataDir('preview')
+            );
+        });
+
+        $this->registerService('EncryptionManager', function (Server $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+            return new Encryption\Manager(
+                $c->getConfig(),
+                $c->getLogger(),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+
+        $this->registerService('EncryptionFileHelper', function (Server $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+            return new Encryption\File(
+                $util,
+                $c->getRootFolder(),
+                $c->getShareManager()
+            );
+        });
+
+        $this->registerService('EncryptionKeyStorage', function (Server $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->getUserManager(),
+                $c->getGroupManager(),
+                $c->getConfig()
+            );
+
+            return new Encryption\Keys\Storage($view, $util);
+        });
+        $this->registerService('TagMapper', function (Server $c) {
+            return new TagMapper($c->getDatabaseConnection());
+        });
+
+        $this->registerService(\OCP\ITagManager::class, function (Server $c) {
+            $tagMapper = $c->query('TagMapper');
+            return new TagManager($tagMapper, $c->getUserSession());
+        });
+        $this->registerAlias('TagManager', \OCP\ITagManager::class);
+
+        $this->registerService('SystemTagManagerFactory', function (Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
+            return new $factoryClass($this);
+        });
+        $this->registerService(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
+            return $c->query('SystemTagManagerFactory')->getManager();
+        });
+        $this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
+
+        $this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
+            return $c->query('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerService('RootFolder', function (Server $c) {
+            $manager = \OC\Files\Filesystem::getMountManager(null);
+            $view = new View();
+            $root = new Root(
+                $manager,
+                $view,
+                null,
+                $c->getUserMountCache(),
+                $this->getLogger(),
+                $this->getUserManager()
+            );
+            $connector = new HookConnector($root, $view);
+            $connector->viewToNode();
+
+            $previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
+
+        $this->registerService(\OCP\Files\IRootFolder::class, function (Server $c) {
+            return new LazyRoot(function () use ($c) {
+                return $c->query('RootFolder');
+            });
+        });
+        $this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
+
+        $this->registerService(\OC\User\Manager::class, function (Server $c) {
+            $config = $c->getConfig();
+            return new \OC\User\Manager($config);
+        });
+        $this->registerAlias('UserManager', \OC\User\Manager::class);
+        $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
+
+        $this->registerService(\OCP\IGroupManager::class, function (Server $c) {
+            $groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
+            $groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+                \OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
+            });
+            $groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
+                \OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+                \OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+                \OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                \OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
+            });
+            $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+                \OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
+                //Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
+                \OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
+            });
+            return $groupManager;
+        });
+        $this->registerAlias('GroupManager', \OCP\IGroupManager::class);
+
+        $this->registerService(Store::class, function (Server $c) {
+            $session = $c->getSession();
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $tokenProvider = $c->query(IProvider::class);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->getLogger();
+            return new Store($session, $logger, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerService(Authentication\Token\DefaultTokenMapper::class, function (Server $c) {
+            $dbConnection = $c->getDatabaseConnection();
+            return new Authentication\Token\DefaultTokenMapper($dbConnection);
+        });
+        $this->registerService(Authentication\Token\DefaultTokenProvider::class, function (Server $c) {
+            $mapper = $c->query(Authentication\Token\DefaultTokenMapper::class);
+            $crypto = $c->getCrypto();
+            $config = $c->getConfig();
+            $logger = $c->getLogger();
+            $timeFactory = new TimeFactory();
+            return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory);
+        });
+        $this->registerAlias(IProvider::class, Authentication\Token\DefaultTokenProvider::class);
+
+        $this->registerService(\OCP\IUserSession::class, function (Server $c) {
+            $manager = $c->getUserManager();
+            $session = new \OC\Session\Memory('');
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when ownCloud is not yet setup.
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $defaultTokenProvider = $c->query(IProvider::class);
+            } else {
+                $defaultTokenProvider = null;
+            }
+
+            $dispatcher = $c->getEventDispatcher();
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $defaultTokenProvider,
+                $c->getConfig(),
+                $c->getSecureRandom(),
+                $c->getLockdownManager(),
+                $c->getLogger()
+            );
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'preDelete', function ($user) use ($dispatcher) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
+                $dispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
+            });
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
+            });
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+            });
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
+            });
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
+            });
+            $userSession->listen('\OC\User', 'logout', function () {
+                \OC_Hook::emit('OC_User', 'logout', array());
+            });
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) use ($dispatcher) {
+                /** @var $user \OC\User\User */
+                \OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue));
+                $dispatcher->dispatch('OCP\IUser::changeUser', new GenericEvent($user, ['feature' => $feature, 'oldValue' => $oldValue, 'value' => $value]));
+            });
+            return $userSession;
+        });
+        $this->registerAlias('UserSession', \OCP\IUserSession::class);
+
+        $this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
+            return new \OC\Authentication\TwoFactorAuth\Manager(
+                $c->getAppManager(),
+                $c->getSession(),
+                $c->getConfig(),
+                $c->getActivityManager(),
+                $c->getLogger(),
+                $c->query(IProvider::class),
+                $c->query(ITimeFactory::class),
+                $c->query(EventDispatcherInterface::class)
+            );
+        });
+
+        $this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
+        $this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
+
+        $this->registerService(\OC\AllConfig::class, function (Server $c) {
+            return new \OC\AllConfig(
+                $c->getSystemConfig()
+            );
+        });
+        $this->registerAlias('AllConfig', \OC\AllConfig::class);
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService('SystemConfig', function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+
+        $this->registerService(\OC\AppConfig::class, function (Server $c) {
+            return new \OC\AppConfig($c->getDatabaseConnection());
+        });
+        $this->registerAlias('AppConfig', \OC\AppConfig::class);
+        $this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
+
+        $this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->getConfig(),
+                $c->getRequest(),
+                $c->getUserSession(),
+                \OC::$SERVERROOT
+            );
+        });
+        $this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
+
+        $this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
+            $config = $c->getConfig();
+            $cacheFactory = $c->getMemCacheFactory();
+            $request = $c->getRequest();
+            return new \OC\URLGenerator(
+                $config,
+                $cacheFactory,
+                $request
+            );
+        });
+        $this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
+
+        $this->registerAlias('AppFetcher', AppFetcher::class);
+        $this->registerAlias('CategoryFetcher', CategoryFetcher::class);
+
+        $this->registerService(\OCP\ICache::class, function ($c) {
+            return new Cache\File();
+        });
+        $this->registerAlias('UserCache', \OCP\ICache::class);
+
+        $this->registerService(Factory::class, function (Server $c) {
+
+            $arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(),
+                ArrayCache::class,
+                ArrayCache::class,
+                ArrayCache::class
+            );
+            $config = $c->getConfig();
+            $request = $c->getRequest();
+            $urlGenerator = new URLGenerator($config, $arrayCacheFactory, $request);
+
+            if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                $v = \OC_App::getAppVersions();
+                $v['core'] = implode(',', \OC_Util::getVersion());
+                $version = implode(',', $v);
+                $instanceId = \OC_Util::getInstanceId();
+                $path = \OC::$SERVERROOT;
+                $prefix = md5($instanceId . '-' . $version . '-' . $path);
+                return new \OC\Memcache\Factory($prefix, $c->getLogger(),
+                    $config->getSystemValue('memcache.local', null),
+                    $config->getSystemValue('memcache.distributed', null),
+                    $config->getSystemValue('memcache.locking', null)
+                );
+            }
+            return $arrayCacheFactory;
+
+        });
+        $this->registerAlias('MemCacheFactory', Factory::class);
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->getSystemConfig();
+            return new RedisFactory($systemConfig);
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->getUserSession(),
+                $c->getConfig(),
+                $c->query(IValidator::class)
+            );
+        });
+        $this->registerAlias('ActivityManager', \OCP\Activity\IManager::class);
+
+        $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+            return new \OC\Activity\EventMerger(
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias(IValidator::class, Validator::class);
+
+        $this->registerService(\OCP\IAvatarManager::class, function (Server $c) {
+            return new AvatarManager(
+                $c->query(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+
+        $this->registerService(\OCP\ILogger::class, function (Server $c) {
+            $logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
+            $logger = Log::getLogClass($logType);
+            call_user_func(array($logger, 'init'));
+            $config = $this->getSystemConfig();
+            $registry = $c->query(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $config, null, $registry);
+        });
+        $this->registerAlias('Logger', \OCP\ILogger::class);
+
+        $this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
+            $config = $c->getConfig();
+            return new \OC\BackgroundJob\JobList(
+                $c->getDatabaseConnection(),
+                $config,
+                new TimeFactory()
+            );
+        });
+        $this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
+
+        $this->registerService(\OCP\Route\IRouter::class, function (Server $c) {
+            $cacheFactory = $c->getMemCacheFactory();
+            $logger = $c->getLogger();
+            if ($cacheFactory->isLocalCacheAvailable()) {
+                $router = new \OC\Route\CachingRouter($cacheFactory->createLocal('route'), $logger);
+            } else {
+                $router = new \OC\Route\Router($logger);
+            }
+            return $router;
+        });
+        $this->registerAlias('Router', \OCP\Route\IRouter::class);
+
+        $this->registerService(\OCP\ISearch::class, function ($c) {
+            return new Search();
+        });
+        $this->registerAlias('Search', \OCP\ISearch::class);
+
+        $this->registerService(\OC\Security\RateLimiting\Limiter::class, function (Server $c) {
+            return new \OC\Security\RateLimiting\Limiter(
+                $this->getUserSession(),
+                $this->getRequest(),
+                new \OC\AppFramework\Utility\TimeFactory(),
+                $c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
+            );
+        });
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+            return new \OC\Security\RateLimiting\Backend\MemoryCache(
+                $this->getMemCacheFactory(),
+                new \OC\AppFramework\Utility\TimeFactory()
+            );
+        });
+
+        $this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
+            return new SecureRandom();
+        });
+        $this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
+
+        $this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
+            return new Crypto($c->getConfig(), $c->getSecureRandom());
+        });
+        $this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
+
+        $this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
+            return new Hasher($c->getConfig());
+        });
+        $this->registerAlias('Hasher', \OCP\Security\IHasher::class);
+
+        $this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
+            return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
+        });
+        $this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
+
+        $this->registerService(IDBConnection::class, function (Server $c) {
+            $systemConfig = $c->getSystemConfig();
+            $factory = new \OC\DB\ConnectionFactory($systemConfig);
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connectionParams = $factory->createConnectionParams();
+            $connection = $factory->getConnection($type, $connectionParams);
+            $connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
+            return $connection;
+        });
+        $this->registerAlias('DatabaseConnection', IDBConnection::class);
+
+
+        $this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) {
+            $user = \OC_User::getUser();
+            $uid = $user ? $user : null;
+            return new ClientService(
+                $c->getConfig(),
+                new \OC\Security\CertificateManager(
+                    $uid,
+                    new View(),
+                    $c->getConfig(),
+                    $c->getLogger(),
+                    $c->getSecureRandom()
+                )
+            );
+        });
+        $this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
+        $this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
+            $eventLogger = new EventLogger();
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $eventLogger->activate();
+            }
+            return $eventLogger;
+        });
+        $this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
+
+        $this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
+            $queryLogger = new QueryLogger();
+            if ($c->getSystemConfig()->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+        $this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
+
+        $this->registerService(TempManager::class, function (Server $c) {
+            return new TempManager(
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerAlias('TempManager', TempManager::class);
+        $this->registerAlias(ITempManager::class, TempManager::class);
+
+        $this->registerService(AppManager::class, function (Server $c) {
+            return new \OC\App\AppManager(
+                $c->getUserSession(),
+                $c->query(\OC\AppConfig::class),
+                $c->getGroupManager(),
+                $c->getMemCacheFactory(),
+                $c->getEventDispatcher()
+            );
+        });
+        $this->registerAlias('AppManager', AppManager::class);
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
+            return new DateTimeZone(
+                $c->getConfig(),
+                $c->getSession()
+            );
+        });
+        $this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
+
+        $this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) {
+            $language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->getDateTimeZone()->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+        $this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
+
+        $this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
+            $mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->getUserManager());
+            return $mountCache;
+        });
+        $this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
+
+        $this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
+            $loader = \OC\Files\Filesystem::getLoader();
+            $mountCache = $c->query('UserMountCache');
+            $manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
+
+            // builtin providers
+
+            $config = $c->getConfig();
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($config));
+
+            return $manager;
+        });
+        $this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
+
+        $this->registerService('IniWrapper', function ($c) {
+            return new IniGetWrapper();
+        });
+        $this->registerService('AsyncCommandBus', function (Server $c) {
+            $busClass = $c->getConfig()->getSystemValue('commandbus');
+            if ($busClass) {
+                list($app, $class) = explode('::', $busClass, 2);
+                if ($c->getAppManager()->isInstalled($app)) {
+                    \OC_App::loadApp($app);
+                    return $c->query($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->getJobList();
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerService('TrustedDomainHelper', function ($c) {
+            return new TrustedDomainHelper($this->getConfig());
+        });
+        $this->registerService('Throttler', function (Server $c) {
+            return new Throttler(
+                $c->getDatabaseConnection(),
+                new TimeFactory(),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+        $this->registerService('IntegrityCodeChecker', function (Server $c) {
+            // IConfig and IAppManager requires a working database. This code
+            // might however be called when ownCloud is not yet setup.
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
+                $config = $c->getConfig();
+                $appManager = $c->getAppManager();
+            } else {
+                $config = null;
+                $appManager = null;
+            }
+
+            return new Checker(
+                new EnvironmentHelper(),
+                new FileAccessHelper(),
+                new AppLocator(),
+                $config,
+                $c->getMemCacheFactory(),
+                $appManager,
+                $c->getTempManager()
+            );
+        });
+        $this->registerService(\OCP\IRequest::class, function ($c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : '',
+                    'urlParams' => $urlParams,
+                ],
+                $this->getSecureRandom(),
+                $this->getConfig(),
+                $this->getCsrfTokenManager(),
+                $stream
+            );
+        });
+        $this->registerAlias('Request', \OCP\IRequest::class);
+
+        $this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->getConfig(),
+                $c->getLogger(),
+                $c->query(Defaults::class),
+                $c->getURLGenerator(),
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
+
+        $this->registerService('LDAPProvider', function (Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if (is_null($factoryClass)) {
+                throw new \Exception('ldapProviderFactory not set');
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            $factory = new $factoryClass($this);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService(ILockingProvider::class, function (Server $c) {
+            $ini = $c->getIniWrapper();
+            $config = $c->getConfig();
+            $ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->getMemCacheFactory();
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    return new MemcacheLockingProvider($memcache, $ttl);
+                }
+                return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl);
+            }
+            return new NoopLockingProvider();
+        });
+        $this->registerAlias('LockingProvider', ILockingProvider::class);
+
+        $this->registerService(\OCP\Files\Mount\IMountManager::class, function () {
+            return new \OC\Files\Mount\Manager();
+        });
+        $this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
+
+        $this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
+            return new \OC\Files\Type\Detection(
+                $c->getURLGenerator(),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+        $this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
+
+        $this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
+            return new \OC\Files\Type\Loader(
+                $c->getDatabaseConnection()
+            );
+        });
+        $this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
+        $this->registerService(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
+            return new Manager(
+                $c->query(IValidator::class)
+            );
+        });
+        $this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
+
+        $this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
+            $manager = new \OC\CapabilitiesManager($c->getLogger());
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->getConfig());
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->query(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+        $this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
+
+        $this->registerService(\OCP\Comments\ICommentsManager::class, function (Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            $manager = $factory->getManager();
+
+            $manager->registerDisplayNameResolver('user', function($id) use ($c) {
+                $manager = $c->getUserManager();
+                $user = $manager->get($id);
+                if(is_null($user)) {
+                    $l = $c->getL10N('core');
+                    $displayName = $l->t('Unknown user');
+                } else {
+                    $displayName = $user->getDisplayName();
+                }
+                return $displayName;
+            });
+
+            return $manager;
+        });
+        $this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
+
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            /*
 			 * Dark magic for autoloader.
 			 * If we do a class_exists it will try to load the class which will
 			 * make composer cache the result. Resulting in errors when enabling
 			 * the theming app.
 			 */
-			$prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
-			if (isset($prefixes['OCA\\Theming\\'])) {
-				$classExists = true;
-			} else {
-				$classExists = false;
-			}
-
-			if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				return new ThemingDefaults(
-					$c->getConfig(),
-					$c->getL10N('theming'),
-					$c->getURLGenerator(),
-					$c->getAppDataDir('theming'),
-					$c->getMemCacheFactory(),
-					new Util($c->getConfig(), $this->getAppManager(), $this->getAppDataDir('theming')),
-					$this->getAppManager()
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(SCSSCacher::class, function (Server $c) {
-			/** @var Factory $cacheFactory */
-			$cacheFactory = $c->query(Factory::class);
-			return new SCSSCacher(
-				$c->getLogger(),
-				$c->query(\OC\Files\AppData\Factory::class),
-				$c->getURLGenerator(),
-				$c->getConfig(),
-				$c->getThemingDefaults(),
-				\OC::$SERVERROOT,
-				$this->getMemCacheFactory()
-			);
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			/** @var Factory $cacheFactory */
-			$cacheFactory = $c->query(Factory::class);
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->getURLGenerator(),
-				$this->getMemCacheFactory(),
-				$c->getSystemConfig(),
-				$c->getLogger()
-			);
-		});
-		$this->registerService(EventDispatcher::class, function () {
-			return new EventDispatcher();
-		});
-		$this->registerAlias('EventDispatcher', EventDispatcher::class);
-		$this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
-
-		$this->registerService('CryptoWrapper', function (Server $c) {
-			// FIXME: Instantiiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->getSecureRandom(),
-				$c->getConfig()
-			);
-
-			return new CryptoWrapper(
-				$c->getConfig(),
-				$c->getCrypto(),
-				$c->getSecureRandom(),
-				$request
-			);
-		});
-		$this->registerService('CsrfTokenManager', function (Server $c) {
-			$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
-
-			return new CsrfTokenManager(
-				$tokenGenerator,
-				$c->query(SessionStorage::class)
-			);
-		});
-		$this->registerService(SessionStorage::class, function (Server $c) {
-			return new SessionStorage($c->getSession());
-		});
-		$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
-			return new ContentSecurityPolicyManager();
-		});
-		$this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
-
-		$this->registerService('ContentSecurityPolicyNonceManager', function (Server $c) {
-			return new ContentSecurityPolicyNonceManager(
-				$c->getCsrfTokenManager(),
-				$c->getRequest()
-			);
-		});
-
-		$this->registerService(\OCP\Share\IManager::class, function (Server $c) {
-			$config = $c->getConfig();
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			$factory = new $factoryClass($this);
-
-			$manager = new \OC\Share20\Manager(
-				$c->getLogger(),
-				$c->getConfig(),
-				$c->getSecureRandom(),
-				$c->getHasher(),
-				$c->getMountManager(),
-				$c->getGroupManager(),
-				$c->getL10N('lib'),
-				$c->getL10NFactory(),
-				$factory,
-				$c->getUserManager(),
-				$c->getLazyRootFolder(),
-				$c->getEventDispatcher(),
-				$c->getMailer(),
-				$c->getURLGenerator(),
-				$c->getThemingDefaults()
-			);
-
-			return $manager;
-		});
-		$this->registerAlias('ShareManager', \OCP\Share\IManager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-
-			return $instance;
-		});
-		$this->registerAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
-
-		$this->registerService('SettingsManager', function (Server $c) {
-			$manager = new \OC\Settings\Manager(
-				$c->getLogger(),
-				$c->getDatabaseConnection(),
-				$c->getL10N('lib'),
-				$c->getConfig(),
-				$c->getEncryptionManager(),
-				$c->getUserManager(),
-				$c->getLockingProvider(),
-				$c->getRequest(),
-				$c->getURLGenerator(),
-				$c->query(AccountManager::class),
-				$c->getGroupManager(),
-				$c->getL10NFactory(),
-				$c->getAppManager()
-			);
-			return $manager;
-		});
-		$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->getRootFolder(),
-				$c->getSystemConfig()
-			);
-		});
-
-		$this->registerService('LockdownManager', function (Server $c) {
-			return new LockdownManager(function () use ($c) {
-				return $c->getSession();
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
-			return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
-		});
-
-		$this->registerService(ICloudIdManager::class, function (Server $c) {
-			return new CloudIdManager();
-		});
-
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
-		$this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
-
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
-
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->getThemingDefaults()
-			);
-		});
-		$this->registerAlias('Defaults', \OCP\Defaults::class);
-
-		$this->registerService(\OCP\ISession::class, function (SimpleContainer $c) {
-			return $c->query(\OCP\IUserSession::class)->getSession();
-		});
-
-		$this->registerService(IShareHelper::class, function (Server $c) {
-			return new ShareHelper(
-				$c->query(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(Installer::class, function(Server $c) {
-			return new Installer(
-				$c->getAppFetcher(),
-				$c->getHTTPClientService(),
-				$c->getTempManager(),
-				$c->getLogger(),
-				$c->getConfig()
-			);
-		});
-
-		$this->registerService(IApiFactory::class, function(Server $c) {
-			return new ApiFactory($c->getHTTPClientService());
-		});
-
-		$this->registerService(IInstanceFactory::class, function(Server $c) {
-			$memcacheFactory = $c->getMemCacheFactory();
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->getHTTPClientService());
-		});
-
-		$this->registerService(IContactsStore::class, function(Server $c) {
-			return new ContactsStore(
-				$c->getContactsManager(),
-				$c->getConfig(),
-				$c->getUserManager(),
-				$c->getGroupManager()
-			);
-		});
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-
-		$this->connectDispatcher();
-	}
-
-	/**
-	 * @return \OCP\Calendar\IManager
-	 */
-	public function getCalendarManager() {
-		return $this->query('CalendarManager');
-	}
-
-	private function connectDispatcher() {
-		$dispatcher = $this->getEventDispatcher();
-
-		// Delete avatar on user deletion
-		$dispatcher->addListener('OCP\IUser::preDelete', function(GenericEvent $e) {
-			$logger = $this->getLogger();
-			$manager = $this->getAvatarManager();
-			/** @var IUser $user */
-			$user = $e->getSubject();
-
-			try {
-				$avatar = $manager->getAvatar($user->getUID());
-				$avatar->remove();
-			} catch (NotFoundException $e) {
-				// no avatar to remove
-			} catch (\Exception $e) {
-				// Ignore exceptions
-				$logger->info('Could not cleanup avatar of ' . $user->getUID());
-			}
-		});
-
-		$dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
-			$manager = $this->getAvatarManager();
-			/** @var IUser $user */
-			$user = $e->getSubject();
-			$feature = $e->getArgument('feature');
-			$oldValue = $e->getArgument('oldValue');
-			$value = $e->getArgument('value');
-
-			try {
-				$avatar = $manager->getAvatar($user->getUID());
-				$avatar->userChanged($feature, $oldValue, $value);
-			} catch (NotFoundException $e) {
-				// no avatar to remove
-			}
-		});
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 */
-	public function getContactsManager() {
-		return $this->query('ContactsManager');
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 */
-	public function getEncryptionManager() {
-		return $this->query('EncryptionManager');
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->query('EncryptionFileHelper');
-	}
-
-	/**
-	 * @return \OCP\Encryption\Keys\IStorage
-	 */
-	public function getEncryptionKeyStorage() {
-		return $this->query('EncryptionKeyStorage');
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 */
-	public function getRequest() {
-		return $this->query('Request');
-	}
-
-	/**
-	 * Returns the preview manager which can create preview images for a given file
-	 *
-	 * @return \OCP\IPreview
-	 */
-	public function getPreviewManager() {
-		return $this->query('PreviewManager');
-	}
-
-	/**
-	 * Returns the tag manager which can get and set tags for different object types
-	 *
-	 * @see \OCP\ITagManager::load()
-	 * @return \OCP\ITagManager
-	 */
-	public function getTagManager() {
-		return $this->query('TagManager');
-	}
-
-	/**
-	 * Returns the system-tag manager
-	 *
-	 * @return \OCP\SystemTag\ISystemTagManager
-	 *
-	 * @since 9.0.0
-	 */
-	public function getSystemTagManager() {
-		return $this->query('SystemTagManager');
-	}
-
-	/**
-	 * Returns the system-tag object mapper
-	 *
-	 * @return \OCP\SystemTag\ISystemTagObjectMapper
-	 *
-	 * @since 9.0.0
-	 */
-	public function getSystemTagObjectMapper() {
-		return $this->query('SystemTagObjectMapper');
-	}
-
-	/**
-	 * Returns the avatar manager, used for avatar functionality
-	 *
-	 * @return \OCP\IAvatarManager
-	 */
-	public function getAvatarManager() {
-		return $this->query('AvatarManager');
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return \OCP\Files\IRootFolder
-	 */
-	public function getRootFolder() {
-		return $this->query('LazyRootFolder');
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return \OCP\Files\IRootFolder
-	 */
-	public function getLazyRootFolder() {
-		return $this->query('LazyRootFolder');
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->getUserSession()->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->getRootFolder();
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * Returns an app-specific view in ownClouds data directory
-	 *
-	 * @return \OCP\Files\Folder
-	 * @deprecated since 9.2.0 use IAppData
-	 */
-	public function getAppFolder() {
-		$dir = '/' . \OC_App::getCurrentApp();
-		$root = $this->getRootFolder();
-		if (!$root->nodeExists($dir)) {
-			$folder = $root->newFolder($dir);
-		} else {
-			$folder = $root->get($dir);
-		}
-		return $folder;
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 */
-	public function getUserManager() {
-		return $this->query('UserManager');
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 */
-	public function getGroupManager() {
-		return $this->query('GroupManager');
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 */
-	public function getUserSession() {
-		return $this->query('UserSession');
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 */
-	public function getSession() {
-		return $this->query('UserSession')->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->query(SessionStorage::class)->setSession($session);
-		$this->query('UserSession')->setSession($session);
-		$this->query(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OC\Authentication\TwoFactorAuth\Manager
-	 */
-	public function getTwoFactorAuthManager() {
-		return $this->query('\OC\Authentication\TwoFactorAuth\Manager');
-	}
-
-	/**
-	 * @return \OC\NavigationManager
-	 */
-	public function getNavigationManager() {
-		return $this->query('NavigationManager');
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 */
-	public function getConfig() {
-		return $this->query('AllConfig');
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 */
-	public function getSystemConfig() {
-		return $this->query('SystemConfig');
-	}
-
-	/**
-	 * Returns the app config manager
-	 *
-	 * @return \OCP\IAppConfig
-	 */
-	public function getAppConfig() {
-		return $this->query('AppConfig');
-	}
-
-	/**
-	 * @return \OCP\L10N\IFactory
-	 */
-	public function getL10NFactory() {
-		return $this->query('L10NFactory');
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->getL10NFactory()->get($app, $lang);
-	}
-
-	/**
-	 * @return \OCP\IURLGenerator
-	 */
-	public function getURLGenerator() {
-		return $this->query('URLGenerator');
-	}
-
-	/**
-	 * @return AppFetcher
-	 */
-	public function getAppFetcher() {
-		return $this->query(AppFetcher::class);
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return \OCP\ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->query('UserCache');
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 */
-	public function getMemCacheFactory() {
-		return $this->query('MemCacheFactory');
-	}
-
-	/**
-	 * Returns an \OC\RedisFactory instance
-	 *
-	 * @return \OC\RedisFactory
-	 */
-	public function getGetRedisFactory() {
-		return $this->query('RedisFactory');
-	}
-
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 */
-	public function getDatabaseConnection() {
-		return $this->query('DatabaseConnection');
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 */
-	public function getActivityManager() {
-		return $this->query('ActivityManager');
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return \OCP\BackgroundJob\IJobList
-	 */
-	public function getJobList() {
-		return $this->query('JobList');
-	}
-
-	/**
-	 * Returns a logger instance
-	 *
-	 * @return \OCP\ILogger
-	 */
-	public function getLogger() {
-		return $this->query('Logger');
-	}
-
-	/**
-	 * Returns a router for generating and matching urls
-	 *
-	 * @return \OCP\Route\IRouter
-	 */
-	public function getRouter() {
-		return $this->query('Router');
-	}
-
-	/**
-	 * Returns a search instance
-	 *
-	 * @return \OCP\ISearch
-	 */
-	public function getSearch() {
-		return $this->query('Search');
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 */
-	public function getSecureRandom() {
-		return $this->query('SecureRandom');
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return \OCP\Security\ICrypto
-	 */
-	public function getCrypto() {
-		return $this->query('Crypto');
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return \OCP\Security\IHasher
-	 */
-	public function getHasher() {
-		return $this->query('Hasher');
-	}
-
-	/**
-	 * Returns a CredentialsManager instance
-	 *
-	 * @return \OCP\Security\ICredentialsManager
-	 */
-	public function getCredentialsManager() {
-		return $this->query('CredentialsManager');
-	}
-
-	/**
-	 * Get the certificate manager for the user
-	 *
-	 * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
-	 * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
-	 */
-	public function getCertificateManager($userId = '') {
-		if ($userId === '') {
-			$userSession = $this->getUserSession();
-			$user = $userSession->getUser();
-			if (is_null($user)) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		return new CertificateManager(
-			$userId,
-			new View(),
-			$this->getConfig(),
-			$this->getLogger(),
-			$this->getSecureRandom()
-		);
-	}
-
-	/**
-	 * Returns an instance of the HTTP client service
-	 *
-	 * @return \OCP\Http\Client\IClientService
-	 */
-	public function getHTTPClientService() {
-		return $this->query('HttpClientService');
-	}
-
-	/**
-	 * Create a new event source
-	 *
-	 * @return \OCP\IEventSource
-	 */
-	public function createEventSource() {
-		return new \OC_EventSource();
-	}
-
-	/**
-	 * Get the active event logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return \OCP\Diagnostics\IEventLogger
-	 */
-	public function getEventLogger() {
-		return $this->query('EventLogger');
-	}
-
-	/**
-	 * Get the active query logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return \OCP\Diagnostics\IQueryLogger
-	 */
-	public function getQueryLogger() {
-		return $this->query('QueryLogger');
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 */
-	public function getTempManager() {
-		return $this->query('TempManager');
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 */
-	public function getAppManager() {
-		return $this->query('AppManager');
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return \OCP\Mail\IMailer
-	 */
-	public function getMailer() {
-		return $this->query('Mailer');
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * @return \OC\OCSClient
-	 */
-	public function getOcsClient() {
-		return $this->query('OcsClient');
-	}
-
-	/**
-	 * @return \OCP\IDateTimeZone
-	 */
-	public function getDateTimeZone() {
-		return $this->query('DateTimeZone');
-	}
-
-	/**
-	 * @return \OCP\IDateTimeFormatter
-	 */
-	public function getDateTimeFormatter() {
-		return $this->query('DateTimeFormatter');
-	}
-
-	/**
-	 * @return \OCP\Files\Config\IMountProviderCollection
-	 */
-	public function getMountProviderCollection() {
-		return $this->query('MountConfigManager');
-	}
-
-	/**
-	 * Get the IniWrapper
-	 *
-	 * @return IniGetWrapper
-	 */
-	public function getIniWrapper() {
-		return $this->query('IniWrapper');
-	}
-
-	/**
-	 * @return \OCP\Command\IBus
-	 */
-	public function getCommandBus() {
-		return $this->query('AsyncCommandBus');
-	}
-
-	/**
-	 * Get the trusted domain helper
-	 *
-	 * @return TrustedDomainHelper
-	 */
-	public function getTrustedDomainHelper() {
-		return $this->query('TrustedDomainHelper');
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return \OCP\Lock\ILockingProvider
-	 * @since 8.1.0
-	 */
-	public function getLockingProvider() {
-		return $this->query('LockingProvider');
-	}
-
-	/**
-	 * @return \OCP\Files\Mount\IMountManager
-	 **/
-	function getMountManager() {
-		return $this->query('MountManager');
-	}
-
-	/** @return \OCP\Files\Config\IUserMountCache */
-	function getUserMountCache() {
-		return $this->query('UserMountCache');
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return \OCP\Files\IMimeTypeDetector
-	 */
-	public function getMimeTypeDetector() {
-		return $this->query('MimeTypeDetector');
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return \OCP\Files\IMimeTypeLoader
-	 */
-	public function getMimeTypeLoader() {
-		return $this->query('MimeTypeLoader');
-	}
-
-	/**
-	 * Get the manager of all the capabilities
-	 *
-	 * @return \OC\CapabilitiesManager
-	 */
-	public function getCapabilitiesManager() {
-		return $this->query('CapabilitiesManager');
-	}
-
-	/**
-	 * Get the EventDispatcher
-	 *
-	 * @return EventDispatcherInterface
-	 * @since 8.2.0
-	 */
-	public function getEventDispatcher() {
-		return $this->query('EventDispatcher');
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 */
-	public function getNotificationManager() {
-		return $this->query('NotificationManager');
-	}
-
-	/**
-	 * @return \OCP\Comments\ICommentsManager
-	 */
-	public function getCommentsManager() {
-		return $this->query('CommentsManager');
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 */
-	public function getThemingDefaults() {
-		return $this->query('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->query('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return \OC\Session\CryptoWrapper
-	 */
-	public function getSessionCryptoWrapper() {
-		return $this->query('CryptoWrapper');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 */
-	public function getCsrfTokenManager() {
-		return $this->query('CsrfTokenManager');
-	}
-
-	/**
-	 * @return Throttler
-	 */
-	public function getBruteForceThrottler() {
-		return $this->query('Throttler');
-	}
-
-	/**
-	 * @return IContentSecurityPolicyManager
-	 */
-	public function getContentSecurityPolicyManager() {
-		return $this->query('ContentSecurityPolicyManager');
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->query('ContentSecurityPolicyNonceManager');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\BackendService
-	 */
-	public function getStoragesBackendService() {
-		return $this->query('OCA\\Files_External\\Service\\BackendService');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\GlobalStoragesService
-	 */
-	public function getGlobalStoragesService() {
-		return $this->query('OCA\\Files_External\\Service\\GlobalStoragesService');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserGlobalStoragesService
-	 */
-	public function getUserGlobalStoragesService() {
-		return $this->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
-	}
-
-	/**
-	 * Not a public API as of 8.2, wait for 9.0
-	 *
-	 * @return \OCA\Files_External\Service\UserStoragesService
-	 */
-	public function getUserStoragesService() {
-		return $this->query('OCA\\Files_External\\Service\\UserStoragesService');
-	}
-
-	/**
-	 * @return \OCP\Share\IManager
-	 */
-	public function getShareManager() {
-		return $this->query('ShareManager');
-	}
-
-	/**
-	 * @return \OCP\Collaboration\Collaborators\ISearch
-	 */
-	public function getCollaboratorSearch() {
-		return $this->query('CollaboratorSearch');
-	}
-
-	/**
-	 * @return \OCP\Collaboration\AutoComplete\IManager
-	 */
-	public function getAutoCompleteManager(){
-		return $this->query(IManager::class);
-	}
-
-	/**
-	 * Returns the LDAP Provider
-	 *
-	 * @return \OCP\LDAP\ILDAPProvider
-	 */
-	public function getLDAPProvider() {
-		return $this->query('LDAPProvider');
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 */
-	public function getSettingsManager() {
-		return $this->query('SettingsManager');
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 */
-	public function getAppDataDir($app) {
-		/** @var \OC\Files\AppData\Factory $factory */
-		$factory = $this->query(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Lockdown\ILockdownManager
-	 */
-	public function getLockdownManager() {
-		return $this->query('LockdownManager');
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 */
-	public function getCloudIdManager() {
-		return $this->query(ICloudIdManager::class);
-	}
-
-	/**
-	 * @return \OCP\Remote\Api\IApiFactory
-	 */
-	public function getRemoteApiFactory() {
-		return $this->query(IApiFactory::class);
-	}
-
-	/**
-	 * @return \OCP\Remote\IInstanceFactory
-	 */
-	public function getRemoteInstanceFactory() {
-		return $this->query(IInstanceFactory::class);
-	}
+            $prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
+            if (isset($prefixes['OCA\\Theming\\'])) {
+                $classExists = true;
+            } else {
+                $classExists = false;
+            }
+
+            if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming') && $c->getTrustedDomainHelper()->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                return new ThemingDefaults(
+                    $c->getConfig(),
+                    $c->getL10N('theming'),
+                    $c->getURLGenerator(),
+                    $c->getAppDataDir('theming'),
+                    $c->getMemCacheFactory(),
+                    new Util($c->getConfig(), $this->getAppManager(), $this->getAppDataDir('theming')),
+                    $this->getAppManager()
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(SCSSCacher::class, function (Server $c) {
+            /** @var Factory $cacheFactory */
+            $cacheFactory = $c->query(Factory::class);
+            return new SCSSCacher(
+                $c->getLogger(),
+                $c->query(\OC\Files\AppData\Factory::class),
+                $c->getURLGenerator(),
+                $c->getConfig(),
+                $c->getThemingDefaults(),
+                \OC::$SERVERROOT,
+                $this->getMemCacheFactory()
+            );
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            /** @var Factory $cacheFactory */
+            $cacheFactory = $c->query(Factory::class);
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->getURLGenerator(),
+                $this->getMemCacheFactory(),
+                $c->getSystemConfig(),
+                $c->getLogger()
+            );
+        });
+        $this->registerService(EventDispatcher::class, function () {
+            return new EventDispatcher();
+        });
+        $this->registerAlias('EventDispatcher', EventDispatcher::class);
+        $this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
+
+        $this->registerService('CryptoWrapper', function (Server $c) {
+            // FIXME: Instantiiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->getSecureRandom(),
+                $c->getConfig()
+            );
+
+            return new CryptoWrapper(
+                $c->getConfig(),
+                $c->getCrypto(),
+                $c->getSecureRandom(),
+                $request
+            );
+        });
+        $this->registerService('CsrfTokenManager', function (Server $c) {
+            $tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
+
+            return new CsrfTokenManager(
+                $tokenGenerator,
+                $c->query(SessionStorage::class)
+            );
+        });
+        $this->registerService(SessionStorage::class, function (Server $c) {
+            return new SessionStorage($c->getSession());
+        });
+        $this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
+            return new ContentSecurityPolicyManager();
+        });
+        $this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
+
+        $this->registerService('ContentSecurityPolicyNonceManager', function (Server $c) {
+            return new ContentSecurityPolicyNonceManager(
+                $c->getCsrfTokenManager(),
+                $c->getRequest()
+            );
+        });
+
+        $this->registerService(\OCP\Share\IManager::class, function (Server $c) {
+            $config = $c->getConfig();
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            $factory = new $factoryClass($this);
+
+            $manager = new \OC\Share20\Manager(
+                $c->getLogger(),
+                $c->getConfig(),
+                $c->getSecureRandom(),
+                $c->getHasher(),
+                $c->getMountManager(),
+                $c->getGroupManager(),
+                $c->getL10N('lib'),
+                $c->getL10NFactory(),
+                $factory,
+                $c->getUserManager(),
+                $c->getLazyRootFolder(),
+                $c->getEventDispatcher(),
+                $c->getMailer(),
+                $c->getURLGenerator(),
+                $c->getThemingDefaults()
+            );
+
+            return $manager;
+        });
+        $this->registerAlias('ShareManager', \OCP\Share\IManager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function(Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+
+            return $instance;
+        });
+        $this->registerAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
+
+        $this->registerService('SettingsManager', function (Server $c) {
+            $manager = new \OC\Settings\Manager(
+                $c->getLogger(),
+                $c->getDatabaseConnection(),
+                $c->getL10N('lib'),
+                $c->getConfig(),
+                $c->getEncryptionManager(),
+                $c->getUserManager(),
+                $c->getLockingProvider(),
+                $c->getRequest(),
+                $c->getURLGenerator(),
+                $c->query(AccountManager::class),
+                $c->getGroupManager(),
+                $c->getL10NFactory(),
+                $c->getAppManager()
+            );
+            return $manager;
+        });
+        $this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->getRootFolder(),
+                $c->getSystemConfig()
+            );
+        });
+
+        $this->registerService('LockdownManager', function (Server $c) {
+            return new LockdownManager(function () use ($c) {
+                return $c->getSession();
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
+            return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
+        });
+
+        $this->registerService(ICloudIdManager::class, function (Server $c) {
+            return new CloudIdManager();
+        });
+
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
+
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
+
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->getThemingDefaults()
+            );
+        });
+        $this->registerAlias('Defaults', \OCP\Defaults::class);
+
+        $this->registerService(\OCP\ISession::class, function (SimpleContainer $c) {
+            return $c->query(\OCP\IUserSession::class)->getSession();
+        });
+
+        $this->registerService(IShareHelper::class, function (Server $c) {
+            return new ShareHelper(
+                $c->query(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(Installer::class, function(Server $c) {
+            return new Installer(
+                $c->getAppFetcher(),
+                $c->getHTTPClientService(),
+                $c->getTempManager(),
+                $c->getLogger(),
+                $c->getConfig()
+            );
+        });
+
+        $this->registerService(IApiFactory::class, function(Server $c) {
+            return new ApiFactory($c->getHTTPClientService());
+        });
+
+        $this->registerService(IInstanceFactory::class, function(Server $c) {
+            $memcacheFactory = $c->getMemCacheFactory();
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->getHTTPClientService());
+        });
+
+        $this->registerService(IContactsStore::class, function(Server $c) {
+            return new ContactsStore(
+                $c->getContactsManager(),
+                $c->getConfig(),
+                $c->getUserManager(),
+                $c->getGroupManager()
+            );
+        });
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+
+        $this->connectDispatcher();
+    }
+
+    /**
+     * @return \OCP\Calendar\IManager
+     */
+    public function getCalendarManager() {
+        return $this->query('CalendarManager');
+    }
+
+    private function connectDispatcher() {
+        $dispatcher = $this->getEventDispatcher();
+
+        // Delete avatar on user deletion
+        $dispatcher->addListener('OCP\IUser::preDelete', function(GenericEvent $e) {
+            $logger = $this->getLogger();
+            $manager = $this->getAvatarManager();
+            /** @var IUser $user */
+            $user = $e->getSubject();
+
+            try {
+                $avatar = $manager->getAvatar($user->getUID());
+                $avatar->remove();
+            } catch (NotFoundException $e) {
+                // no avatar to remove
+            } catch (\Exception $e) {
+                // Ignore exceptions
+                $logger->info('Could not cleanup avatar of ' . $user->getUID());
+            }
+        });
+
+        $dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
+            $manager = $this->getAvatarManager();
+            /** @var IUser $user */
+            $user = $e->getSubject();
+            $feature = $e->getArgument('feature');
+            $oldValue = $e->getArgument('oldValue');
+            $value = $e->getArgument('value');
+
+            try {
+                $avatar = $manager->getAvatar($user->getUID());
+                $avatar->userChanged($feature, $oldValue, $value);
+            } catch (NotFoundException $e) {
+                // no avatar to remove
+            }
+        });
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     */
+    public function getContactsManager() {
+        return $this->query('ContactsManager');
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     */
+    public function getEncryptionManager() {
+        return $this->query('EncryptionManager');
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->query('EncryptionFileHelper');
+    }
+
+    /**
+     * @return \OCP\Encryption\Keys\IStorage
+     */
+    public function getEncryptionKeyStorage() {
+        return $this->query('EncryptionKeyStorage');
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     */
+    public function getRequest() {
+        return $this->query('Request');
+    }
+
+    /**
+     * Returns the preview manager which can create preview images for a given file
+     *
+     * @return \OCP\IPreview
+     */
+    public function getPreviewManager() {
+        return $this->query('PreviewManager');
+    }
+
+    /**
+     * Returns the tag manager which can get and set tags for different object types
+     *
+     * @see \OCP\ITagManager::load()
+     * @return \OCP\ITagManager
+     */
+    public function getTagManager() {
+        return $this->query('TagManager');
+    }
+
+    /**
+     * Returns the system-tag manager
+     *
+     * @return \OCP\SystemTag\ISystemTagManager
+     *
+     * @since 9.0.0
+     */
+    public function getSystemTagManager() {
+        return $this->query('SystemTagManager');
+    }
+
+    /**
+     * Returns the system-tag object mapper
+     *
+     * @return \OCP\SystemTag\ISystemTagObjectMapper
+     *
+     * @since 9.0.0
+     */
+    public function getSystemTagObjectMapper() {
+        return $this->query('SystemTagObjectMapper');
+    }
+
+    /**
+     * Returns the avatar manager, used for avatar functionality
+     *
+     * @return \OCP\IAvatarManager
+     */
+    public function getAvatarManager() {
+        return $this->query('AvatarManager');
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return \OCP\Files\IRootFolder
+     */
+    public function getRootFolder() {
+        return $this->query('LazyRootFolder');
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return \OCP\Files\IRootFolder
+     */
+    public function getLazyRootFolder() {
+        return $this->query('LazyRootFolder');
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->getUserSession()->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->getRootFolder();
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * Returns an app-specific view in ownClouds data directory
+     *
+     * @return \OCP\Files\Folder
+     * @deprecated since 9.2.0 use IAppData
+     */
+    public function getAppFolder() {
+        $dir = '/' . \OC_App::getCurrentApp();
+        $root = $this->getRootFolder();
+        if (!$root->nodeExists($dir)) {
+            $folder = $root->newFolder($dir);
+        } else {
+            $folder = $root->get($dir);
+        }
+        return $folder;
+    }
+
+    /**
+     * @return \OC\User\Manager
+     */
+    public function getUserManager() {
+        return $this->query('UserManager');
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     */
+    public function getGroupManager() {
+        return $this->query('GroupManager');
+    }
+
+    /**
+     * @return \OC\User\Session
+     */
+    public function getUserSession() {
+        return $this->query('UserSession');
+    }
+
+    /**
+     * @return \OCP\ISession
+     */
+    public function getSession() {
+        return $this->query('UserSession')->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->query(SessionStorage::class)->setSession($session);
+        $this->query('UserSession')->setSession($session);
+        $this->query(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OC\Authentication\TwoFactorAuth\Manager
+     */
+    public function getTwoFactorAuthManager() {
+        return $this->query('\OC\Authentication\TwoFactorAuth\Manager');
+    }
+
+    /**
+     * @return \OC\NavigationManager
+     */
+    public function getNavigationManager() {
+        return $this->query('NavigationManager');
+    }
+
+    /**
+     * @return \OCP\IConfig
+     */
+    public function getConfig() {
+        return $this->query('AllConfig');
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     */
+    public function getSystemConfig() {
+        return $this->query('SystemConfig');
+    }
+
+    /**
+     * Returns the app config manager
+     *
+     * @return \OCP\IAppConfig
+     */
+    public function getAppConfig() {
+        return $this->query('AppConfig');
+    }
+
+    /**
+     * @return \OCP\L10N\IFactory
+     */
+    public function getL10NFactory() {
+        return $this->query('L10NFactory');
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->getL10NFactory()->get($app, $lang);
+    }
+
+    /**
+     * @return \OCP\IURLGenerator
+     */
+    public function getURLGenerator() {
+        return $this->query('URLGenerator');
+    }
+
+    /**
+     * @return AppFetcher
+     */
+    public function getAppFetcher() {
+        return $this->query(AppFetcher::class);
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return \OCP\ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->query('UserCache');
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     */
+    public function getMemCacheFactory() {
+        return $this->query('MemCacheFactory');
+    }
+
+    /**
+     * Returns an \OC\RedisFactory instance
+     *
+     * @return \OC\RedisFactory
+     */
+    public function getGetRedisFactory() {
+        return $this->query('RedisFactory');
+    }
+
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     */
+    public function getDatabaseConnection() {
+        return $this->query('DatabaseConnection');
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     */
+    public function getActivityManager() {
+        return $this->query('ActivityManager');
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return \OCP\BackgroundJob\IJobList
+     */
+    public function getJobList() {
+        return $this->query('JobList');
+    }
+
+    /**
+     * Returns a logger instance
+     *
+     * @return \OCP\ILogger
+     */
+    public function getLogger() {
+        return $this->query('Logger');
+    }
+
+    /**
+     * Returns a router for generating and matching urls
+     *
+     * @return \OCP\Route\IRouter
+     */
+    public function getRouter() {
+        return $this->query('Router');
+    }
+
+    /**
+     * Returns a search instance
+     *
+     * @return \OCP\ISearch
+     */
+    public function getSearch() {
+        return $this->query('Search');
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     */
+    public function getSecureRandom() {
+        return $this->query('SecureRandom');
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return \OCP\Security\ICrypto
+     */
+    public function getCrypto() {
+        return $this->query('Crypto');
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return \OCP\Security\IHasher
+     */
+    public function getHasher() {
+        return $this->query('Hasher');
+    }
+
+    /**
+     * Returns a CredentialsManager instance
+     *
+     * @return \OCP\Security\ICredentialsManager
+     */
+    public function getCredentialsManager() {
+        return $this->query('CredentialsManager');
+    }
+
+    /**
+     * Get the certificate manager for the user
+     *
+     * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
+     * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
+     */
+    public function getCertificateManager($userId = '') {
+        if ($userId === '') {
+            $userSession = $this->getUserSession();
+            $user = $userSession->getUser();
+            if (is_null($user)) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        return new CertificateManager(
+            $userId,
+            new View(),
+            $this->getConfig(),
+            $this->getLogger(),
+            $this->getSecureRandom()
+        );
+    }
+
+    /**
+     * Returns an instance of the HTTP client service
+     *
+     * @return \OCP\Http\Client\IClientService
+     */
+    public function getHTTPClientService() {
+        return $this->query('HttpClientService');
+    }
+
+    /**
+     * Create a new event source
+     *
+     * @return \OCP\IEventSource
+     */
+    public function createEventSource() {
+        return new \OC_EventSource();
+    }
+
+    /**
+     * Get the active event logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return \OCP\Diagnostics\IEventLogger
+     */
+    public function getEventLogger() {
+        return $this->query('EventLogger');
+    }
+
+    /**
+     * Get the active query logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return \OCP\Diagnostics\IQueryLogger
+     */
+    public function getQueryLogger() {
+        return $this->query('QueryLogger');
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     */
+    public function getTempManager() {
+        return $this->query('TempManager');
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     */
+    public function getAppManager() {
+        return $this->query('AppManager');
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return \OCP\Mail\IMailer
+     */
+    public function getMailer() {
+        return $this->query('Mailer');
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * @return \OC\OCSClient
+     */
+    public function getOcsClient() {
+        return $this->query('OcsClient');
+    }
+
+    /**
+     * @return \OCP\IDateTimeZone
+     */
+    public function getDateTimeZone() {
+        return $this->query('DateTimeZone');
+    }
+
+    /**
+     * @return \OCP\IDateTimeFormatter
+     */
+    public function getDateTimeFormatter() {
+        return $this->query('DateTimeFormatter');
+    }
+
+    /**
+     * @return \OCP\Files\Config\IMountProviderCollection
+     */
+    public function getMountProviderCollection() {
+        return $this->query('MountConfigManager');
+    }
+
+    /**
+     * Get the IniWrapper
+     *
+     * @return IniGetWrapper
+     */
+    public function getIniWrapper() {
+        return $this->query('IniWrapper');
+    }
+
+    /**
+     * @return \OCP\Command\IBus
+     */
+    public function getCommandBus() {
+        return $this->query('AsyncCommandBus');
+    }
+
+    /**
+     * Get the trusted domain helper
+     *
+     * @return TrustedDomainHelper
+     */
+    public function getTrustedDomainHelper() {
+        return $this->query('TrustedDomainHelper');
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return \OCP\Lock\ILockingProvider
+     * @since 8.1.0
+     */
+    public function getLockingProvider() {
+        return $this->query('LockingProvider');
+    }
+
+    /**
+     * @return \OCP\Files\Mount\IMountManager
+     **/
+    function getMountManager() {
+        return $this->query('MountManager');
+    }
+
+    /** @return \OCP\Files\Config\IUserMountCache */
+    function getUserMountCache() {
+        return $this->query('UserMountCache');
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return \OCP\Files\IMimeTypeDetector
+     */
+    public function getMimeTypeDetector() {
+        return $this->query('MimeTypeDetector');
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return \OCP\Files\IMimeTypeLoader
+     */
+    public function getMimeTypeLoader() {
+        return $this->query('MimeTypeLoader');
+    }
+
+    /**
+     * Get the manager of all the capabilities
+     *
+     * @return \OC\CapabilitiesManager
+     */
+    public function getCapabilitiesManager() {
+        return $this->query('CapabilitiesManager');
+    }
+
+    /**
+     * Get the EventDispatcher
+     *
+     * @return EventDispatcherInterface
+     * @since 8.2.0
+     */
+    public function getEventDispatcher() {
+        return $this->query('EventDispatcher');
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     */
+    public function getNotificationManager() {
+        return $this->query('NotificationManager');
+    }
+
+    /**
+     * @return \OCP\Comments\ICommentsManager
+     */
+    public function getCommentsManager() {
+        return $this->query('CommentsManager');
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     */
+    public function getThemingDefaults() {
+        return $this->query('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->query('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return \OC\Session\CryptoWrapper
+     */
+    public function getSessionCryptoWrapper() {
+        return $this->query('CryptoWrapper');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     */
+    public function getCsrfTokenManager() {
+        return $this->query('CsrfTokenManager');
+    }
+
+    /**
+     * @return Throttler
+     */
+    public function getBruteForceThrottler() {
+        return $this->query('Throttler');
+    }
+
+    /**
+     * @return IContentSecurityPolicyManager
+     */
+    public function getContentSecurityPolicyManager() {
+        return $this->query('ContentSecurityPolicyManager');
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->query('ContentSecurityPolicyNonceManager');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\BackendService
+     */
+    public function getStoragesBackendService() {
+        return $this->query('OCA\\Files_External\\Service\\BackendService');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\GlobalStoragesService
+     */
+    public function getGlobalStoragesService() {
+        return $this->query('OCA\\Files_External\\Service\\GlobalStoragesService');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserGlobalStoragesService
+     */
+    public function getUserGlobalStoragesService() {
+        return $this->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
+    }
+
+    /**
+     * Not a public API as of 8.2, wait for 9.0
+     *
+     * @return \OCA\Files_External\Service\UserStoragesService
+     */
+    public function getUserStoragesService() {
+        return $this->query('OCA\\Files_External\\Service\\UserStoragesService');
+    }
+
+    /**
+     * @return \OCP\Share\IManager
+     */
+    public function getShareManager() {
+        return $this->query('ShareManager');
+    }
+
+    /**
+     * @return \OCP\Collaboration\Collaborators\ISearch
+     */
+    public function getCollaboratorSearch() {
+        return $this->query('CollaboratorSearch');
+    }
+
+    /**
+     * @return \OCP\Collaboration\AutoComplete\IManager
+     */
+    public function getAutoCompleteManager(){
+        return $this->query(IManager::class);
+    }
+
+    /**
+     * Returns the LDAP Provider
+     *
+     * @return \OCP\LDAP\ILDAPProvider
+     */
+    public function getLDAPProvider() {
+        return $this->query('LDAPProvider');
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     */
+    public function getSettingsManager() {
+        return $this->query('SettingsManager');
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     */
+    public function getAppDataDir($app) {
+        /** @var \OC\Files\AppData\Factory $factory */
+        $factory = $this->query(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Lockdown\ILockdownManager
+     */
+    public function getLockdownManager() {
+        return $this->query('LockdownManager');
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     */
+    public function getCloudIdManager() {
+        return $this->query(ICloudIdManager::class);
+    }
+
+    /**
+     * @return \OCP\Remote\Api\IApiFactory
+     */
+    public function getRemoteApiFactory() {
+        return $this->query(IApiFactory::class);
+    }
+
+    /**
+     * @return \OCP\Remote\IInstanceFactory
+     */
+    public function getRemoteInstanceFactory() {
+        return $this->query(IInstanceFactory::class);
+    }
 }

Spacing +113 added lines, -113 removed lines

@@ -161,7 +161,7 @@ 
 		parent::__construct();
 		$this->webRoot = $webRoot;
 
-		$this->registerService(\OCP\IServerContainer::class, function (IServerContainer $c) {
+		$this->registerService(\OCP\IServerContainer::class, function(IServerContainer $c) {
 			return $c;
 		});
 
@@ -174,7 +174,7 @@ 
 		$this->registerAlias(IActionFactory::class, ActionFactory::class);
 
 
-		$this->registerService(\OCP\IPreview::class, function (Server $c) {
+		$this->registerService(\OCP\IPreview::class, function(Server $c) {
 			return new PreviewManager(
 				$c->getConfig(),
 				$c->getRootFolder(),
@@ -185,13 +185,13 @@ 
 		});
 		$this->registerAlias('PreviewManager', \OCP\IPreview::class);
 
-		$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
+		$this->registerService(\OC\Preview\Watcher::class, function(Server $c) {
 			return new \OC\Preview\Watcher(
 				$c->getAppDataDir('preview')
 			);
 		});
 
-		$this->registerService('EncryptionManager', function (Server $c) {
+		$this->registerService('EncryptionManager', function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -209,7 +209,7 @@ 
 			);
 		});
 
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
+		$this->registerService('EncryptionFileHelper', function(Server $c) {
 			$util = new Encryption\Util(
 				new View(),
 				$c->getUserManager(),
@@ -223,7 +223,7 @@ 
 			);
 		});
 
-		$this->registerService('EncryptionKeyStorage', function (Server $c) {
+		$this->registerService('EncryptionKeyStorage', function(Server $c) {
 			$view = new View();
 			$util = new Encryption\Util(
 				$view,
@@ -234,30 +234,30 @@ 
 
 			return new Encryption\Keys\Storage($view, $util);
 		});
-		$this->registerService('TagMapper', function (Server $c) {
+		$this->registerService('TagMapper', function(Server $c) {
 			return new TagMapper($c->getDatabaseConnection());
 		});
 
-		$this->registerService(\OCP\ITagManager::class, function (Server $c) {
+		$this->registerService(\OCP\ITagManager::class, function(Server $c) {
 			$tagMapper = $c->query('TagMapper');
 			return new TagManager($tagMapper, $c->getUserSession());
 		});
 		$this->registerAlias('TagManager', \OCP\ITagManager::class);
 
-		$this->registerService('SystemTagManagerFactory', function (Server $c) {
+		$this->registerService('SystemTagManagerFactory', function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
 			return new $factoryClass($this);
 		});
-		$this->registerService(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
+		$this->registerService(\OCP\SystemTag\ISystemTagManager::class, function(Server $c) {
 			return $c->query('SystemTagManagerFactory')->getManager();
 		});
 		$this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
 
-		$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
+		$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function(Server $c) {
 			return $c->query('SystemTagManagerFactory')->getObjectMapper();
 		});
-		$this->registerService('RootFolder', function (Server $c) {
+		$this->registerService('RootFolder', function(Server $c) {
 			$manager = \OC\Files\Filesystem::getMountManager(null);
 			$view = new View();
 			$root = new Root(
@@ -278,38 +278,38 @@ 
 		});
 		$this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
 
-		$this->registerService(\OCP\Files\IRootFolder::class, function (Server $c) {
-			return new LazyRoot(function () use ($c) {
+		$this->registerService(\OCP\Files\IRootFolder::class, function(Server $c) {
+			return new LazyRoot(function() use ($c) {
 				return $c->query('RootFolder');
 			});
 		});
 		$this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
 
-		$this->registerService(\OC\User\Manager::class, function (Server $c) {
+		$this->registerService(\OC\User\Manager::class, function(Server $c) {
 			$config = $c->getConfig();
 			return new \OC\User\Manager($config);
 		});
 		$this->registerAlias('UserManager', \OC\User\Manager::class);
 		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
 
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
+		$this->registerService(\OCP\IGroupManager::class, function(Server $c) {
 			$groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
+			$groupManager->listen('\OC\Group', 'preCreate', function($gid) {
 				\OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
 			});
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
+			$groupManager->listen('\OC\Group', 'postCreate', function(\OC\Group\Group $gid) {
 				\OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
 			});
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'preDelete', function(\OC\Group\Group $group) {
 				\OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
 			});
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
+			$groupManager->listen('\OC\Group', 'postDelete', function(\OC\Group\Group $group) {
 				\OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
 			});
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'preAddUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				\OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
 			});
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
+			$groupManager->listen('\OC\Group', 'postAddUser', function(\OC\Group\Group $group, \OC\User\User $user) {
 				\OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
 				//Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
 				\OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
@@ -318,7 +318,7 @@ 
 		});
 		$this->registerAlias('GroupManager', \OCP\IGroupManager::class);
 
-		$this->registerService(Store::class, function (Server $c) {
+		$this->registerService(Store::class, function(Server $c) {
 			$session = $c->getSession();
 			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
 				$tokenProvider = $c->query(IProvider::class);
@@ -329,11 +329,11 @@ 
 			return new Store($session, $logger, $tokenProvider);
 		});
 		$this->registerAlias(IStore::class, Store::class);
-		$this->registerService(Authentication\Token\DefaultTokenMapper::class, function (Server $c) {
+		$this->registerService(Authentication\Token\DefaultTokenMapper::class, function(Server $c) {
 			$dbConnection = $c->getDatabaseConnection();
 			return new Authentication\Token\DefaultTokenMapper($dbConnection);
 		});
-		$this->registerService(Authentication\Token\DefaultTokenProvider::class, function (Server $c) {
+		$this->registerService(Authentication\Token\DefaultTokenProvider::class, function(Server $c) {
 			$mapper = $c->query(Authentication\Token\DefaultTokenMapper::class);
 			$crypto = $c->getCrypto();
 			$config = $c->getConfig();
@@ -343,7 +343,7 @@ 
 		});
 		$this->registerAlias(IProvider::class, Authentication\Token\DefaultTokenProvider::class);
 
-		$this->registerService(\OCP\IUserSession::class, function (Server $c) {
+		$this->registerService(\OCP\IUserSession::class, function(Server $c) {
 			$manager = $c->getUserManager();
 			$session = new \OC\Session\Memory('');
 			$timeFactory = new TimeFactory();
@@ -367,45 +367,45 @@ 
 				$c->getLockdownManager(),
 				$c->getLogger()
 			);
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preCreateUser', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postCreateUser', function($user, $password) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'preDelete', function ($user) use ($dispatcher) {
+			$userSession->listen('\OC\User', 'preDelete', function($user) use ($dispatcher) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
 				$dispatcher->dispatch('OCP\IUser::preDelete', new GenericEvent($user));
 			});
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
+			$userSession->listen('\OC\User', 'postDelete', function($user) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
 			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'preSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+			$userSession->listen('\OC\User', 'postSetPassword', function($user, $password, $recoveryPassword) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
 			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+			$userSession->listen('\OC\User', 'preLogin', function($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postLogin', function($user, $password) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+			$userSession->listen('\OC\User', 'postRememberedLogin', function($user, $password) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
 			});
-			$userSession->listen('\OC\User', 'logout', function () {
+			$userSession->listen('\OC\User', 'logout', function() {
 				\OC_Hook::emit('OC_User', 'logout', array());
 			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) use ($dispatcher) {
+			$userSession->listen('\OC\User', 'changeUser', function($user, $feature, $value, $oldValue) use ($dispatcher) {
 				/** @var $user \OC\User\User */
 				\OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue));
 				$dispatcher->dispatch('OCP\IUser::changeUser', new GenericEvent($user, ['feature' => $feature, 'oldValue' => $oldValue, 'value' => $value]));
@@ -414,7 +414,7 @@ 
 		});
 		$this->registerAlias('UserSession', \OCP\IUserSession::class);
 
-		$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
+		$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function(Server $c) {
 			return new \OC\Authentication\TwoFactorAuth\Manager(
 				$c->getAppManager(),
 				$c->getSession(),
@@ -430,7 +430,7 @@ 
 		$this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
 		$this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
 
-		$this->registerService(\OC\AllConfig::class, function (Server $c) {
+		$this->registerService(\OC\AllConfig::class, function(Server $c) {
 			return new \OC\AllConfig(
 				$c->getSystemConfig()
 			);
@@ -438,17 +438,17 @@ 
 		$this->registerAlias('AllConfig', \OC\AllConfig::class);
 		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
 
-		$this->registerService('SystemConfig', function ($c) use ($config) {
+		$this->registerService('SystemConfig', function($c) use ($config) {
 			return new \OC\SystemConfig($config);
 		});
 
-		$this->registerService(\OC\AppConfig::class, function (Server $c) {
+		$this->registerService(\OC\AppConfig::class, function(Server $c) {
 			return new \OC\AppConfig($c->getDatabaseConnection());
 		});
 		$this->registerAlias('AppConfig', \OC\AppConfig::class);
 		$this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
 
-		$this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
+		$this->registerService(\OCP\L10N\IFactory::class, function(Server $c) {
 			return new \OC\L10N\Factory(
 				$c->getConfig(),
 				$c->getRequest(),
@@ -458,7 +458,7 @@ 
 		});
 		$this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
 
-		$this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
+		$this->registerService(\OCP\IURLGenerator::class, function(Server $c) {
 			$config = $c->getConfig();
 			$cacheFactory = $c->getMemCacheFactory();
 			$request = $c->getRequest();
@@ -473,12 +473,12 @@ 
 		$this->registerAlias('AppFetcher', AppFetcher::class);
 		$this->registerAlias('CategoryFetcher', CategoryFetcher::class);
 
-		$this->registerService(\OCP\ICache::class, function ($c) {
+		$this->registerService(\OCP\ICache::class, function($c) {
 			return new Cache\File();
 		});
 		$this->registerAlias('UserCache', \OCP\ICache::class);
 
-		$this->registerService(Factory::class, function (Server $c) {
+		$this->registerService(Factory::class, function(Server $c) {
 
 			$arrayCacheFactory = new \OC\Memcache\Factory('', $c->getLogger(),
 				ArrayCache::class,
@@ -495,7 +495,7 @@ 
 				$version = implode(',', $v);
 				$instanceId = \OC_Util::getInstanceId();
 				$path = \OC::$SERVERROOT;
-				$prefix = md5($instanceId . '-' . $version . '-' . $path);
+				$prefix = md5($instanceId.'-'.$version.'-'.$path);
 				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
 					$config->getSystemValue('memcache.local', null),
 					$config->getSystemValue('memcache.distributed', null),
@@ -508,12 +508,12 @@ 
 		$this->registerAlias('MemCacheFactory', Factory::class);
 		$this->registerAlias(ICacheFactory::class, Factory::class);
 
-		$this->registerService('RedisFactory', function (Server $c) {
+		$this->registerService('RedisFactory', function(Server $c) {
 			$systemConfig = $c->getSystemConfig();
 			return new RedisFactory($systemConfig);
 		});
 
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IManager::class, function(Server $c) {
 			return new \OC\Activity\Manager(
 				$c->getRequest(),
 				$c->getUserSession(),
@@ -523,14 +523,14 @@ 
 		});
 		$this->registerAlias('ActivityManager', \OCP\Activity\IManager::class);
 
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+		$this->registerService(\OCP\Activity\IEventMerger::class, function(Server $c) {
 			return new \OC\Activity\EventMerger(
 				$c->getL10N('lib')
 			);
 		});
 		$this->registerAlias(IValidator::class, Validator::class);
 
-		$this->registerService(\OCP\IAvatarManager::class, function (Server $c) {
+		$this->registerService(\OCP\IAvatarManager::class, function(Server $c) {
 			return new AvatarManager(
 				$c->query(\OC\User\Manager::class),
 				$c->getAppDataDir('avatar'),
@@ -543,7 +543,7 @@ 
 
 		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
 
-		$this->registerService(\OCP\ILogger::class, function (Server $c) {
+		$this->registerService(\OCP\ILogger::class, function(Server $c) {
 			$logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
 			$logger = Log::getLogClass($logType);
 			call_user_func(array($logger, 'init'));
@@ -554,7 +554,7 @@ 
 		});
 		$this->registerAlias('Logger', \OCP\ILogger::class);
 
-		$this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
+		$this->registerService(\OCP\BackgroundJob\IJobList::class, function(Server $c) {
 			$config = $c->getConfig();
 			return new \OC\BackgroundJob\JobList(
 				$c->getDatabaseConnection(),
@@ -564,7 +564,7 @@ 
 		});
 		$this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
 
-		$this->registerService(\OCP\Route\IRouter::class, function (Server $c) {
+		$this->registerService(\OCP\Route\IRouter::class, function(Server $c) {
 			$cacheFactory = $c->getMemCacheFactory();
 			$logger = $c->getLogger();
 			if ($cacheFactory->isLocalCacheAvailable()) {
@@ -576,12 +576,12 @@ 
 		});
 		$this->registerAlias('Router', \OCP\Route\IRouter::class);
 
-		$this->registerService(\OCP\ISearch::class, function ($c) {
+		$this->registerService(\OCP\ISearch::class, function($c) {
 			return new Search();
 		});
 		$this->registerAlias('Search', \OCP\ISearch::class);
 
-		$this->registerService(\OC\Security\RateLimiting\Limiter::class, function (Server $c) {
+		$this->registerService(\OC\Security\RateLimiting\Limiter::class, function(Server $c) {
 			return new \OC\Security\RateLimiting\Limiter(
 				$this->getUserSession(),
 				$this->getRequest(),
@@ -589,34 +589,34 @@ 
 				$c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
 			);
 		});
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
 			return new \OC\Security\RateLimiting\Backend\MemoryCache(
 				$this->getMemCacheFactory(),
 				new \OC\AppFramework\Utility\TimeFactory()
 			);
 		});
 
-		$this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
+		$this->registerService(\OCP\Security\ISecureRandom::class, function($c) {
 			return new SecureRandom();
 		});
 		$this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
 
-		$this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
+		$this->registerService(\OCP\Security\ICrypto::class, function(Server $c) {
 			return new Crypto($c->getConfig(), $c->getSecureRandom());
 		});
 		$this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
 
-		$this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
+		$this->registerService(\OCP\Security\IHasher::class, function(Server $c) {
 			return new Hasher($c->getConfig());
 		});
 		$this->registerAlias('Hasher', \OCP\Security\IHasher::class);
 
-		$this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
+		$this->registerService(\OCP\Security\ICredentialsManager::class, function(Server $c) {
 			return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
 		});
 		$this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
 
-		$this->registerService(IDBConnection::class, function (Server $c) {
+		$this->registerService(IDBConnection::class, function(Server $c) {
 			$systemConfig = $c->getSystemConfig();
 			$factory = new \OC\DB\ConnectionFactory($systemConfig);
 			$type = $systemConfig->getValue('dbtype', 'sqlite');
@@ -631,7 +631,7 @@ 
 		$this->registerAlias('DatabaseConnection', IDBConnection::class);
 
 
-		$this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) {
+		$this->registerService(\OCP\Http\Client\IClientService::class, function(Server $c) {
 			$user = \OC_User::getUser();
 			$uid = $user ? $user : null;
 			return new ClientService(
@@ -646,7 +646,7 @@ 
 			);
 		});
 		$this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
-		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
+		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function(Server $c) {
 			$eventLogger = new EventLogger();
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -656,7 +656,7 @@ 
 		});
 		$this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
 
-		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
+		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function(Server $c) {
 			$queryLogger = new QueryLogger();
 			if ($c->getSystemConfig()->getValue('debug', false)) {
 				// In debug mode, module is being activated by default
@@ -666,7 +666,7 @@ 
 		});
 		$this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
 
-		$this->registerService(TempManager::class, function (Server $c) {
+		$this->registerService(TempManager::class, function(Server $c) {
 			return new TempManager(
 				$c->getLogger(),
 				$c->getConfig()
@@ -675,7 +675,7 @@ 
 		$this->registerAlias('TempManager', TempManager::class);
 		$this->registerAlias(ITempManager::class, TempManager::class);
 
-		$this->registerService(AppManager::class, function (Server $c) {
+		$this->registerService(AppManager::class, function(Server $c) {
 			return new \OC\App\AppManager(
 				$c->getUserSession(),
 				$c->query(\OC\AppConfig::class),
@@ -687,7 +687,7 @@ 
 		$this->registerAlias('AppManager', AppManager::class);
 		$this->registerAlias(IAppManager::class, AppManager::class);
 
-		$this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
+		$this->registerService(\OCP\IDateTimeZone::class, function(Server $c) {
 			return new DateTimeZone(
 				$c->getConfig(),
 				$c->getSession()
@@ -695,7 +695,7 @@ 
 		});
 		$this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
 
-		$this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) {
+		$this->registerService(\OCP\IDateTimeFormatter::class, function(Server $c) {
 			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
 
 			return new DateTimeFormatter(
@@ -705,7 +705,7 @@ 
 		});
 		$this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
 
-		$this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
+		$this->registerService(\OCP\Files\Config\IUserMountCache::class, function(Server $c) {
 			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
 			$listener = new UserMountCacheListener($mountCache);
 			$listener->listen($c->getUserManager());
@@ -713,7 +713,7 @@ 
 		});
 		$this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
 
-		$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
+		$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function(Server $c) {
 			$loader = \OC\Files\Filesystem::getLoader();
 			$mountCache = $c->query('UserMountCache');
 			$manager = new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
@@ -729,10 +729,10 @@ 
 		});
 		$this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
 
-		$this->registerService('IniWrapper', function ($c) {
+		$this->registerService('IniWrapper', function($c) {
 			return new IniGetWrapper();
 		});
-		$this->registerService('AsyncCommandBus', function (Server $c) {
+		$this->registerService('AsyncCommandBus', function(Server $c) {
 			$busClass = $c->getConfig()->getSystemValue('commandbus');
 			if ($busClass) {
 				list($app, $class) = explode('::', $busClass, 2);
@@ -747,10 +747,10 @@ 
 				return new CronBus($jobList);
 			}
 		});
-		$this->registerService('TrustedDomainHelper', function ($c) {
+		$this->registerService('TrustedDomainHelper', function($c) {
 			return new TrustedDomainHelper($this->getConfig());
 		});
-		$this->registerService('Throttler', function (Server $c) {
+		$this->registerService('Throttler', function(Server $c) {
 			return new Throttler(
 				$c->getDatabaseConnection(),
 				new TimeFactory(),
@@ -758,7 +758,7 @@ 
 				$c->getConfig()
 			);
 		});
-		$this->registerService('IntegrityCodeChecker', function (Server $c) {
+		$this->registerService('IntegrityCodeChecker', function(Server $c) {
 			// IConfig and IAppManager requires a working database. This code
 			// might however be called when ownCloud is not yet setup.
 			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
@@ -779,7 +779,7 @@ 
 				$c->getTempManager()
 			);
 		});
-		$this->registerService(\OCP\IRequest::class, function ($c) {
+		$this->registerService(\OCP\IRequest::class, function($c) {
 			if (isset($this['urlParams'])) {
 				$urlParams = $this['urlParams'];
 			} else {
@@ -815,7 +815,7 @@ 
 		});
 		$this->registerAlias('Request', \OCP\IRequest::class);
 
-		$this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
+		$this->registerService(\OCP\Mail\IMailer::class, function(Server $c) {
 			return new Mailer(
 				$c->getConfig(),
 				$c->getLogger(),
@@ -826,7 +826,7 @@ 
 		});
 		$this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
 
-		$this->registerService('LDAPProvider', function (Server $c) {
+		$this->registerService('LDAPProvider', function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
 			if (is_null($factoryClass)) {
@@ -836,7 +836,7 @@ 
 			$factory = new $factoryClass($this);
 			return $factory->getLDAPProvider();
 		});
-		$this->registerService(ILockingProvider::class, function (Server $c) {
+		$this->registerService(ILockingProvider::class, function(Server $c) {
 			$ini = $c->getIniWrapper();
 			$config = $c->getConfig();
 			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
@@ -853,49 +853,49 @@ 
 		});
 		$this->registerAlias('LockingProvider', ILockingProvider::class);
 
-		$this->registerService(\OCP\Files\Mount\IMountManager::class, function () {
+		$this->registerService(\OCP\Files\Mount\IMountManager::class, function() {
 			return new \OC\Files\Mount\Manager();
 		});
 		$this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
 
-		$this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
+		$this->registerService(\OCP\Files\IMimeTypeDetector::class, function(Server $c) {
 			return new \OC\Files\Type\Detection(
 				$c->getURLGenerator(),
 				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
+				\OC::$SERVERROOT.'/resources/config/'
 			);
 		});
 		$this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
 
-		$this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
+		$this->registerService(\OCP\Files\IMimeTypeLoader::class, function(Server $c) {
 			return new \OC\Files\Type\Loader(
 				$c->getDatabaseConnection()
 			);
 		});
 		$this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
-		$this->registerService(BundleFetcher::class, function () {
+		$this->registerService(BundleFetcher::class, function() {
 			return new BundleFetcher($this->getL10N('lib'));
 		});
-		$this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Notification\IManager::class, function(Server $c) {
 			return new Manager(
 				$c->query(IValidator::class)
 			);
 		});
 		$this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
 
-		$this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
+		$this->registerService(\OC\CapabilitiesManager::class, function(Server $c) {
 			$manager = new \OC\CapabilitiesManager($c->getLogger());
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return new \OC\OCS\CoreCapabilities($c->getConfig());
 			});
-			$manager->registerCapability(function () use ($c) {
+			$manager->registerCapability(function() use ($c) {
 				return $c->query(\OC\Security\Bruteforce\Capabilities::class);
 			});
 			return $manager;
 		});
 		$this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
 
-		$this->registerService(\OCP\Comments\ICommentsManager::class, function (Server $c) {
+		$this->registerService(\OCP\Comments\ICommentsManager::class, function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
 			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
@@ -905,7 +905,7 @@ 
 			$manager->registerDisplayNameResolver('user', function($id) use ($c) {
 				$manager = $c->getUserManager();
 				$user = $manager->get($id);
-				if(is_null($user)) {
+				if (is_null($user)) {
 					$l = $c->getL10N('core');
 					$displayName = $l->t('Unknown user');
 				} else {
@@ -918,7 +918,7 @@ 
 		});
 		$this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
 
-		$this->registerService('ThemingDefaults', function (Server $c) {
+		$this->registerService('ThemingDefaults', function(Server $c) {
 			/*
 			 * Dark magic for autoloader.
 			 * If we do a class_exists it will try to load the class which will
@@ -945,7 +945,7 @@ 
 			}
 			return new \OC_Defaults();
 		});
-		$this->registerService(SCSSCacher::class, function (Server $c) {
+		$this->registerService(SCSSCacher::class, function(Server $c) {
 			/** @var Factory $cacheFactory */
 			$cacheFactory = $c->query(Factory::class);
 			return new SCSSCacher(
@@ -958,7 +958,7 @@ 
 				$this->getMemCacheFactory()
 			);
 		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
+		$this->registerService(JSCombiner::class, function(Server $c) {
 			/** @var Factory $cacheFactory */
 			$cacheFactory = $c->query(Factory::class);
 			return new JSCombiner(
@@ -969,13 +969,13 @@ 
 				$c->getLogger()
 			);
 		});
-		$this->registerService(EventDispatcher::class, function () {
+		$this->registerService(EventDispatcher::class, function() {
 			return new EventDispatcher();
 		});
 		$this->registerAlias('EventDispatcher', EventDispatcher::class);
 		$this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
 
-		$this->registerService('CryptoWrapper', function (Server $c) {
+		$this->registerService('CryptoWrapper', function(Server $c) {
 			// FIXME: Instantiiated here due to cyclic dependency
 			$request = new Request(
 				[
@@ -1000,7 +1000,7 @@ 
 				$request
 			);
 		});
-		$this->registerService('CsrfTokenManager', function (Server $c) {
+		$this->registerService('CsrfTokenManager', function(Server $c) {
 			$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
 
 			return new CsrfTokenManager(
@@ -1008,22 +1008,22 @@ 
 				$c->query(SessionStorage::class)
 			);
 		});
-		$this->registerService(SessionStorage::class, function (Server $c) {
+		$this->registerService(SessionStorage::class, function(Server $c) {
 			return new SessionStorage($c->getSession());
 		});
-		$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
+		$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function(Server $c) {
 			return new ContentSecurityPolicyManager();
 		});
 		$this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
 
-		$this->registerService('ContentSecurityPolicyNonceManager', function (Server $c) {
+		$this->registerService('ContentSecurityPolicyNonceManager', function(Server $c) {
 			return new ContentSecurityPolicyNonceManager(
 				$c->getCsrfTokenManager(),
 				$c->getRequest()
 			);
 		});
 
-		$this->registerService(\OCP\Share\IManager::class, function (Server $c) {
+		$this->registerService(\OCP\Share\IManager::class, function(Server $c) {
 			$config = $c->getConfig();
 			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
 			/** @var \OCP\Share\IProviderFactory $factory */
@@ -1066,7 +1066,7 @@ 
 
 		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
 
-		$this->registerService('SettingsManager', function (Server $c) {
+		$this->registerService('SettingsManager', function(Server $c) {
 			$manager = new \OC\Settings\Manager(
 				$c->getLogger(),
 				$c->getDatabaseConnection(),
@@ -1084,24 +1084,24 @@ 
 			);
 			return $manager;
 		});
-		$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
+		$this->registerService(\OC\Files\AppData\Factory::class, function(Server $c) {
 			return new \OC\Files\AppData\Factory(
 				$c->getRootFolder(),
 				$c->getSystemConfig()
 			);
 		});
 
-		$this->registerService('LockdownManager', function (Server $c) {
-			return new LockdownManager(function () use ($c) {
+		$this->registerService('LockdownManager', function(Server $c) {
+			return new LockdownManager(function() use ($c) {
 				return $c->getSession();
 			});
 		});
 
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
+		$this->registerService(\OCP\OCS\IDiscoveryService::class, function(Server $c) {
 			return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
 		});
 
-		$this->registerService(ICloudIdManager::class, function (Server $c) {
+		$this->registerService(ICloudIdManager::class, function(Server $c) {
 			return new CloudIdManager();
 		});
 
@@ -1111,18 +1111,18 @@ 
 		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
 		$this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
+		$this->registerService(Defaults::class, function(Server $c) {
 			return new Defaults(
 				$c->getThemingDefaults()
 			);
 		});
 		$this->registerAlias('Defaults', \OCP\Defaults::class);
 
-		$this->registerService(\OCP\ISession::class, function (SimpleContainer $c) {
+		$this->registerService(\OCP\ISession::class, function(SimpleContainer $c) {
 			return $c->query(\OCP\IUserSession::class)->getSession();
 		});
 
-		$this->registerService(IShareHelper::class, function (Server $c) {
+		$this->registerService(IShareHelper::class, function(Server $c) {
 			return new ShareHelper(
 				$c->query(\OCP\Share\IManager::class)
 			);
@@ -1184,11 +1184,11 @@ 
 				// no avatar to remove
 			} catch (\Exception $e) {
 				// Ignore exceptions
-				$logger->info('Could not cleanup avatar of ' . $user->getUID());
+				$logger->info('Could not cleanup avatar of '.$user->getUID());
 			}
 		});
 
-		$dispatcher->addListener('OCP\IUser::changeUser', function (GenericEvent $e) {
+		$dispatcher->addListener('OCP\IUser::changeUser', function(GenericEvent $e) {
 			$manager = $this->getAvatarManager();
 			/** @var IUser $user */
 			$user = $e->getSubject();
@@ -1339,7 +1339,7 @@ 
 	 * @deprecated since 9.2.0 use IAppData
 	 */
 	public function getAppFolder() {
-		$dir = '/' . \OC_App::getCurrentApp();
+		$dir = '/'.\OC_App::getCurrentApp();
 		$root = $this->getRootFolder();
 		if (!$root->nodeExists($dir)) {
 			$folder = $root->newFolder($dir);
@@ -1906,7 +1906,7 @@ 
 	/**
 	 * @return \OCP\Collaboration\AutoComplete\IManager
 	 */
-	public function getAutoCompleteManager(){
+	public function getAutoCompleteManager() {
 		return $this->query(IManager::class);
 	}