nextcloud / server

apps/user_ldap/lib/User/DeletedUsersIndex.php

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
 			'user_ldap', 'isDeleted', '1');
 
 		$userObjects = array();
-		foreach($deletedUsers as $user) {
+		foreach ($deletedUsers as $user) {
 			$userObjects[] = new OfflineUser($user, $this->config, $this->db, $this->mapping);
 		}
 		$this->deletedUsers = $userObjects;
@@ -84,7 +84,7 @@ 
 	 * @return \OCA\User_LDAP\User\OfflineUser[]
 	 */
 	public function getUsers() {
-		if(is_array($this->deletedUsers)) {
+		if (is_array($this->deletedUsers)) {
 			return $this->deletedUsers;
 		}
 		return $this->fetchDeletedUsers();
@@ -95,10 +95,10 @@ 
 	 * @return bool
 	 */
 	public function hasUsers() {
-		if($this->deletedUsers === false) {
+		if ($this->deletedUsers === false) {
 			$this->fetchDeletedUsers();
 		}
-		if(is_array($this->deletedUsers) && count($this->deletedUsers) > 0) {
+		if (is_array($this->deletedUsers) && count($this->deletedUsers) > 0) {
 			return true;
 		}
 		return false;

apps/user_ldap/lib/User/Manager.php

Spacing +11 added lines, -11 removed lines

@@ -130,7 +130,7 @@ 
 	 * @return null
 	 */
 	private function checkAccess() {
-		if(is_null($this->access)) {
+		if (is_null($this->access)) {
 			throw new \Exception('LDAP Access instance must be set first');
 		}
 	}
@@ -150,18 +150,18 @@ 
 			$this->access->getConnection()->ldapUserDisplayName,
 			$this->access->getConnection()->ldapUserDisplayName2,
 		);
-		foreach($possible as $attr) {
-			if(!is_null($attr)) {
+		foreach ($possible as $attr) {
+			if (!is_null($attr)) {
 				$attributes[] = $attr;
 			}
 		}
 
 		$homeRule = $this->access->getConnection()->homeFolderNamingRule;
-		if(strpos($homeRule, 'attr:') === 0) {
+		if (strpos($homeRule, 'attr:') === 0) {
 			$attributes[] = substr($homeRule, strlen('attr:'));
 		}
 
-		if(!$minimal) {
+		if (!$minimal) {
 			// attributes that are not really important but may come with big
 			// payload.
 			$attributes = array_merge($attributes, array(
@@ -204,11 +204,11 @@ 
 	 */
 	protected function createInstancyByUserName($id) {
 		//most likely a uid. Check whether it is a deleted user
-		if($this->isDeletedUser($id)) {
+		if ($this->isDeletedUser($id)) {
 			return $this->getDeletedUser($id);
 		}
 		$dn = $this->access->username2dn($id);
-		if($dn !== false) {
+		if ($dn !== false) {
 			return $this->createAndCache($dn, $id);
 		}
 		return null;
@@ -222,15 +222,15 @@ 
 	 */
 	public function get($id) {
 		$this->checkAccess();
-		if(isset($this->usersByDN[$id])) {
+		if (isset($this->usersByDN[$id])) {
 			return $this->usersByDN[$id];
-		} else if(isset($this->usersByUid[$id])) {
+		} else if (isset($this->usersByUid[$id])) {
 			return $this->usersByUid[$id];
 		}
 
-		if($this->access->stringResemblesDN($id) ) {
+		if ($this->access->stringResemblesDN($id)) {
 			$uid = $this->access->dn2username($id);
-			if($uid !== false) {
+			if ($uid !== false) {
 				return $this->createAndCache($id, $uid);
 			}
 		}

apps/user_ldap/lib/User/OfflineUser.php

Spacing +4 added lines, -4 removed lines

@@ -179,14 +179,14 @@ 
 	 * reads the user details
 	 */
 	protected function fetchDetails() {
-		$properties = array (
+		$properties = array(
 			'displayName' => 'user_ldap',
 			'uid'         => 'user_ldap',
 			'homePath'    => 'user_ldap',
 			'email'       => 'settings',
 			'lastLogin'   => 'login'
 		);
-		foreach($properties as $property => $app) {
+		foreach ($properties as $property => $app) {
 			$this->$property = $this->config->getUserValue($this->ocName, $app, $property, '');
 		}
 
@@ -209,7 +209,7 @@ 
 		', 1);
 		$query->execute(array($this->ocName));
 		$sResult = $query->fetchColumn(0);
-		if(intval($sResult) === 1) {
+		if (intval($sResult) === 1) {
 			$this->hasActiveShares = true;
 			return;
 		}
@@ -221,7 +221,7 @@ 
 		', 1);
 		$query->execute(array($this->ocName));
 		$sResult = $query->fetchColumn(0);
-		if(intval($sResult) === 1) {
+		if (intval($sResult) === 1) {
 			$this->hasActiveShares = true;
 			return;
 		}

apps/user_ldap/lib/Controller/ConfigAPIController.php

Spacing +10 added lines, -10 removed lines

@@ -147,12 +147,12 @@ 
 	public function delete($configID) {
 		try {
 			$this->ensureConfigIDExists($configID);
-			if(!$this->ldapHelper->deleteServerConfiguration($configID)) {
+			if (!$this->ldapHelper->deleteServerConfiguration($configID)) {
 				throw new OCSException('Could not delete configuration');
 			}
-		} catch(OCSException $e) {
+		} catch (OCSException $e) {
 			throw $e;
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			$this->logger->logException($e);
 			throw new OCSException('An issue occurred when deleting the config.');
 		}
@@ -187,7 +187,7 @@ 
 		try {
 			$this->ensureConfigIDExists($configID);
 
-			if(!is_array($configData)) {
+			if (!is_array($configData)) {
 				throw new OCSBadRequestException('configData is not properly set');
 			}
 
@@ -195,13 +195,13 @@ 
 			$configKeys = $configuration->getConfigTranslationArray();
 
 			foreach ($configKeys as $i => $key) {
-				if(isset($configData[$key])) {
+				if (isset($configData[$key])) {
 					$configuration->$key = $configData[$key];
 				}
 			}
 
 			$configuration->saveConfiguration();
-		} catch(OCSException $e) {
+		} catch (OCSException $e) {
 			throw $e;
 		} catch (\Exception $e) {
 			$this->logger->logException($e);
@@ -288,16 +288,16 @@ 
 
 			$config = new Configuration($configID);
 			$data = $config->getConfiguration();
-			if(!boolval(intval($showPassword))) {
+			if (!boolval(intval($showPassword))) {
 				$data['ldapAgentPassword'] = '***';
 			}
 			foreach ($data as $key => $value) {
-				if(is_array($value)) {
+				if (is_array($value)) {
 					$value = implode(';', $value);
 					$data[$key] = $value;
 				}
 			}
-		} catch(OCSException $e) {
+		} catch (OCSException $e) {
 			throw $e;
 		} catch (\Exception $e) {
 			$this->logger->logException($e);
@@ -315,7 +315,7 @@ 
 	 */
 	private function ensureConfigIDExists($configID) {
 		$prefixes = $this->ldapHelper->getServerConfigurationPrefixes();
-		if(!in_array($configID, $prefixes, true)) {
+		if (!in_array($configID, $prefixes, true)) {
 			throw new OCSNotFoundException('Config ID not found');
 		}
 	}

apps/user_ldap/lib/Jobs/UpdateGroups.php

Spacing +13 added lines, -13 removed lines

@@ -45,14 +45,14 @@ 
 
 	static private $groupBE;
 
-	public function __construct(){
+	public function __construct() {
 		$this->interval = self::getRefreshInterval();
 	}
 
 	/**
 	 * @param mixed $argument
 	 */
-	public function run($argument){
+	public function run($argument) {
 		self::updateGroups();
 	}
 
@@ -62,7 +62,7 @@ 
 		$knownGroups = array_keys(self::getKnownGroups());
 		$actualGroups = self::getGroupBE()->getGroups();
 
-		if(empty($actualGroups) && empty($knownGroups)) {
+		if (empty($actualGroups) && empty($knownGroups)) {
 			\OCP\Util::writeLog('user_ldap',
 				'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.',
 				\OCP\Util::INFO);
@@ -94,26 +94,26 @@ 
 			SET `owncloudusers` = ?
 			WHERE `owncloudname` = ?
 		');
-		foreach($groups as $group) {
+		foreach ($groups as $group) {
 			//we assume, that self::$groupsFromDB has been retrieved already
 			$knownUsers = unserialize(self::$groupsFromDB[$group]['owncloudusers']);
 			$actualUsers = self::getGroupBE()->usersInGroup($group);
 			$hasChanged = false;
-			foreach(array_diff($knownUsers, $actualUsers) as $removedUser) {
+			foreach (array_diff($knownUsers, $actualUsers) as $removedUser) {
 				\OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $group));
 				\OCP\Util::writeLog('user_ldap',
 				'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".',
 				\OCP\Util::INFO);
 				$hasChanged = true;
 			}
-			foreach(array_diff($actualUsers, $knownUsers) as $addedUser) {
+			foreach (array_diff($actualUsers, $knownUsers) as $addedUser) {
 				\OCP\Util::emitHook('OC_User', 'post_addToGroup', array('uid' => $addedUser, 'gid' => $group));
 				\OCP\Util::writeLog('user_ldap',
 				'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".',
 				\OCP\Util::INFO);
 				$hasChanged = true;
 			}
-			if($hasChanged) {
+			if ($hasChanged) {
 				$query->execute(array(serialize($actualUsers), $group));
 			}
 		}
@@ -132,7 +132,7 @@ 
 			INTO `*PREFIX*ldap_group_members` (`owncloudname`, `owncloudusers`)
 			VALUES (?, ?)
 		');
-		foreach($createdGroups as $createdGroup) {
+		foreach ($createdGroups as $createdGroup) {
 			\OCP\Util::writeLog('user_ldap',
 				'bgJ "updateGroups" – new group "'.$createdGroup.'" found.',
 				\OCP\Util::INFO);
@@ -154,7 +154,7 @@ 
 			FROM `*PREFIX*ldap_group_members`
 			WHERE `owncloudname` = ?
 		');
-		foreach($removedGroups as $removedGroup) {
+		foreach ($removedGroups as $removedGroup) {
 			\OCP\Util::writeLog('user_ldap',
 				'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.',
 				\OCP\Util::INFO);
@@ -169,13 +169,13 @@ 
 	 * @return \OCA\User_LDAP\Group_LDAP|\OCA\User_LDAP\Group_Proxy
 	 */
 	static private function getGroupBE() {
-		if(!is_null(self::$groupBE)) {
+		if (!is_null(self::$groupBE)) {
 			return self::$groupBE;
 		}
 		$helper = new Helper(\OC::$server->getConfig());
 		$configPrefixes = $helper->getServerConfigurationPrefixes(true);
 		$ldapWrapper = new LDAP();
-		if(count($configPrefixes) === 1) {
+		if (count($configPrefixes) === 1) {
 			//avoid the proxy when there is only one LDAP server configured
 			$dbc = \OC::$server->getDatabaseConnection();
 			$userManager = new Manager(
@@ -204,7 +204,7 @@ 
 	 * @return array
 	 */
 	static private function getKnownGroups() {
-		if(is_array(self::$groupsFromDB)) {
+		if (is_array(self::$groupsFromDB)) {
 			return self::$groupsFromDB;
 		}
 		$query = \OCP\DB::prepare('
@@ -213,7 +213,7 @@ 
 		');
 		$result = $query->execute()->fetchAll();
 		self::$groupsFromDB = array();
-		foreach($result as $dataset) {
+		foreach ($result as $dataset) {
 			self::$groupsFromDB[$dataset['owncloudname']] = $dataset;
 		}
 

apps/user_ldap/lib/Jobs/CleanUp.php

Spacing +14 added lines, -15 removed lines

@@ -80,41 +80,41 @@ 
 		//pass in app.php we do add here, except something else is passed e.g.
 		//in tests.
 
-		if(isset($arguments['helper'])) {
+		if (isset($arguments['helper'])) {
 			$this->ldapHelper = $arguments['helper'];
 		} else {
 			$this->ldapHelper = new Helper(\OC::$server->getConfig());
 		}
 
-		if(isset($arguments['ocConfig'])) {
+		if (isset($arguments['ocConfig'])) {
 			$this->ocConfig = $arguments['ocConfig'];
 		} else {
 			$this->ocConfig = \OC::$server->getConfig();
 		}
 
-		if(isset($arguments['userBackend'])) {
+		if (isset($arguments['userBackend'])) {
 			$this->userBackend = $arguments['userBackend'];
 		} else {
-			$this->userBackend =  new User_Proxy(
+			$this->userBackend = new User_Proxy(
 				$this->ldapHelper->getServerConfigurationPrefixes(true),
 				new LDAP(),
 				$this->ocConfig
 			);
 		}
 
-		if(isset($arguments['db'])) {
+		if (isset($arguments['db'])) {
 			$this->db = $arguments['db'];
 		} else {
 			$this->db = \OC::$server->getDatabaseConnection();
 		}
 
-		if(isset($arguments['mapping'])) {
+		if (isset($arguments['mapping'])) {
 			$this->mapping = $arguments['mapping'];
 		} else {
 			$this->mapping = new UserMapping($this->db);
 		}
 
-		if(isset($arguments['deletedUsersIndex'])) {
+		if (isset($arguments['deletedUsersIndex'])) {
 			$this->dui = $arguments['deletedUsersIndex'];
 		} else {
 			$this->dui = new DeletedUsersIndex(
@@ -129,11 +129,11 @@ 
 	public function run($argument) {
 		$this->setArguments($argument);
 
-		if(!$this->isCleanUpAllowed()) {
+		if (!$this->isCleanUpAllowed()) {
 			return;
 		}
 		$users = $this->mapping->getList($this->getOffset(), $this->limit);
-		if(!is_array($users)) {
+		if (!is_array($users)) {
 			//something wrong? Let's start from the beginning next time and
 			//abort
 			$this->setOffset(true);
@@ -159,7 +159,7 @@ 
 	 */
 	public function isCleanUpAllowed() {
 		try {
-			if($this->ldapHelper->haveDisabledConfigurations()) {
+			if ($this->ldapHelper->haveDisabledConfigurations()) {
 				return false;
 			}
 		} catch (\Exception $e) {
@@ -176,7 +176,7 @@ 
 	 * @return bool
 	 */
 	private function isCleanUpEnabled() {
-		return (bool)$this->ocConfig->getSystemValue(
+		return (bool) $this->ocConfig->getSystemValue(
 			'ldapUserCleanupInterval', strval($this->defaultIntervalMin));
 	}
 
@@ -185,7 +185,7 @@ 
 	 * @param array $users result from getMappedUsers()
 	 */
 	private function checkUsers(array $users) {
-		foreach($users as $user) {
+		foreach ($users as $user) {
 			$this->checkUser($user);
 		}
 	}
@@ -195,7 +195,7 @@ 
 	 * @param string[] $user
 	 */
 	private function checkUser(array $user) {
-		if($this->userBackend->userExistsOnLDAP($user['name'])) {
+		if ($this->userBackend->userExistsOnLDAP($user['name'])) {
 			//still available, all good
 
 			return;
@@ -217,8 +217,7 @@ 
 	 * @param bool $reset whether the offset should be set to 0
 	 */
 	public function setOffset($reset = false) {
-		$newOffset = $reset ? 0 :
-			$this->getOffset() + $this->limit;
+		$newOffset = $reset ? 0 : $this->getOffset() + $this->limit;
 		$this->ocConfig->setAppValue('user_ldap', 'cleanUpJobOffset', $newOffset);
 	}
 

apps/user_ldap/lib/WizardResult.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 	 * @param array|string $values
 	 */
 	public function addOptions($key, $values) {
-		if(!is_array($values)) {
+		if (!is_array($values)) {
 			$values = array($values);
 		}
 		$this->options[$key] = $values;
@@ -71,7 +71,7 @@ 
 	public function getResultArray() {
 		$result = array();
 		$result['changes'] = $this->changes;
-		if(count($this->options) > 0) {
+		if (count($this->options) > 0) {
 			$result['options'] = $this->options;
 		}
 		return $result;

apps/user_ldap/lib/Helper.php

Spacing +19 added lines, -19 removed lines

@@ -96,7 +96,7 @@ 
 		$keys = $this->getServersConfig($referenceConfigkey);
 
 		$result = array();
-		foreach($keys as $key) {
+		foreach ($keys as $key) {
 			$len = strlen($key) - strlen($referenceConfigkey);
 			$prefix = substr($key, 0, $len);
 			$result[$prefix] = $this->config->getAppValue('user_ldap', $key);
@@ -113,19 +113,19 @@ 
 	public function getNextServerConfigurationPrefix() {
 		$serverConnections = $this->getServerConfigurationPrefixes();
 
-		if(count($serverConnections) === 0) {
+		if (count($serverConnections) === 0) {
 			return 's01';
 		}
 
 		sort($serverConnections);
 		$lastKey = array_pop($serverConnections);
 		$lastNumber = intval(str_replace('s', '', $lastKey));
-		$nextPrefix = 's' . str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT);
+		$nextPrefix = 's'.str_pad($lastNumber + 1, 2, '0', STR_PAD_LEFT);
 		return $nextPrefix;
 	}
 
 	private function getServersConfig($value) {
-		$regex = '/' . $value . '$/S';
+		$regex = '/'.$value.'$/S';
 
 		$keys = $this->config->getAppKeys('user_ldap');
 		$result = [];
@@ -144,12 +144,12 @@ 
 	 * @return bool true on success, false otherwise
 	 */
 	public function deleteServerConfiguration($prefix) {
-		if(!in_array($prefix, self::getServerConfigurationPrefixes())) {
+		if (!in_array($prefix, self::getServerConfigurationPrefixes())) {
 			return false;
 		}
 
 		$saveOtherConfigurations = '';
-		if(empty($prefix)) {
+		if (empty($prefix)) {
 			$saveOtherConfigurations = 'AND `configkey` NOT LIKE \'s%\'';
 		}
 
@@ -163,11 +163,11 @@ 
 		');
 		$delRows = $query->execute(array($prefix.'%'));
 
-		if(\OCP\DB::isError($delRows)) {
+		if (\OCP\DB::isError($delRows)) {
 			return false;
 		}
 
-		if($delRows === 0) {
+		if ($delRows === 0) {
 			return false;
 		}
 
@@ -183,7 +183,7 @@ 
 		$all = $this->getServerConfigurationPrefixes(false);
 		$active = $this->getServerConfigurationPrefixes(true);
 
-		if(!is_array($all) || !is_array($active)) {
+		if (!is_array($all) || !is_array($active)) {
 			throw new \Exception('Unexpected Return Value');
 		}
 
@@ -197,14 +197,14 @@ 
 	 */
 	public function getDomainFromURL($url) {
 		$uinfo = parse_url($url);
-		if(!is_array($uinfo)) {
+		if (!is_array($uinfo)) {
 			return false;
 		}
 
 		$domain = false;
-		if(isset($uinfo['host'])) {
+		if (isset($uinfo['host'])) {
 			$domain = $uinfo['host'];
-		} else if(isset($uinfo['path'])) {
+		} else if (isset($uinfo['path'])) {
 			$domain = $uinfo['path'];
 		}
 
@@ -218,7 +218,7 @@ 
 	 */
 	public function setLDAPProvider() {
 		$current = \OC::$server->getConfig()->getSystemValue('ldapProviderFactory', null);
-		if(is_null($current)) {
+		if (is_null($current)) {
 			\OC::$server->getConfig()->setSystemValue('ldapProviderFactory', '\\OCA\\User_LDAP\\LDAPProviderFactory');
 		}
 	}
@@ -230,9 +230,9 @@ 
 	 */
 	public function sanitizeDN($dn) {
 		//treating multiple base DNs
-		if(is_array($dn)) {
+		if (is_array($dn)) {
 			$result = array();
-			foreach($dn as $singleDN) {
+			foreach ($dn as $singleDN) {
 				$result[] = $this->sanitizeDN($singleDN);
 			}
 			return $result;
@@ -283,7 +283,7 @@ 
 	 * @throws \Exception
 	 */
 	public static function loginName2UserName($param) {
-		if(!isset($param['uid'])) {
+		if (!isset($param['uid'])) {
 			throw new \Exception('key uid is expected to be set in $param');
 		}
 
@@ -294,11 +294,11 @@ 
 		$ldapWrapper = new LDAP();
 		$ocConfig = \OC::$server->getConfig();
 
-		$userBackend  = new User_Proxy(
+		$userBackend = new User_Proxy(
 			$configPrefixes, $ldapWrapper, $ocConfig
 		);
-		$uid = $userBackend->loginName2UserName($param['uid'] );
-		if($uid !== false) {
+		$uid = $userBackend->loginName2UserName($param['uid']);
+		if ($uid !== false) {
 			$param['uid'] = $uid;
 		}
 	}

apps/user_ldap/lib/Proxy.php

Spacing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
 	public function __construct(ILDAPWrapper $ldap) {
 		$this->ldap = $ldap;
 		$memcache = \OC::$server->getMemCacheFactory();
-		if($memcache->isAvailable()) {
+		if ($memcache->isAvailable()) {
 			$this->cache = $memcache->create();
 		}
 	}
@@ -64,7 +64,7 @@ 
 		static $groupMap;
 		static $db;
 		static $coreUserManager;
-		if(is_null($fs)) {
+		if (is_null($fs)) {
 			$ocConfig = \OC::$server->getConfig();
 			$fs       = new FilesystemHelper();
 			$log      = new LogWrapper();
@@ -88,7 +88,7 @@ 
 	 * @return mixed
 	 */
 	protected function getAccess($configPrefix) {
-		if(!isset(self::$accesses[$configPrefix])) {
+		if (!isset(self::$accesses[$configPrefix])) {
 			$this->addAccess($configPrefix);
 		}
 		return self::$accesses[$configPrefix];
@@ -142,8 +142,8 @@ 
 	 * @return mixed, the result of the specified method
 	 */
 	protected function handleRequest($id, $method, $parameters, $passOnWhen = false) {
-		$result = $this->callOnLastSeenOn($id,  $method, $parameters, $passOnWhen);
-		if($result === $passOnWhen) {
+		$result = $this->callOnLastSeenOn($id, $method, $parameters, $passOnWhen);
+		if ($result === $passOnWhen) {
 			$result = $this->walkBackends($id, $method, $parameters);
 		}
 		return $result;
@@ -155,7 +155,7 @@ 
 	 */
 	private function getCacheKey($key) {
 		$prefix = 'LDAP-Proxy-';
-		if(is_null($key)) {
+		if (is_null($key)) {
 			return $prefix;
 		}
 		return $prefix.md5($key);
@@ -166,7 +166,7 @@ 
 	 * @return mixed|null
 	 */
 	public function getFromCache($key) {
-		if(is_null($this->cache) || !$this->isCached($key)) {
+		if (is_null($this->cache) || !$this->isCached($key)) {
 			return null;
 		}
 		$key = $this->getCacheKey($key);
@@ -179,7 +179,7 @@ 
 	 * @return bool
 	 */
 	public function isCached($key) {
-		if(is_null($this->cache)) {
+		if (is_null($this->cache)) {
 			return false;
 		}
 		$key = $this->getCacheKey($key);
@@ -191,7 +191,7 @@ 
 	 * @param mixed $value
 	 */
 	public function writeToCache($key, $value) {
-		if(is_null($this->cache)) {
+		if (is_null($this->cache)) {
 			return;
 		}
 		$key   = $this->getCacheKey($key);
@@ -200,7 +200,7 @@ 
 	}
 
 	public function clearCache() {
-		if(is_null($this->cache)) {
+		if (is_null($this->cache)) {
 			return;
 		}
 		$this->cache->clear($this->getCacheKey(null));