nextcloud / server

apps/user_ldap/ajax/getNewServerConfigPrefix.php

Spacing +2 added lines, -2 removed lines

@@ -32,12 +32,12 @@
 sort($serverConnections);
 $lk = array_pop($serverConnections);
 $ln = intval(str_replace('s', '', $lk));
-$nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT);
+$nk = 's'.str_pad($ln + 1, 2, '0', STR_PAD_LEFT);
 
 $resultData = array('configPrefix' => $nk);
 
 $newConfig = new \OCA\User_LDAP\Configuration($nk, false);
-if(isset($_POST['copyConfig'])) {
+if (isset($_POST['copyConfig'])) {
 	$originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']);
 	$newConfig->setConfiguration($originalConfig->getConfiguration());
 } else {

apps/user_ldap/lib/LDAP.php

Spacing +16 added lines, -16 removed lines

@@ -52,12 +52,12 @@ 
 	 * @return mixed
 	 */
 	public function connect($host, $port) {
-		if(strpos($host, '://') === false) {
-			$host = 'ldap://' . $host;
+		if (strpos($host, '://') === false) {
+			$host = 'ldap://'.$host;
 		}
-		if(strpos($host, ':', strpos($host, '://') + 1) === false) {
+		if (strpos($host, ':', strpos($host, '://') + 1) === false) {
 			//ldap_connect ignores port parameter when URLs are passed
-			$host .= ':' . $port;
+			$host .= ':'.$port;
 		}
 		return $this->invokeLDAPMethod('connect', $host);
 	}
@@ -267,13 +267,13 @@ 
 	 * @return bool
 	 */
 	protected function isResultFalse($result) {
-		if($result === false) {
+		if ($result === false) {
 			return true;
 		}
 
-		if($this->curFunc === 'ldap_search' && is_array($result)) {
+		if ($this->curFunc === 'ldap_search' && is_array($result)) {
 			foreach ($result as $singleResult) {
-				if($singleResult === false) {
+				if ($singleResult === false) {
 					return true;
 				}
 			}
@@ -287,8 +287,8 @@ 
 	 */
 	protected function invokeLDAPMethod() {
 		$arguments = func_get_args();
-		$func = 'ldap_' . array_shift($arguments);
-		if(function_exists($func)) {
+		$func = 'ldap_'.array_shift($arguments);
+		if (function_exists($func)) {
 			$this->preFunctionCall($func, $arguments);
 			$result = call_user_func_array($func, $arguments);
 			if ($this->isResultFalse($result)) {
@@ -318,12 +318,12 @@ 
 	 */
 	private function processLDAPError($resource) {
 		$errorCode = ldap_errno($resource);
-		if($errorCode === 0) {
+		if ($errorCode === 0) {
 			return;
 		}
-		$errorMsg  = ldap_error($resource);
+		$errorMsg = ldap_error($resource);
 
-		if($this->curFunc === 'ldap_get_entries'
+		if ($this->curFunc === 'ldap_get_entries'
 			&& $errorCode === -4) {
 		} else if ($errorCode === 32) {
 			//for now
@@ -337,10 +337,10 @@ 
 			throw new \Exception('LDAP Operations error', $errorCode);
 		} else if ($errorCode === 19) {
 			ldap_get_option($this->curArgs[0], LDAP_OPT_ERROR_STRING, $extended_error);
-			throw new ConstraintViolationException(!empty($extended_error)?$extended_error:$errorMsg, $errorCode);
+			throw new ConstraintViolationException(!empty($extended_error) ? $extended_error : $errorMsg, $errorCode);
 		} else {
 			\OCP\Util::writeLog('user_ldap',
-				'LDAP error '.$errorMsg.' (' .
+				'LDAP error '.$errorMsg.' ('.
 				$errorCode.') after calling '.
 				$this->curFunc,
 				\OCP\Util::DEBUG);
@@ -351,9 +351,9 @@ 
 	 * Called after an ldap method is run to act on LDAP error if necessary
 	 */
 	private function postFunctionCall() {
-		if($this->isResource($this->curArgs[0])) {
+		if ($this->isResource($this->curArgs[0])) {
 			$resource = $this->curArgs[0];
-		} else if(
+		} else if (
 			   $this->curFunc === 'ldap_search'
 			&& is_array($this->curArgs[0])
 			&& $this->isResource($this->curArgs[0][0])

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/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/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/Migration/UUIDFixInsert.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 	 */
 	public function run(IOutput $output) {
 		$installedVersion = $this->config->getAppValue('user_ldap', 'installed_version', '1.2.1');
-		if(version_compare($installedVersion, '1.2.1') !== -1) {
+		if (version_compare($installedVersion, '1.2.1') !== -1) {
 			return;
 		}
 
@@ -82,14 +82,14 @@ 
 			do {
 				$retry = false;
 				$records = $mapper->getList($offset, $batchSize);
-				if(count($records) === 0){
+				if (count($records) === 0) {
 					continue;
 				}
 				try {
 					$this->jobList->add($jobClass, ['records' => $records]);
 					$offset += $batchSize;
 				} catch (\InvalidArgumentException $e) {
-					if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) {
+					if (strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) {
 						$batchSize = intval(floor(count($records) * 0.8));
 						$retry = true;
 					}

apps/user_ldap/lib/Migration/UUIDFix.php

Spacing +3 added lines, -3 removed lines

@@ -38,14 +38,14 @@
 
 	public function run($argument) {
 		$isUser = $this->proxy instanceof User_Proxy;
-		foreach($argument['records'] as $record) {
+		foreach ($argument['records'] as $record) {
 			$access = $this->proxy->getLDAPAccess($record['name']);
 			$uuid = $access->getUUID($record['dn'], $isUser);
-			if($uuid === false) {
+			if ($uuid === false) {
 				// record not found, no prob, continue with the next
 				continue;
 			}
-			if($uuid !== $record['uuid']) {
+			if ($uuid !== $record['uuid']) {
 				$this->mapper->setUUIDbyDN($uuid, $record['dn']);
 			}
 		}