nextcloud / server

apps/files_versions/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Files_Versions\\' => array($baseDir . '/../lib'),
+    'OCA\\Files_Versions\\' => array($baseDir.'/../lib'),
 );

lib/private/Repair/NC13/AddLogRotateJob.php

Indentation +11 added lines, -11 removed lines

@@ -29,19 +29,19 @@
 
 class AddLogRotateJob implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IJobList $jobList) {
-		$this->jobList = $jobList;
-	}
+    public function __construct(IJobList $jobList) {
+        $this->jobList = $jobList;
+    }
 
-	public function getName() {
-		return 'Add log rotate job';
-	}
+    public function getName() {
+        return 'Add log rotate job';
+    }
 
-	public function run(IOutput $output) {
-		$this->jobList->add(Rotate::class);
-	}
+    public function run(IOutput $output) {
+        $this->jobList->add(Rotate::class);
+    }
 
 }

apps/files_versions/lib/Hooks.php

Spacing +8 added lines, -8 removed lines

@@ -53,9 +53,9 @@ 
 	/**
 	 * listen to write event.
 	 */
-	public static function write_hook( $params ) {
+	public static function write_hook($params) {
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
-		if($path !== '') {
+		if ($path !== '') {
 			Storage::store($path);
 		}
 	}
@@ -70,7 +70,7 @@ 
 	 */
 	public static function remove_hook($params) {
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
-		if($path !== '') {
+		if ($path !== '') {
 			Storage::delete($path);
 		}
 	}
@@ -81,7 +81,7 @@ 
 	 */
 	public static function pre_remove_hook($params) {
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path !== '') {
+			if ($path !== '') {
 				Storage::markDeletedFile($path);
 			}
 	}
@@ -96,7 +96,7 @@ 
 	public static function rename_hook($params) {
 		$oldpath = $params['oldpath'];
 		$newpath = $params['newpath'];
-		if($oldpath !== '' && $newpath !== '') {
+		if ($oldpath !== '' && $newpath !== '') {
 			Storage::renameOrCopy($oldpath, $newpath, 'rename');
 		}
 	}
@@ -111,7 +111,7 @@ 
 	public static function copy_hook($params) {
 		$oldpath = $params['oldpath'];
 		$newpath = $params['newpath'];
-		if($oldpath !== '' && $newpath !== '') {
+		if ($oldpath !== '' && $newpath !== '') {
 			Storage::renameOrCopy($oldpath, $newpath, 'copy');
 		}
 	}
@@ -127,7 +127,7 @@ 
 	public static function pre_renameOrCopy_hook($params) {
 		// if we rename a movable mount point, then the versions don't have
 		// to be renamed
-		$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+		$absOldPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files'.$params['oldpath']);
 		$manager = \OC\Files\Filesystem::getMountManager();
 		$mount = $manager->find($absOldPath);
 		$internalPath = $mount->getInternalPath($absOldPath);
@@ -135,7 +135,7 @@ 
 			return;
 		}
 
-		$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
+		$view = new \OC\Files\View(\OCP\User::getUser().'/files');
 		if ($view->file_exists($params['newpath'])) {
 			Storage::store($params['newpath']);
 		} else {

Indentation +104 added lines, -104 removed lines

@@ -37,118 +37,118 @@
 
 class Hooks {
 
-	public static function connectHooks() {
-		// Listen to write signals
-		\OCP\Util::connectHook('OC_Filesystem', 'write', Hooks::class, 'write_hook');
-		// Listen to delete and rename signals
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', Hooks::class, 'remove_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'delete', Hooks::class, 'pre_remove_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', Hooks::class, 'rename_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_copy', Hooks::class, 'copy_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'rename', Hooks::class, 'pre_renameOrCopy_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'copy', Hooks::class, 'pre_renameOrCopy_hook');
+    public static function connectHooks() {
+        // Listen to write signals
+        \OCP\Util::connectHook('OC_Filesystem', 'write', Hooks::class, 'write_hook');
+        // Listen to delete and rename signals
+        \OCP\Util::connectHook('OC_Filesystem', 'post_delete', Hooks::class, 'remove_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'delete', Hooks::class, 'pre_remove_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_rename', Hooks::class, 'rename_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_copy', Hooks::class, 'copy_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'rename', Hooks::class, 'pre_renameOrCopy_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'copy', Hooks::class, 'pre_renameOrCopy_hook');
 
-		$eventDispatcher = \OC::$server->getEventDispatcher();
-		$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', [Hooks::class, 'onLoadFilesAppScripts']);
-	}
+        $eventDispatcher = \OC::$server->getEventDispatcher();
+        $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', [Hooks::class, 'onLoadFilesAppScripts']);
+    }
 
-	/**
-	 * listen to write event.
-	 */
-	public static function write_hook( $params ) {
-		$path = $params[\OC\Files\Filesystem::signal_param_path];
-		if($path !== '') {
-			Storage::store($path);
-		}
-	}
+    /**
+     * listen to write event.
+     */
+    public static function write_hook( $params ) {
+        $path = $params[\OC\Files\Filesystem::signal_param_path];
+        if($path !== '') {
+            Storage::store($path);
+        }
+    }
 
 
-	/**
-	 * Erase versions of deleted file
-	 * @param array $params
-	 *
-	 * This function is connected to the delete signal of OC_Filesystem
-	 * cleanup the versions directory if the actual file gets deleted
-	 */
-	public static function remove_hook($params) {
-		$path = $params[\OC\Files\Filesystem::signal_param_path];
-		if($path !== '') {
-			Storage::delete($path);
-		}
-	}
+    /**
+     * Erase versions of deleted file
+     * @param array $params
+     *
+     * This function is connected to the delete signal of OC_Filesystem
+     * cleanup the versions directory if the actual file gets deleted
+     */
+    public static function remove_hook($params) {
+        $path = $params[\OC\Files\Filesystem::signal_param_path];
+        if($path !== '') {
+            Storage::delete($path);
+        }
+    }
 
-	/**
-	 * mark file as "deleted" so that we can clean up the versions if the file is gone
-	 * @param array $params
-	 */
-	public static function pre_remove_hook($params) {
-		$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path !== '') {
-				Storage::markDeletedFile($path);
-			}
-	}
+    /**
+     * mark file as "deleted" so that we can clean up the versions if the file is gone
+     * @param array $params
+     */
+    public static function pre_remove_hook($params) {
+        $path = $params[\OC\Files\Filesystem::signal_param_path];
+            if($path !== '') {
+                Storage::markDeletedFile($path);
+            }
+    }
 
-	/**
-	 * rename/move versions of renamed/moved files
-	 * @param array $params array with oldpath and newpath
-	 *
-	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
-	 * of the stored versions along the actual file
-	 */
-	public static function rename_hook($params) {
-		$oldpath = $params['oldpath'];
-		$newpath = $params['newpath'];
-		if($oldpath !== '' && $newpath !== '') {
-			Storage::renameOrCopy($oldpath, $newpath, 'rename');
-		}
-	}
+    /**
+     * rename/move versions of renamed/moved files
+     * @param array $params array with oldpath and newpath
+     *
+     * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+     * of the stored versions along the actual file
+     */
+    public static function rename_hook($params) {
+        $oldpath = $params['oldpath'];
+        $newpath = $params['newpath'];
+        if($oldpath !== '' && $newpath !== '') {
+            Storage::renameOrCopy($oldpath, $newpath, 'rename');
+        }
+    }
 
-	/**
-	 * copy versions of copied files
-	 * @param array $params array with oldpath and newpath
-	 *
-	 * This function is connected to the copy signal of OC_Filesystem and copies the
-	 * the stored versions to the new location
-	 */
-	public static function copy_hook($params) {
-		$oldpath = $params['oldpath'];
-		$newpath = $params['newpath'];
-		if($oldpath !== '' && $newpath !== '') {
-			Storage::renameOrCopy($oldpath, $newpath, 'copy');
-		}
-	}
+    /**
+     * copy versions of copied files
+     * @param array $params array with oldpath and newpath
+     *
+     * This function is connected to the copy signal of OC_Filesystem and copies the
+     * the stored versions to the new location
+     */
+    public static function copy_hook($params) {
+        $oldpath = $params['oldpath'];
+        $newpath = $params['newpath'];
+        if($oldpath !== '' && $newpath !== '') {
+            Storage::renameOrCopy($oldpath, $newpath, 'copy');
+        }
+    }
 
-	/**
-	 * Remember owner and the owner path of the source file.
-	 * If the file already exists, then it was a upload of a existing file
-	 * over the web interface and we call Storage::store() directly
-	 *
-	 * @param array $params array with oldpath and newpath
-	 *
-	 */
-	public static function pre_renameOrCopy_hook($params) {
-		// if we rename a movable mount point, then the versions don't have
-		// to be renamed
-		$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
-		$manager = \OC\Files\Filesystem::getMountManager();
-		$mount = $manager->find($absOldPath);
-		$internalPath = $mount->getInternalPath($absOldPath);
-		if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
-			return;
-		}
+    /**
+     * Remember owner and the owner path of the source file.
+     * If the file already exists, then it was a upload of a existing file
+     * over the web interface and we call Storage::store() directly
+     *
+     * @param array $params array with oldpath and newpath
+     *
+     */
+    public static function pre_renameOrCopy_hook($params) {
+        // if we rename a movable mount point, then the versions don't have
+        // to be renamed
+        $absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+        $manager = \OC\Files\Filesystem::getMountManager();
+        $mount = $manager->find($absOldPath);
+        $internalPath = $mount->getInternalPath($absOldPath);
+        if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
+            return;
+        }
 
-		$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
-		if ($view->file_exists($params['newpath'])) {
-			Storage::store($params['newpath']);
-		} else {
-			Storage::setSourcePathAndUser($params['oldpath']);
-		}
-	}
+        $view = new \OC\Files\View(\OCP\User::getUser() . '/files');
+        if ($view->file_exists($params['newpath'])) {
+            Storage::store($params['newpath']);
+        } else {
+            Storage::setSourcePathAndUser($params['oldpath']);
+        }
+    }
 
-	/**
-	 * Load additional scripts when the files app is visible
-	 */
-	public static function onLoadFilesAppScripts() {
-		\OCP\Util::addScript('files_versions', 'merged');
-	}
+    /**
+     * Load additional scripts when the files app is visible
+     */
+    public static function onLoadFilesAppScripts() {
+        \OCP\Util::addScript('files_versions', 'merged');
+    }
 }

apps/files_trashbin/lib/Hooks.php

Indentation +17 added lines, -17 removed lines

@@ -31,22 +31,22 @@
 
 class Hooks {
 
-	/**
-	 * clean up user specific settings if user gets deleted
-	 * @param array $params array with uid
-	 *
-	 * This function is connected to the pre_deleteUser signal of OC_Users
-	 * to remove the used space for the trash bin stored in the database
-	 */
-	public static function deleteUser_hook($params) {
-		$uid = $params['uid'];
-		Trashbin::deleteUser($uid);
-	}
+    /**
+     * clean up user specific settings if user gets deleted
+     * @param array $params array with uid
+     *
+     * This function is connected to the pre_deleteUser signal of OC_Users
+     * to remove the used space for the trash bin stored in the database
+     */
+    public static function deleteUser_hook($params) {
+        $uid = $params['uid'];
+        Trashbin::deleteUser($uid);
+    }
 
-	public static function post_write_hook($params) {
-		$user = \OCP\User::getUser();
-		if (!empty($user)) {
-			Trashbin::resizeTrash($user);
-		}
-	}
+    public static function post_write_hook($params) {
+        $user = \OCP\User::getUser();
+        if (!empty($user)) {
+            Trashbin::resizeTrash($user);
+        }
+    }
 }

lib/private/Collaboration/Collaborators/SearchResult.php

Spacing +5 added lines, -5 removed lines

@@ -37,13 +37,13 @@ 
 
 	public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null) {
 		$type = $type->getLabel();
-		if(!isset($this->result[$type])) {
+		if (!isset($this->result[$type])) {
 			$this->result[$type] = [];
 			$this->result['exact'][$type] = [];
 		}
 
 		$this->result[$type] = array_merge($this->result[$type], $matches);
-		if(is_array($exactMatches)) {
+		if (is_array($exactMatches)) {
 			$this->result['exact'][$type] = array_merge($this->result['exact'][$type], $exactMatches);
 		}
 	}
@@ -58,12 +58,12 @@ 
 
 	public function hasResult(SearchResultType $type, $collaboratorId) {
 		$type = $type->getLabel();
-		if(!isset($this->result[$type])) {
+		if (!isset($this->result[$type])) {
 			return false;
 		}
 
 		$resultArrays = [$this->result['exact'][$type], $this->result[$type]];
-		foreach($resultArrays as $resultArray) {
+		foreach ($resultArrays as $resultArray) {
 			foreach ($resultArray as $result) {
 				if ($result['value']['shareWith'] === $collaboratorId) {
 					return true;
@@ -81,7 +81,7 @@ 
 	public function unsetResult(SearchResultType $type) {
 		$type = $type->getLabel();
 		$this->result[$type] = [];
-		if(isset($this->result['exact'][$type])) {
+		if (isset($this->result['exact'][$type])) {
 			$this->result['exact'][$type] = [];
 		}
 	}

Indentation +46 added lines, -46 removed lines

@@ -29,60 +29,60 @@
 
 class SearchResult implements ISearchResult {
 
-	protected $result = [
-		'exact' => [],
-	];
+    protected $result = [
+        'exact' => [],
+    ];
 
-	protected $exactIdMatches = [];
+    protected $exactIdMatches = [];
 
-	public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null) {
-		$type = $type->getLabel();
-		if(!isset($this->result[$type])) {
-			$this->result[$type] = [];
-			$this->result['exact'][$type] = [];
-		}
+    public function addResultSet(SearchResultType $type, array $matches, array $exactMatches = null) {
+        $type = $type->getLabel();
+        if(!isset($this->result[$type])) {
+            $this->result[$type] = [];
+            $this->result['exact'][$type] = [];
+        }
 
-		$this->result[$type] = array_merge($this->result[$type], $matches);
-		if(is_array($exactMatches)) {
-			$this->result['exact'][$type] = array_merge($this->result['exact'][$type], $exactMatches);
-		}
-	}
+        $this->result[$type] = array_merge($this->result[$type], $matches);
+        if(is_array($exactMatches)) {
+            $this->result['exact'][$type] = array_merge($this->result['exact'][$type], $exactMatches);
+        }
+    }
 
-	public function markExactIdMatch(SearchResultType $type) {
-		$this->exactIdMatches[$type->getLabel()] = 1;
-	}
+    public function markExactIdMatch(SearchResultType $type) {
+        $this->exactIdMatches[$type->getLabel()] = 1;
+    }
 
-	public function hasExactIdMatch(SearchResultType $type) {
-		return isset($this->exactIdMatches[$type->getLabel()]);
-	}
+    public function hasExactIdMatch(SearchResultType $type) {
+        return isset($this->exactIdMatches[$type->getLabel()]);
+    }
 
-	public function hasResult(SearchResultType $type, $collaboratorId) {
-		$type = $type->getLabel();
-		if(!isset($this->result[$type])) {
-			return false;
-		}
+    public function hasResult(SearchResultType $type, $collaboratorId) {
+        $type = $type->getLabel();
+        if(!isset($this->result[$type])) {
+            return false;
+        }
 
-		$resultArrays = [$this->result['exact'][$type], $this->result[$type]];
-		foreach($resultArrays as $resultArray) {
-			foreach ($resultArray as $result) {
-				if ($result['value']['shareWith'] === $collaboratorId) {
-					return true;
-				}
-			}
-		}
+        $resultArrays = [$this->result['exact'][$type], $this->result[$type]];
+        foreach($resultArrays as $resultArray) {
+            foreach ($resultArray as $result) {
+                if ($result['value']['shareWith'] === $collaboratorId) {
+                    return true;
+                }
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function asArray() {
-		return $this->result;
-	}
+    public function asArray() {
+        return $this->result;
+    }
 
-	public function unsetResult(SearchResultType $type) {
-		$type = $type->getLabel();
-		$this->result[$type] = [];
-		if(isset($this->result['exact'][$type])) {
-			$this->result['exact'][$type] = [];
-		}
-	}
+    public function unsetResult(SearchResultType $type) {
+        $type = $type->getLabel();
+        $this->result[$type] = [];
+        if(isset($this->result['exact'][$type])) {
+            $this->result['exact'][$type] = [];
+        }
+    }
 }

apps/user_ldap/appinfo/register_command.php

Indentation +9 added lines, -9 removed lines

@@ -34,15 +34,15 @@ 
 $helper = new Helper(\OC::$server->getConfig());
 $ocConfig = \OC::$server->getConfig();
 $uBackend = new User_Proxy(
-	$helper->getServerConfigurationPrefixes(true),
-	new LDAP(),
-	$ocConfig,
-	\OC::$server->getNotificationManager(),
-	\OC::$server->getUserSession(),
-	\OC::$server->query('LDAPUserPluginManager')
+    $helper->getServerConfigurationPrefixes(true),
+    new LDAP(),
+    $ocConfig,
+    \OC::$server->getNotificationManager(),
+    \OC::$server->getUserSession(),
+    \OC::$server->query('LDAPUserPluginManager')
 );
 $deletedUsersIndex = new DeletedUsersIndex(
-	$ocConfig, $dbConnection, $userMapping
+    $ocConfig, $dbConnection, $userMapping
 );
 
 $application->add(new OCA\User_LDAP\Command\ShowConfig($helper));
@@ -52,8 +52,8 @@ 
 $application->add(new OCA\User_LDAP\Command\DeleteConfig($helper));
 $application->add(new OCA\User_LDAP\Command\Search($ocConfig));
 $application->add(new OCA\User_LDAP\Command\ShowRemnants(
-	$deletedUsersIndex, \OC::$server->getDateTimeFormatter())
+    $deletedUsersIndex, \OC::$server->getDateTimeFormatter())
 );
 $application->add(new OCA\User_LDAP\Command\CheckUser(
-	$uBackend, $helper, $deletedUsersIndex, $userMapping)
+    $uBackend, $helper, $deletedUsersIndex, $userMapping)
 );

apps/user_ldap/appinfo/app.php

Indentation +32 added lines, -32 removed lines

@@ -30,50 +30,50 @@
  */
 
 \OC::$server->registerService('LDAPUserPluginManager', function() {
-	return new OCA\User_LDAP\UserPluginManager();
+    return new OCA\User_LDAP\UserPluginManager();
 });
 \OC::$server->registerService('LDAPGroupPluginManager', function() {
-	return new OCA\User_LDAP\GroupPluginManager();
+    return new OCA\User_LDAP\GroupPluginManager();
 });
 
 $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
 $configPrefixes = $helper->getServerConfigurationPrefixes(true);
 if(count($configPrefixes) > 0) {
-	$ldapWrapper = new OCA\User_LDAP\LDAP();
-	$ocConfig = \OC::$server->getConfig();
-	$notificationManager = \OC::$server->getNotificationManager();
-	$notificationManager->registerNotifier(function() {
-		return new \OCA\User_LDAP\Notification\Notifier(
-			\OC::$server->getL10NFactory()
-		);
-	}, function() {
-		$l = \OC::$server->getL10N('user_ldap');
-		return [
-			'id' => 'user_ldap',
-			'name' => $l->t('LDAP user and group backend'),
-		];
-	});
-	$userSession = \OC::$server->getUserSession();
+    $ldapWrapper = new OCA\User_LDAP\LDAP();
+    $ocConfig = \OC::$server->getConfig();
+    $notificationManager = \OC::$server->getNotificationManager();
+    $notificationManager->registerNotifier(function() {
+        return new \OCA\User_LDAP\Notification\Notifier(
+            \OC::$server->getL10NFactory()
+        );
+    }, function() {
+        $l = \OC::$server->getL10N('user_ldap');
+        return [
+            'id' => 'user_ldap',
+            'name' => $l->t('LDAP user and group backend'),
+        ];
+    });
+    $userSession = \OC::$server->getUserSession();
 
-	$userPluginManager = \OC::$server->query('LDAPUserPluginManager');
-	$groupPluginManager = \OC::$server->query('LDAPGroupPluginManager');
+    $userPluginManager = \OC::$server->query('LDAPUserPluginManager');
+    $groupPluginManager = \OC::$server->query('LDAPGroupPluginManager');
 
-	$userBackend  = new OCA\User_LDAP\User_Proxy(
-		$configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession, $userPluginManager
-	);
-	$groupBackend  = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager);
-	// register user backend
-	OC_User::useBackend($userBackend);
+    $userBackend  = new OCA\User_LDAP\User_Proxy(
+        $configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession, $userPluginManager
+    );
+    $groupBackend  = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager);
+    // register user backend
+    OC_User::useBackend($userBackend);
 
-	// Hook to allow plugins to work on registered backends
-	OC::$server->getEventDispatcher()->dispatch('OCA\\User_LDAP\\User\\User::postLDAPBackendAdded');
+    // Hook to allow plugins to work on registered backends
+    OC::$server->getEventDispatcher()->dispatch('OCA\\User_LDAP\\User\\User::postLDAPBackendAdded');
 
-	\OC::$server->getGroupManager()->addBackend($groupBackend);
+    \OC::$server->getGroupManager()->addBackend($groupBackend);
 }
 
 \OCP\Util::connectHook(
-	'\OCA\Files_Sharing\API\Server2Server',
-	'preLoginNameUsedAsUserName',
-	'\OCA\User_LDAP\Helper',
-	'loginName2UserName'
+    '\OCA\Files_Sharing\API\Server2Server',
+    'preLoginNameUsedAsUserName',
+    '\OCA\User_LDAP\Helper',
+    'loginName2UserName'
 );

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
 
 $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
 $configPrefixes = $helper->getServerConfigurationPrefixes(true);
-if(count($configPrefixes) > 0) {
+if (count($configPrefixes) > 0) {
 	$ldapWrapper = new OCA\User_LDAP\LDAP();
 	$ocConfig = \OC::$server->getConfig();
 	$notificationManager = \OC::$server->getNotificationManager();
@@ -58,10 +58,10 @@ 
 	$userPluginManager = \OC::$server->query('LDAPUserPluginManager');
 	$groupPluginManager = \OC::$server->query('LDAPGroupPluginManager');
 
-	$userBackend  = new OCA\User_LDAP\User_Proxy(
+	$userBackend = new OCA\User_LDAP\User_Proxy(
 		$configPrefixes, $ldapWrapper, $ocConfig, $notificationManager, $userSession, $userPluginManager
 	);
-	$groupBackend  = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager);
+	$groupBackend = new OCA\User_LDAP\Group_Proxy($configPrefixes, $ldapWrapper, $groupPluginManager);
 	// register user backend
 	OC_User::useBackend($userBackend);
 

apps/user_ldap/lib/User_Proxy.php

Indentation +286 added lines, -286 removed lines

@@ -37,314 +37,314 @@
 use OCP\Notification\IManager as INotificationManager;
 
 class User_Proxy extends Proxy implements \OCP\IUserBackend, \OCP\UserInterface, IUserLDAP {
-	private $backends = array();
-	private $refBackend = null;
+    private $backends = array();
+    private $refBackend = null;
 
-	/**
-	 * Constructor
-	 *
-	 * @param array $serverConfigPrefixes array containing the config Prefixes
-	 * @param ILDAPWrapper $ldap
-	 * @param IConfig $ocConfig
-	 * @param INotificationManager $notificationManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(array $serverConfigPrefixes, ILDAPWrapper $ldap, IConfig $ocConfig,
-		INotificationManager $notificationManager, IUserSession $userSession,
-								UserPluginManager $userPluginManager) {
-		parent::__construct($ldap);
-		foreach($serverConfigPrefixes as $configPrefix) {
-			$this->backends[$configPrefix] =
-				new User_LDAP($this->getAccess($configPrefix), $ocConfig, $notificationManager, $userSession, $userPluginManager);
+    /**
+     * Constructor
+     *
+     * @param array $serverConfigPrefixes array containing the config Prefixes
+     * @param ILDAPWrapper $ldap
+     * @param IConfig $ocConfig
+     * @param INotificationManager $notificationManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(array $serverConfigPrefixes, ILDAPWrapper $ldap, IConfig $ocConfig,
+        INotificationManager $notificationManager, IUserSession $userSession,
+                                UserPluginManager $userPluginManager) {
+        parent::__construct($ldap);
+        foreach($serverConfigPrefixes as $configPrefix) {
+            $this->backends[$configPrefix] =
+                new User_LDAP($this->getAccess($configPrefix), $ocConfig, $notificationManager, $userSession, $userPluginManager);
 
-			if(is_null($this->refBackend)) {
-				$this->refBackend = &$this->backends[$configPrefix];
-			}
-		}
-	}
+            if(is_null($this->refBackend)) {
+                $this->refBackend = &$this->backends[$configPrefix];
+            }
+        }
+    }
 
-	/**
-	 * Tries the backends one after the other until a positive result is returned from the specified method
-	 * @param string $uid the uid connected to the request
-	 * @param string $method the method of the user backend that shall be called
-	 * @param array $parameters an array of parameters to be passed
-	 * @return mixed the result of the method or false
-	 */
-	protected function walkBackends($uid, $method, $parameters) {
-		$cacheKey = $this->getUserCacheKey($uid);
-		foreach($this->backends as $configPrefix => $backend) {
-			$instance = $backend;
-			if(!method_exists($instance, $method)
-				&& method_exists($this->getAccess($configPrefix), $method)) {
-				$instance = $this->getAccess($configPrefix);
-			}
-			if($result = call_user_func_array(array($instance, $method), $parameters)) {
-				$this->writeToCache($cacheKey, $configPrefix);
-				return $result;
-			}
-		}
-		return false;
-	}
+    /**
+     * Tries the backends one after the other until a positive result is returned from the specified method
+     * @param string $uid the uid connected to the request
+     * @param string $method the method of the user backend that shall be called
+     * @param array $parameters an array of parameters to be passed
+     * @return mixed the result of the method or false
+     */
+    protected function walkBackends($uid, $method, $parameters) {
+        $cacheKey = $this->getUserCacheKey($uid);
+        foreach($this->backends as $configPrefix => $backend) {
+            $instance = $backend;
+            if(!method_exists($instance, $method)
+                && method_exists($this->getAccess($configPrefix), $method)) {
+                $instance = $this->getAccess($configPrefix);
+            }
+            if($result = call_user_func_array(array($instance, $method), $parameters)) {
+                $this->writeToCache($cacheKey, $configPrefix);
+                return $result;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * Asks the backend connected to the server that supposely takes care of the uid from the request.
-	 * @param string $uid the uid connected to the request
-	 * @param string $method the method of the user backend that shall be called
-	 * @param array $parameters an array of parameters to be passed
-	 * @param mixed $passOnWhen the result matches this variable
-	 * @return mixed the result of the method or false
-	 */
-	protected function callOnLastSeenOn($uid, $method, $parameters, $passOnWhen) {
-		$cacheKey = $this->getUserCacheKey($uid);
-		$prefix = $this->getFromCache($cacheKey);
-		//in case the uid has been found in the past, try this stored connection first
-		if(!is_null($prefix)) {
-			if(isset($this->backends[$prefix])) {
-				$instance = $this->backends[$prefix];
-				if(!method_exists($instance, $method)
-					&& method_exists($this->getAccess($prefix), $method)) {
-					$instance = $this->getAccess($prefix);
-				}
-				$result = call_user_func_array(array($instance, $method), $parameters);
-				if($result === $passOnWhen) {
-					//not found here, reset cache to null if user vanished
-					//because sometimes methods return false with a reason
-					$userExists = call_user_func_array(
-						array($this->backends[$prefix], 'userExists'),
-						array($uid)
-					);
-					if(!$userExists) {
-						$this->writeToCache($cacheKey, null);
-					}
-				}
-				return $result;
-			}
-		}
-		return false;
-	}
+    /**
+     * Asks the backend connected to the server that supposely takes care of the uid from the request.
+     * @param string $uid the uid connected to the request
+     * @param string $method the method of the user backend that shall be called
+     * @param array $parameters an array of parameters to be passed
+     * @param mixed $passOnWhen the result matches this variable
+     * @return mixed the result of the method or false
+     */
+    protected function callOnLastSeenOn($uid, $method, $parameters, $passOnWhen) {
+        $cacheKey = $this->getUserCacheKey($uid);
+        $prefix = $this->getFromCache($cacheKey);
+        //in case the uid has been found in the past, try this stored connection first
+        if(!is_null($prefix)) {
+            if(isset($this->backends[$prefix])) {
+                $instance = $this->backends[$prefix];
+                if(!method_exists($instance, $method)
+                    && method_exists($this->getAccess($prefix), $method)) {
+                    $instance = $this->getAccess($prefix);
+                }
+                $result = call_user_func_array(array($instance, $method), $parameters);
+                if($result === $passOnWhen) {
+                    //not found here, reset cache to null if user vanished
+                    //because sometimes methods return false with a reason
+                    $userExists = call_user_func_array(
+                        array($this->backends[$prefix], 'userExists'),
+                        array($uid)
+                    );
+                    if(!$userExists) {
+                        $this->writeToCache($cacheKey, null);
+                    }
+                }
+                return $result;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * Check if backend implements actions
-	 * @param int $actions bitwise-or'ed actions
-	 * @return boolean
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with \OC\User\Backend::CREATE_USER etc.
-	 */
-	public function implementsActions($actions) {
-		//it's the same across all our user backends obviously
-		return $this->refBackend->implementsActions($actions);
-	}
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return boolean
+     *
+     * Returns the supported actions as int to be
+     * compared with \OC\User\Backend::CREATE_USER etc.
+     */
+    public function implementsActions($actions) {
+        //it's the same across all our user backends obviously
+        return $this->refBackend->implementsActions($actions);
+    }
 
-	/**
-	 * Backend name to be shown in user management
-	 * @return string the name of the backend to be shown
-	 */
-	public function getBackendName() {
-		return $this->refBackend->getBackendName();
-	}
+    /**
+     * Backend name to be shown in user management
+     * @return string the name of the backend to be shown
+     */
+    public function getBackendName() {
+        return $this->refBackend->getBackendName();
+    }
 
-	/**
-	 * Get a list of all users
-	 *
-	 * @param string $search
-	 * @param null|int $limit
-	 * @param null|int $offset
-	 * @return string[] an array of all uids
-	 */
-	public function getUsers($search = '', $limit = 10, $offset = 0) {
-		//we do it just as the /OC_User implementation: do not play around with limit and offset but ask all backends
-		$users = array();
-		foreach($this->backends as $backend) {
-			$backendUsers = $backend->getUsers($search, $limit, $offset);
-			if (is_array($backendUsers)) {
-				$users = array_merge($users, $backendUsers);
-			}
-		}
-		return $users;
-	}
+    /**
+     * Get a list of all users
+     *
+     * @param string $search
+     * @param null|int $limit
+     * @param null|int $offset
+     * @return string[] an array of all uids
+     */
+    public function getUsers($search = '', $limit = 10, $offset = 0) {
+        //we do it just as the /OC_User implementation: do not play around with limit and offset but ask all backends
+        $users = array();
+        foreach($this->backends as $backend) {
+            $backendUsers = $backend->getUsers($search, $limit, $offset);
+            if (is_array($backendUsers)) {
+                $users = array_merge($users, $backendUsers);
+            }
+        }
+        return $users;
+    }
 
-	/**
-	 * check if a user exists
-	 * @param string $uid the username
-	 * @return boolean
-	 */
-	public function userExists($uid) {
-		return $this->handleRequest($uid, 'userExists', array($uid));
-	}
+    /**
+     * check if a user exists
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function userExists($uid) {
+        return $this->handleRequest($uid, 'userExists', array($uid));
+    }
 
-	/**
-	 * check if a user exists on LDAP
-	 * @param string|\OCA\User_LDAP\User\User $user either the Nextcloud user
-	 * name or an instance of that user
-	 * @return boolean
-	 */
-	public function userExistsOnLDAP($user) {
-		$id = ($user instanceof User) ? $user->getUsername() : $user;
-		return $this->handleRequest($id, 'userExistsOnLDAP', array($user));
-	}
+    /**
+     * check if a user exists on LDAP
+     * @param string|\OCA\User_LDAP\User\User $user either the Nextcloud user
+     * name or an instance of that user
+     * @return boolean
+     */
+    public function userExistsOnLDAP($user) {
+        $id = ($user instanceof User) ? $user->getUsername() : $user;
+        return $this->handleRequest($id, 'userExistsOnLDAP', array($user));
+    }
 
-	/**
-	 * Check if the password is correct
-	 * @param string $uid The username
-	 * @param string $password The password
-	 * @return bool
-	 *
-	 * Check if the password is correct without logging in the user
-	 */
-	public function checkPassword($uid, $password) {
-		return $this->handleRequest($uid, 'checkPassword', array($uid, $password));
-	}
+    /**
+     * Check if the password is correct
+     * @param string $uid The username
+     * @param string $password The password
+     * @return bool
+     *
+     * Check if the password is correct without logging in the user
+     */
+    public function checkPassword($uid, $password) {
+        return $this->handleRequest($uid, 'checkPassword', array($uid, $password));
+    }
 
-	/**
-	 * returns the username for the given login name, if available
-	 *
-	 * @param string $loginName
-	 * @return string|false
-	 */
-	public function loginName2UserName($loginName) {
-		$id = 'LOGINNAME,' . $loginName;
-		return $this->handleRequest($id, 'loginName2UserName', array($loginName));
-	}
+    /**
+     * returns the username for the given login name, if available
+     *
+     * @param string $loginName
+     * @return string|false
+     */
+    public function loginName2UserName($loginName) {
+        $id = 'LOGINNAME,' . $loginName;
+        return $this->handleRequest($id, 'loginName2UserName', array($loginName));
+    }
 	
-	/**
-	 * returns the username for the given LDAP DN, if available
-	 *
-	 * @param string $dn
-	 * @return string|false with the username
-	 */
-	public function dn2UserName($dn) {
-		$id = 'DN,' . $dn;
-		return $this->handleRequest($id, 'dn2UserName', array($dn));
-	}
+    /**
+     * returns the username for the given LDAP DN, if available
+     *
+     * @param string $dn
+     * @return string|false with the username
+     */
+    public function dn2UserName($dn) {
+        $id = 'DN,' . $dn;
+        return $this->handleRequest($id, 'dn2UserName', array($dn));
+    }
 
-	/**
-	 * get the user's home directory
-	 * @param string $uid the username
-	 * @return boolean
-	 */
-	public function getHome($uid) {
-		return $this->handleRequest($uid, 'getHome', array($uid));
-	}
+    /**
+     * get the user's home directory
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function getHome($uid) {
+        return $this->handleRequest($uid, 'getHome', array($uid));
+    }
 
-	/**
-	 * get display name of the user
-	 * @param string $uid user ID of the user
-	 * @return string display name
-	 */
-	public function getDisplayName($uid) {
-		return $this->handleRequest($uid, 'getDisplayName', array($uid));
-	}
+    /**
+     * get display name of the user
+     * @param string $uid user ID of the user
+     * @return string display name
+     */
+    public function getDisplayName($uid) {
+        return $this->handleRequest($uid, 'getDisplayName', array($uid));
+    }
 
-	/**
-	 * set display name of the user
-	 *
-	 * @param string $uid user ID of the user
-	 * @param string $displayName new display name
-	 * @return string display name
-	 */
-	public function setDisplayName($uid, $displayName) {
-		return $this->handleRequest($uid, 'setDisplayName', array($uid, $displayName));
-	}
+    /**
+     * set display name of the user
+     *
+     * @param string $uid user ID of the user
+     * @param string $displayName new display name
+     * @return string display name
+     */
+    public function setDisplayName($uid, $displayName) {
+        return $this->handleRequest($uid, 'setDisplayName', array($uid, $displayName));
+    }
 
-	/**
-	 * checks whether the user is allowed to change his avatar in Nextcloud
-	 * @param string $uid the Nextcloud user name
-	 * @return boolean either the user can or cannot
-	 */
-	public function canChangeAvatar($uid) {
-		return $this->handleRequest($uid, 'canChangeAvatar', array($uid));
-	}
+    /**
+     * checks whether the user is allowed to change his avatar in Nextcloud
+     * @param string $uid the Nextcloud user name
+     * @return boolean either the user can or cannot
+     */
+    public function canChangeAvatar($uid) {
+        return $this->handleRequest($uid, 'canChangeAvatar', array($uid));
+    }
 
-	/**
-	 * Get a list of all display names and user ids.
-	 * @param string $search
-	 * @param string|null $limit
-	 * @param string|null $offset
-	 * @return array an array of all displayNames (value) and the corresponding uids (key)
-	 */
-	public function getDisplayNames($search = '', $limit = null, $offset = null) {
-		//we do it just as the /OC_User implementation: do not play around with limit and offset but ask all backends
-		$users = array();
-		foreach($this->backends as $backend) {
-			$backendUsers = $backend->getDisplayNames($search, $limit, $offset);
-			if (is_array($backendUsers)) {
-				$users = $users + $backendUsers;
-			}
-		}
-		return $users;
-	}
+    /**
+     * Get a list of all display names and user ids.
+     * @param string $search
+     * @param string|null $limit
+     * @param string|null $offset
+     * @return array an array of all displayNames (value) and the corresponding uids (key)
+     */
+    public function getDisplayNames($search = '', $limit = null, $offset = null) {
+        //we do it just as the /OC_User implementation: do not play around with limit and offset but ask all backends
+        $users = array();
+        foreach($this->backends as $backend) {
+            $backendUsers = $backend->getDisplayNames($search, $limit, $offset);
+            if (is_array($backendUsers)) {
+                $users = $users + $backendUsers;
+            }
+        }
+        return $users;
+    }
 
-	/**
-	 * delete a user
-	 * @param string $uid The username of the user to delete
-	 * @return bool
-	 *
-	 * Deletes a user
-	 */
-	public function deleteUser($uid) {
-		return $this->handleRequest($uid, 'deleteUser', array($uid));
-	}
+    /**
+     * delete a user
+     * @param string $uid The username of the user to delete
+     * @return bool
+     *
+     * Deletes a user
+     */
+    public function deleteUser($uid) {
+        return $this->handleRequest($uid, 'deleteUser', array($uid));
+    }
 	
-	/**
-	 * Set password
-	 * @param string $uid The username
-	 * @param string $password The new password
-	 * @return bool
-	 *
-	 */
-	public function setPassword($uid, $password) {
-		return $this->handleRequest($uid, 'setPassword', array($uid, $password));
-	}
+    /**
+     * Set password
+     * @param string $uid The username
+     * @param string $password The new password
+     * @return bool
+     *
+     */
+    public function setPassword($uid, $password) {
+        return $this->handleRequest($uid, 'setPassword', array($uid, $password));
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function hasUserListings() {
-		return $this->refBackend->hasUserListings();
-	}
+    /**
+     * @return bool
+     */
+    public function hasUserListings() {
+        return $this->refBackend->hasUserListings();
+    }
 
-	/**
-	 * Count the number of users
-	 * @return int|bool
-	 */
-	public function countUsers() {
-		$users = false;
-		foreach($this->backends as $backend) {
-			$backendUsers = $backend->countUsers();
-			if ($backendUsers !== false) {
-				$users += $backendUsers;
-			}
-		}
-		return $users;
-	}
+    /**
+     * Count the number of users
+     * @return int|bool
+     */
+    public function countUsers() {
+        $users = false;
+        foreach($this->backends as $backend) {
+            $backendUsers = $backend->countUsers();
+            if ($backendUsers !== false) {
+                $users += $backendUsers;
+            }
+        }
+        return $users;
+    }
 
-	/**
-	 * Return access for LDAP interaction.
-	 * @param string $uid
-	 * @return Access instance of Access for LDAP interaction
-	 */
-	public function getLDAPAccess($uid) {
-		return $this->handleRequest($uid, 'getLDAPAccess', array($uid));
-	}
+    /**
+     * Return access for LDAP interaction.
+     * @param string $uid
+     * @return Access instance of Access for LDAP interaction
+     */
+    public function getLDAPAccess($uid) {
+        return $this->handleRequest($uid, 'getLDAPAccess', array($uid));
+    }
 	
-	/**
-	 * Return a new LDAP connection for the specified user.
-	 * The connection needs to be closed manually.
-	 * @param string $uid
-	 * @return resource of the LDAP connection
-	 */
-	public function getNewLDAPConnection($uid) {
-		return $this->handleRequest($uid, 'getNewLDAPConnection', array($uid));
-	}
+    /**
+     * Return a new LDAP connection for the specified user.
+     * The connection needs to be closed manually.
+     * @param string $uid
+     * @return resource of the LDAP connection
+     */
+    public function getNewLDAPConnection($uid) {
+        return $this->handleRequest($uid, 'getNewLDAPConnection', array($uid));
+    }
 
-	/**
-	 * Creates a new user in LDAP
-	 * @param $username
-	 * @param $password
-	 * @return bool
-	 */
-	public function createUser($username, $password) {
-		return $this->handleRequest($username, 'createUser', array($username,$password));
-	}
+    /**
+     * Creates a new user in LDAP
+     * @param $username
+     * @param $password
+     * @return bool
+     */
+    public function createUser($username, $password) {
+        return $this->handleRequest($username, 'createUser', array($username,$password));
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -53,11 +53,11 @@ 
 		INotificationManager $notificationManager, IUserSession $userSession,
 								UserPluginManager $userPluginManager) {
 		parent::__construct($ldap);
-		foreach($serverConfigPrefixes as $configPrefix) {
+		foreach ($serverConfigPrefixes as $configPrefix) {
 			$this->backends[$configPrefix] =
 				new User_LDAP($this->getAccess($configPrefix), $ocConfig, $notificationManager, $userSession, $userPluginManager);
 
-			if(is_null($this->refBackend)) {
+			if (is_null($this->refBackend)) {
 				$this->refBackend = &$this->backends[$configPrefix];
 			}
 		}
@@ -72,13 +72,13 @@ 
 	 */
 	protected function walkBackends($uid, $method, $parameters) {
 		$cacheKey = $this->getUserCacheKey($uid);
-		foreach($this->backends as $configPrefix => $backend) {
+		foreach ($this->backends as $configPrefix => $backend) {
 			$instance = $backend;
-			if(!method_exists($instance, $method)
+			if (!method_exists($instance, $method)
 				&& method_exists($this->getAccess($configPrefix), $method)) {
 				$instance = $this->getAccess($configPrefix);
 			}
-			if($result = call_user_func_array(array($instance, $method), $parameters)) {
+			if ($result = call_user_func_array(array($instance, $method), $parameters)) {
 				$this->writeToCache($cacheKey, $configPrefix);
 				return $result;
 			}
@@ -98,22 +98,22 @@ 
 		$cacheKey = $this->getUserCacheKey($uid);
 		$prefix = $this->getFromCache($cacheKey);
 		//in case the uid has been found in the past, try this stored connection first
-		if(!is_null($prefix)) {
-			if(isset($this->backends[$prefix])) {
+		if (!is_null($prefix)) {
+			if (isset($this->backends[$prefix])) {
 				$instance = $this->backends[$prefix];
-				if(!method_exists($instance, $method)
+				if (!method_exists($instance, $method)
 					&& method_exists($this->getAccess($prefix), $method)) {
 					$instance = $this->getAccess($prefix);
 				}
 				$result = call_user_func_array(array($instance, $method), $parameters);
-				if($result === $passOnWhen) {
+				if ($result === $passOnWhen) {
 					//not found here, reset cache to null if user vanished
 					//because sometimes methods return false with a reason
 					$userExists = call_user_func_array(
 						array($this->backends[$prefix], 'userExists'),
 						array($uid)
 					);
-					if(!$userExists) {
+					if (!$userExists) {
 						$this->writeToCache($cacheKey, null);
 					}
 				}
@@ -155,7 +155,7 @@ 
 	public function getUsers($search = '', $limit = 10, $offset = 0) {
 		//we do it just as the /OC_User implementation: do not play around with limit and offset but ask all backends
 		$users = array();
-		foreach($this->backends as $backend) {
+		foreach ($this->backends as $backend) {
 			$backendUsers = $backend->getUsers($search, $limit, $offset);
 			if (is_array($backendUsers)) {
 				$users = array_merge($users, $backendUsers);
@@ -203,7 +203,7 @@ 
 	 * @return string|false
 	 */
 	public function loginName2UserName($loginName) {
-		$id = 'LOGINNAME,' . $loginName;
+		$id = 'LOGINNAME,'.$loginName;
 		return $this->handleRequest($id, 'loginName2UserName', array($loginName));
 	}
 	
@@ -214,7 +214,7 @@ 
 	 * @return string|false with the username
 	 */
 	public function dn2UserName($dn) {
-		$id = 'DN,' . $dn;
+		$id = 'DN,'.$dn;
 		return $this->handleRequest($id, 'dn2UserName', array($dn));
 	}
 
@@ -266,7 +266,7 @@ 
 	public function getDisplayNames($search = '', $limit = null, $offset = null) {
 		//we do it just as the /OC_User implementation: do not play around with limit and offset but ask all backends
 		$users = array();
-		foreach($this->backends as $backend) {
+		foreach ($this->backends as $backend) {
 			$backendUsers = $backend->getDisplayNames($search, $limit, $offset);
 			if (is_array($backendUsers)) {
 				$users = $users + $backendUsers;
@@ -310,7 +310,7 @@ 
 	 */
 	public function countUsers() {
 		$users = false;
-		foreach($this->backends as $backend) {
+		foreach ($this->backends as $backend) {
 			$backendUsers = $backend->countUsers();
 			if ($backendUsers !== false) {
 				$users += $backendUsers;
@@ -345,6 +345,6 @@ 
 	 * @return bool
 	 */
 	public function createUser($username, $password) {
-		return $this->handleRequest($username, 'createUser', array($username,$password));
+		return $this->handleRequest($username, 'createUser', array($username, $password));
 	}
 }

apps/user_ldap/lib/Migration/UUIDFixGroup.php

Indentation +6 added lines, -6 removed lines

@@ -30,10 +30,10 @@
 use OCP\IConfig;
 
 class UUIDFixGroup extends UUIDFix {
-	public function __construct(GroupMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
-		$this->mapper = $mapper;
-		$this->proxy = new User_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config, 
-			\OC::$server->getNotificationManager(), \OC::$server->getUserSession(),
-			\OC::$server->query('LDAPUserPluginManager'));
-	}
+    public function __construct(GroupMapping $mapper, LDAP $ldap, IConfig $config, Helper $helper) {
+        $this->mapper = $mapper;
+        $this->proxy = new User_Proxy($helper->getServerConfigurationPrefixes(true), $ldap, $config, 
+            \OC::$server->getNotificationManager(), \OC::$server->getUserSession(),
+            \OC::$server->query('LDAPUserPluginManager'));
+    }
 }