nextcloud / server

apps/encryption/lib/KeyManager.php

Spacing +22 added lines, -22 removed lines

@@ -140,7 +140,7 @@ 
 		$this->recoveryKeyId = $this->config->getAppValue('encryption',
 			'recoveryKeyId');
 		if (empty($this->recoveryKeyId)) {
-			$this->recoveryKeyId = 'recoveryKey_' . substr(md5(time()), 0, 8);
+			$this->recoveryKeyId = 'recoveryKey_'.substr(md5(time()), 0, 8);
 			$this->config->setAppValue('encryption',
 				'recoveryKeyId',
 				$this->recoveryKeyId);
@@ -149,14 +149,14 @@ 
 		$this->publicShareKeyId = $this->config->getAppValue('encryption',
 			'publicShareKeyId');
 		if (empty($this->publicShareKeyId)) {
-			$this->publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
+			$this->publicShareKeyId = 'pubShare_'.substr(md5(time()), 0, 8);
 			$this->config->setAppValue('encryption', 'publicShareKeyId', $this->publicShareKeyId);
 		}
 
 		$this->masterKeyId = $this->config->getAppValue('encryption',
 			'masterKeyId');
 		if (empty($this->masterKeyId)) {
-			$this->masterKeyId = 'master_' . substr(md5(time()), 0, 8);
+			$this->masterKeyId = 'master_'.substr(md5(time()), 0, 8);
 			$this->config->setAppValue('encryption', 'masterKeyId', $this->masterKeyId);
 		}
 
@@ -176,13 +176,13 @@ 
 
 				// Save public key
 				$this->keyStorage->setSystemUserKey(
-					$this->publicShareKeyId . '.' . $this->publicKeyId, $keyPair['publicKey'],
+					$this->publicShareKeyId.'.'.$this->publicKeyId, $keyPair['publicKey'],
 					Encryption::ID);
 
 				// Encrypt private key empty passphrase
 				$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], '');
 				$header = $this->crypt->generateHeader();
-				$this->setSystemPrivateKey($this->publicShareKeyId, $header . $encryptedKey);
+				$this->setSystemPrivateKey($this->publicShareKeyId, $header.$encryptedKey);
 			} catch (\Throwable $e) {
 				$this->lockingProvider->releaseLock('encryption-generateSharedKey', ILockingProvider::LOCK_EXCLUSIVE);
 				throw $e;
@@ -212,13 +212,13 @@ 
 
 				// Save public key
 				$this->keyStorage->setSystemUserKey(
-					$this->masterKeyId . '.' . $this->publicKeyId, $keyPair['publicKey'],
+					$this->masterKeyId.'.'.$this->publicKeyId, $keyPair['publicKey'],
 					Encryption::ID);
 
 				// Encrypt private key with system password
 				$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $this->getMasterKeyPassword(), $this->masterKeyId);
 				$header = $this->crypt->generateHeader();
-				$this->setSystemPrivateKey($this->masterKeyId, $header . $encryptedKey);
+				$this->setSystemPrivateKey($this->masterKeyId, $header.$encryptedKey);
 			} catch (\Throwable $e) {
 				$this->lockingProvider->releaseLock('encryption-generateMasterKey', ILockingProvider::LOCK_EXCLUSIVE);
 				throw $e;
@@ -256,7 +256,7 @@ 
 	 * @return string
 	 */
 	public function getRecoveryKey() {
-		return $this->keyStorage->getSystemUserKey($this->recoveryKeyId . '.' . $this->publicKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->recoveryKeyId.'.'.$this->publicKeyId, Encryption::ID);
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 * @return bool
 	 */
 	public function checkRecoveryPassword($password) {
-		$recoveryKey = $this->keyStorage->getSystemUserKey($this->recoveryKeyId . '.' . $this->privateKeyId, Encryption::ID);
+		$recoveryKey = $this->keyStorage->getSystemUserKey($this->recoveryKeyId.'.'.$this->privateKeyId, Encryption::ID);
 		$decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $password);
 
 		if ($decryptedRecoveryKey) {
@@ -297,7 +297,7 @@ 
 		$header = $this->crypt->generateHeader();
 
 		if ($encryptedKey) {
-			$this->setPrivateKey($uid, $header . $encryptedKey);
+			$this->setPrivateKey($uid, $header.$encryptedKey);
 			return true;
 		}
 		return false;
@@ -311,7 +311,7 @@ 
 	public function setRecoveryKey($password, $keyPair) {
 		// Save Public Key
 		$this->keyStorage->setSystemUserKey($this->getRecoveryKeyId().
-			'.' . $this->publicKeyId,
+			'.'.$this->publicKeyId,
 			$keyPair['publicKey'],
 			Encryption::ID);
 
@@ -319,7 +319,7 @@ 
 		$header = $this->crypt->generateHeader();
 
 		if ($encryptedKey) {
-			$this->setSystemPrivateKey($this->getRecoveryKeyId(), $header . $encryptedKey);
+			$this->setSystemPrivateKey($this->getRecoveryKeyId(), $header.$encryptedKey);
 			return true;
 		}
 		return false;
@@ -379,7 +379,7 @@ 
 	 * @return boolean
 	 */
 	public function setShareKey($path, $uid, $key) {
-		$keyId = $uid . '.' . $this->shareKeyId;
+		$keyId = $uid.'.'.$this->shareKeyId;
 		return $this->keyStorage->setFileKey($path, $keyId, $key, Encryption::ID);
 	}
 
@@ -408,7 +408,7 @@ 
 			return false;
 		} catch (\Exception $e) {
 			$this->log->logException($e, [
-				'message' => 'Could not decrypt the private key from user "' . $uid . '"" during login. Assume password change on the user back-end.',
+				'message' => 'Could not decrypt the private key from user "'.$uid.'"" during login. Assume password change on the user back-end.',
 				'level' => ILogger::WARN,
 				'app' => 'encryption',
 			]);
@@ -469,7 +469,7 @@ 
 			// use public share key for public links
 			$uid = $this->getPublicShareKeyId();
 			$shareKey = $this->getShareKey($path, $uid);
-			$privateKey = $this->keyStorage->getSystemUserKey($this->publicShareKeyId . '.' . $this->privateKeyId, Encryption::ID);
+			$privateKey = $this->keyStorage->getSystemUserKey($this->publicShareKeyId.'.'.$this->privateKeyId, Encryption::ID);
 			$privateKey = $this->crypt->decryptPrivateKey($privateKey);
 		} else {
 			$shareKey = $this->getShareKey($path, $uid);
@@ -539,7 +539,7 @@ 
 	public function deleteShareKey($path, $keyId) {
 		return $this->keyStorage->deleteFileKey(
 			$path,
-			$keyId . '.' . $this->shareKeyId,
+			$keyId.'.'.$this->shareKeyId,
 			Encryption::ID);
 	}
 
@@ -550,7 +550,7 @@ 
 	 * @return mixed
 	 */
 	public function getShareKey($path, $uid) {
-		$keyId = $uid . '.' . $this->shareKeyId;
+		$keyId = $uid.'.'.$this->shareKeyId;
 		return $this->keyStorage->getFileKey($path, $keyId, Encryption::ID);
 	}
 
@@ -612,7 +612,7 @@ 
 	 * @return string
 	 */
 	public function getPublicShareKey() {
-		return $this->keyStorage->getSystemUserKey($this->publicShareKeyId . '.' . $this->publicKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->publicShareKeyId.'.'.$this->publicKeyId, Encryption::ID);
 	}
 
 	/**
@@ -681,7 +681,7 @@ 
 	 * @return string returns openssl key
 	 */
 	public function getSystemPrivateKey($keyId) {
-		return $this->keyStorage->getSystemUserKey($keyId . '.' . $this->privateKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($keyId.'.'.$this->privateKeyId, Encryption::ID);
 	}
 
 	/**
@@ -691,7 +691,7 @@ 
 	 */
 	public function setSystemPrivateKey($keyId, $key) {
 		return $this->keyStorage->setSystemUserKey(
-			$keyId . '.' . $this->privateKeyId,
+			$keyId.'.'.$this->privateKeyId,
 			$key,
 			Encryption::ID);
 	}
@@ -752,7 +752,7 @@ 
 	 * @return string
 	 */
 	public function getPublicMasterKey() {
-		return $this->keyStorage->getSystemUserKey($this->masterKeyId . '.' . $this->publicKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->masterKeyId.'.'.$this->publicKeyId, Encryption::ID);
 	}
 
 	/**
@@ -761,6 +761,6 @@ 
 	 * @return string
 	 */
 	public function getPrivateMasterKey() {
-		return $this->keyStorage->getSystemUserKey($this->masterKeyId . '.' . $this->privateKeyId, Encryption::ID);
+		return $this->keyStorage->getSystemUserKey($this->masterKeyId.'.'.$this->privateKeyId, Encryption::ID);
 	}
 }

apps/files_versions/lib/Expiration.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
 	/** @var bool */
 	private $canPurgeToSaveSpace;
 
-	public function __construct(IConfig $config,ITimeFactory $timeFactory) {
+	public function __construct(IConfig $config, ITimeFactory $timeFactory) {
 		$this->timeFactory = $timeFactory;
 		$this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto');
 
@@ -152,7 +152,7 @@ 
 		if (!ctype_digit($minValue) && $minValue !== 'auto') {
 			$isValid = false;
 			\OC::$server->getLogger()->warning(
-					$minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
+					$minValue.' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
 					['app' => 'files_versions']
 			);
 		}
@@ -160,7 +160,7 @@ 
 		if (!ctype_digit($maxValue) && $maxValue !== 'auto') {
 			$isValid = false;
 			\OC::$server->getLogger()->warning(
-					$maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
+					$maxValue.' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
 					['app' => 'files_versions']
 			);
 		}
@@ -178,13 +178,13 @@ 
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
 			// Keep for X days but delete anytime if space needed
-			$this->minAge = (int)$minValue;
+			$this->minAge = (int) $minValue;
 			$this->maxAge = self::NO_OBLIGATION;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
 			// Delete anytime if space needed, Delete all older than max automatically
 			$this->minAge = self::NO_OBLIGATION;
-			$this->maxAge = (int)$maxValue;
+			$this->maxAge = (int) $maxValue;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
 			// Delete all older than max OR older than min if space needed
@@ -194,8 +194,8 @@ 
 				$maxValue = $minValue;
 			}
 
-			$this->minAge = (int)$minValue;
-			$this->maxAge = (int)$maxValue;
+			$this->minAge = (int) $minValue;
+			$this->maxAge = (int) $maxValue;
 			$this->canPurgeToSaveSpace = false;
 		}
 	}

apps/user_ldap/ajax/getNewServerConfigPrefix.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 $serverConnections = $helper->getServerConfigurationPrefixes();
 sort($serverConnections);
 $lk = array_pop($serverConnections);
-$ln = (int)str_replace('s', '', $lk);
+$ln = (int) str_replace('s', '', $lk);
 $nk = 's'.str_pad($ln + 1, 2, '0', STR_PAD_LEFT);
 
 $resultData = ['configPrefix' => $nk];

apps/user_ldap/lib/LDAP.php

Spacing +5 added lines, -5 removed lines

@@ -70,11 +70,11 @@ 
 	 */
 	public function connect($host, $port) {
 		if (strpos($host, '://') === false) {
-			$host = 'ldap://' . $host;
+			$host = 'ldap://'.$host;
 		}
 		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);
 	}
@@ -222,7 +222,7 @@ 
 	 * @throws \Exception
 	 */
 	public function search($link, $baseDN, $filter, $attr, $attrsOnly = 0, $limit = 0) {
-		$oldHandler = set_error_handler(function ($no, $message, $file, $line) use (&$oldHandler) {
+		$oldHandler = set_error_handler(function($no, $message, $file, $line) use (&$oldHandler) {
 			if (strpos($message, 'Partial search results returned: Sizelimit exceeded') !== false) {
 				return true;
 			}
@@ -335,7 +335,7 @@ 
 	 */
 	protected function invokeLDAPMethod() {
 		$arguments = func_get_args();
-		$func = 'ldap_' . array_shift($arguments);
+		$func = 'ldap_'.array_shift($arguments);
 		if (function_exists($func)) {
 			$this->preFunctionCall($func, $arguments);
 			$result = call_user_func_array($func, $arguments);
@@ -387,7 +387,7 @@ 
 			throw new \Exception('LDAP Operations error', $errorCode);
 		} elseif ($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 {
 			\OC::$server->getLogger()->debug('LDAP error {message} ({code}) after calling {func}', [
 				'app' => 'user_ldap',

apps/user_ldap/lib/User/User.php

Spacing +23 added lines, -23 removed lines

@@ -161,7 +161,7 @@ 
 			return;
 		}
 		$this->config->setUserValue($this->getUsername(), 'user_ldap', 'isDeleted', '1');
-		$this->config->setUserValue($this->getUsername(), 'user_ldap', 'foundDeleted', (string)time());
+		$this->config->setUserValue($this->getUsername(), 'user_ldap', 'foundDeleted', (string) time());
 	}
 
 	/**
@@ -184,11 +184,11 @@ 
 		$displayName = $displayName2 = '';
 		$attr = strtolower($this->connection->ldapUserDisplayName);
 		if (isset($ldapEntry[$attr])) {
-			$displayName = (string)$ldapEntry[$attr][0];
+			$displayName = (string) $ldapEntry[$attr][0];
 		}
 		$attr = strtolower($this->connection->ldapUserDisplayName2);
 		if (isset($ldapEntry[$attr])) {
-			$displayName2 = (string)$ldapEntry[$attr][0];
+			$displayName2 = (string) $ldapEntry[$attr][0];
 		}
 		if ($displayName !== '') {
 			$this->composeAndStoreDisplayName($displayName, $displayName2);
@@ -280,7 +280,7 @@ 
 	 * @throws \Exception
 	 */
 	public function getHomePath($valueFromLDAP = null) {
-		$path = (string)$valueFromLDAP;
+		$path = (string) $valueFromLDAP;
 		$attr = null;
 
 		if (is_null($valueFromLDAP)
@@ -302,7 +302,7 @@ 
 				   && $path[1] === ':' && ('\\' === $path[2] || '/' === $path[2]))
 			) {
 				$path = $this->config->getSystemValue('datadirectory',
-						\OC::$SERVERROOT.'/data') . '/' . $path;
+						\OC::$SERVERROOT.'/data').'/'.$path;
 			}
 			//we need it to store it in the DB as well in case a user gets
 			//deleted so we can clean up afterwards
@@ -316,7 +316,7 @@ 
 			&& $this->config->getAppValue('user_ldap', 'enforce_home_folder_naming_rule', true)
 		) {
 			// a naming rule attribute is defined, but it doesn't exist for that LDAP user
-			throw new \Exception('Home dir attribute can\'t be read from LDAP for uid: ' . $this->getUsername());
+			throw new \Exception('Home dir attribute can\'t be read from LDAP for uid: '.$this->getUsername());
 		}
 
 		//false will apply default behaviour as defined and done by OC_User
@@ -387,9 +387,9 @@ 
 	 * @return string the effective display name
 	 */
 	public function composeAndStoreDisplayName($displayName, $displayName2 = '') {
-		$displayName2 = (string)$displayName2;
+		$displayName2 = (string) $displayName2;
 		if ($displayName2 !== '') {
-			$displayName .= ' (' . $displayName2 . ')';
+			$displayName .= ' ('.$displayName2.')';
 		}
 		$oldName = $this->config->getUserValue($this->uid, 'user_ldap', 'displayName', null);
 		if ($oldName !== $displayName) {
@@ -436,20 +436,20 @@ 
 		if ($this->wasRefreshed('email')) {
 			return;
 		}
-		$email = (string)$valueFromLDAP;
+		$email = (string) $valueFromLDAP;
 		if (is_null($valueFromLDAP)) {
 			$emailAttribute = $this->connection->ldapEmailAttribute;
 			if ($emailAttribute !== '') {
 				$aEmail = $this->access->readAttribute($this->dn, $emailAttribute);
 				if (is_array($aEmail) && (count($aEmail) > 0)) {
-					$email = (string)$aEmail[0];
+					$email = (string) $aEmail[0];
 				}
 			}
 		}
 		if ($email !== '') {
 			$user = $this->userManager->get($this->uid);
 			if (!is_null($user)) {
-				$currentEmail = (string)$user->getEMailAddress();
+				$currentEmail = (string) $user->getEMailAddress();
 				if ($currentEmail !== $email) {
 					$user->setEMailAddress($email);
 				}
@@ -494,19 +494,19 @@ 
 			if ($aQuota && (count($aQuota) > 0) && $this->verifyQuotaValue($aQuota[0])) {
 				$quota = $aQuota[0];
 			} elseif (is_array($aQuota) && isset($aQuota[0])) {
-				$this->log->log('no suitable LDAP quota found for user ' . $this->uid . ': [' . $aQuota[0] . ']', ILogger::DEBUG);
+				$this->log->log('no suitable LDAP quota found for user '.$this->uid.': ['.$aQuota[0].']', ILogger::DEBUG);
 			}
 		} elseif ($this->verifyQuotaValue($valueFromLDAP)) {
 			$quota = $valueFromLDAP;
 		} else {
-			$this->log->log('no suitable LDAP quota found for user ' . $this->uid . ': [' . $valueFromLDAP . ']', ILogger::DEBUG);
+			$this->log->log('no suitable LDAP quota found for user '.$this->uid.': ['.$valueFromLDAP.']', ILogger::DEBUG);
 		}
 
 		if ($quota === false && $this->verifyQuotaValue($defaultQuota)) {
 			// quota not found using the LDAP attribute (or not parseable). Try the default quota
 			$quota = $defaultQuota;
 		} elseif ($quota === false) {
-			$this->log->log('no suitable default quota found for user ' . $this->uid . ': [' . $defaultQuota . ']', ILogger::DEBUG);
+			$this->log->log('no suitable default quota found for user '.$this->uid.': ['.$defaultQuota.']', ILogger::DEBUG);
 			return;
 		}
 
@@ -514,7 +514,7 @@ 
 		if ($targetUser instanceof IUser) {
 			$targetUser->setQuota($quota);
 		} else {
-			$this->log->log('trying to set a quota for user ' . $this->uid . ' but the user is missing', ILogger::INFO);
+			$this->log->log('trying to set a quota for user '.$this->uid.' but the user is missing', ILogger::INFO);
 		}
 	}
 
@@ -596,7 +596,7 @@ 
 			return true;
 		} catch (\Exception $e) {
 			\OC::$server->getLogger()->logException($e, [
-				'message' => 'Could not set avatar for ' . $this->dn,
+				'message' => 'Could not set avatar for '.$this->dn,
 				'level' => ILogger::INFO,
 				'app' => 'user_ldap',
 			]);
@@ -652,8 +652,8 @@ 
 	 */
 	public function handlePasswordExpiry($params) {
 		$ppolicyDN = $this->connection->ldapDefaultPPolicyDN;
-		if (empty($ppolicyDN) || ((int)$this->connection->turnOnPasswordChange !== 1)) {
-			return;//password expiry handling disabled
+		if (empty($ppolicyDN) || ((int) $this->connection->turnOnPasswordChange !== 1)) {
+			return; //password expiry handling disabled
 		}
 		$uid = $params['uid'];
 		if (isset($uid) && $uid === $this->getUsername()) {
@@ -663,7 +663,7 @@ 
 			if (array_key_exists('pwdpolicysubentry', $result[0])) {
 				$pwdPolicySubentry = $result[0]['pwdpolicysubentry'];
 				if ($pwdPolicySubentry && (count($pwdPolicySubentry) > 0)) {
-					$ppolicyDN = $pwdPolicySubentry[0];//custom ppolicy DN
+					$ppolicyDN = $pwdPolicySubentry[0]; //custom ppolicy DN
 				}
 			}
 
@@ -672,7 +672,7 @@ 
 			$pwdChangedTime = array_key_exists('pwdchangedtime', $result[0]) ? $result[0]['pwdchangedtime'] : [];
 
 			//retrieve relevant password policy attributes
-			$cacheKey = 'ppolicyAttributes' . $ppolicyDN;
+			$cacheKey = 'ppolicyAttributes'.$ppolicyDN;
 			$result = $this->connection->getFromCache($cacheKey);
 			if (is_null($result)) {
 				$result = $this->access->search('objectclass=*', $ppolicyDN, ['pwdgraceauthnlimit', 'pwdmaxage', 'pwdexpirewarning']);
@@ -686,7 +686,7 @@ 
 			//handle grace login
 			if (!empty($pwdGraceUseTime)) { //was this a grace login?
 				if (!empty($pwdGraceAuthNLimit)
-					&& count($pwdGraceUseTime) < (int)$pwdGraceAuthNLimit[0]) { //at least one more grace login available?
+					&& count($pwdGraceUseTime) < (int) $pwdGraceAuthNLimit[0]) { //at least one more grace login available?
 					$this->config->setUserValue($uid, 'user_ldap', 'needsPasswordReset', 'true');
 					header('Location: '.\OC::$server->getURLGenerator()->linkToRouteAbsolute(
 					'user_ldap.renewPassword.showRenewPasswordForm', ['user' => $uid]));
@@ -707,8 +707,8 @@ 
 			if (!empty($pwdChangedTime)) {
 				if (!empty($pwdMaxAge)
 					&& !empty($pwdExpireWarning)) {
-					$pwdMaxAgeInt = (int)$pwdMaxAge[0];
-					$pwdExpireWarningInt = (int)$pwdExpireWarning[0];
+					$pwdMaxAgeInt = (int) $pwdMaxAge[0];
+					$pwdExpireWarningInt = (int) $pwdExpireWarning[0];
 					if ($pwdMaxAgeInt > 0 && $pwdExpireWarningInt > 0) {
 						$pwdChangedTimeDt = \DateTime::createFromFormat('YmdHisZ', $pwdChangedTime[0]);
 						$pwdChangedTimeDt->add(new \DateInterval('PT'.$pwdMaxAgeInt.'S'));

apps/user_ldap/lib/Configuration.php

Spacing +1 added lines, -1 removed lines

@@ -550,7 +550,7 @@
 			'ldap_default_ppolicy_dn' => 'ldapDefaultPPolicyDN',
 			'ldap_ext_storage_home_attribute' => 'ldapExtStorageHomeAttribute',
 			'ldap_matching_rule_in_chain_state' => 'ldapMatchingRuleInChainState',
-			'ldapIgnoreNamingRules' => 'ldapIgnoreNamingRules',	// sysconfig
+			'ldapIgnoreNamingRules' => 'ldapIgnoreNamingRules', // sysconfig
 		];
 		return $array;
 	}

apps/user_ldap/lib/Wizard.php

Spacing +25 added lines, -25 removed lines

@@ -115,7 +115,7 @@ 
 			throw new \Exception('Internal error: Invalid object type', 500);
 		}
 
-		return (int)$result;
+		return (int) $result;
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 		if ($count > 1000) {
 			return '> 1000';
 		}
-		return (string)$count;
+		return (string) $count;
 	}
 
 	public function countGroups() {
@@ -211,7 +211,7 @@ 
 
 		$filter = $this->access->combineFilterWithAnd([
 			$this->configuration->ldapUserFilter,
-			$attr . '=*'
+			$attr.'=*'
 		]);
 
 		$limit = ($existsCheck === false) ? null : 1;
@@ -238,7 +238,7 @@ 
 		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);
+			$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
@@ -250,7 +250,7 @@ 
 		// first attribute that has at least one result wins
 		$displayNameAttrs = ['displayname', 'cn'];
 		foreach ($displayNameAttrs as $attr) {
-			$count = (int)$this->countUsersWithAttribute($attr, true);
+			$count = (int) $this->countUsersWithAttribute($attr, true);
 
 			if ($count > 0) {
 				$this->applyFind('ldap_display_name', $attr);
@@ -278,7 +278,7 @@ 
 
 		$attr = $this->configuration->ldapEmailAttribute;
 		if ($attr !== '') {
-			$count = (int)$this->countUsersWithAttribute($attr, true);
+			$count = (int) $this->countUsersWithAttribute($attr, true);
 			if ($count > 0) {
 				return false;
 			}
@@ -301,8 +301,8 @@ 
 		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 ' .
+				\OCP\Util::writeLog('user_ldap', 'The mail attribute has '.
+					'automatically been reset, because the original value '.
 					'did not return any results.', ILogger::INFO);
 			}
 		}
@@ -681,7 +681,7 @@ 
 		foreach ($portSettings as $setting) {
 			$p = $setting['port'];
 			$t = $setting['tls'];
-			\OCP\Util::writeLog('user_ldap', 'Wiz: trying port '. $p . ', TLS '. $t, ILogger::DEBUG);
+			\OCP\Util::writeLog('user_ldap', 'Wiz: trying port '.$p.', TLS '.$t, ILogger::DEBUG);
 			//connectAndBind may throw Exception, it needs to be catched by the
 			//callee of this method
 
@@ -701,10 +701,10 @@ 
 			if ($settingsFound === true) {
 				$config = [
 					'ldapPort' => $p,
-					'ldapTLS' => (int)$t
+					'ldapTLS' => (int) $t
 				];
 				$this->configuration->setConfiguration($config);
-				\OCP\Util::writeLog('user_ldap', 'Wiz: detected Port ' . $p, ILogger::DEBUG);
+				\OCP\Util::writeLog('user_ldap', 'Wiz: detected Port '.$p, ILogger::DEBUG);
 				$this->result->addChange('ldap_port', $p);
 				return $this->result;
 			}
@@ -747,7 +747,7 @@ 
 
 		$dparts = explode('.', $domain);
 		while (count($dparts) > 0) {
-			$base2 = 'dc=' . implode(',dc=', $dparts);
+			$base2 = 'dc='.implode(',dc=', $dparts);
 			if ($base !== $base2 && $this->testBaseDN($base2)) {
 				$this->applyFind('ldap_base', $base2);
 				return $this->result;
@@ -896,7 +896,7 @@ 
 				if (is_array($objcs) && count($objcs) > 0) {
 					$filter .= '(|';
 					foreach ($objcs as $objc) {
-						$filter .= '(objectclass=' . $objc . ')';
+						$filter .= '(objectclass='.$objc.')';
 					}
 					$filter .= ')';
 					$parts++;
@@ -912,7 +912,7 @@ 
 						}
 						$base = $this->configuration->ldapBase[0];
 						foreach ($cns as $cn) {
-							$rr = $this->ldap->search($cr, $base, 'cn=' . $cn, ['dn', 'primaryGroupToken']);
+							$rr = $this->ldap->search($cr, $base, 'cn='.$cn, ['dn', 'primaryGroupToken']);
 							if (!$this->ldap->isResource($rr)) {
 								continue;
 							}
@@ -922,11 +922,11 @@ 
 							if ($dn === false || $dn === '') {
 								continue;
 							}
-							$filterPart = '(memberof=' . $dn . ')';
+							$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;
 						}
@@ -936,7 +936,7 @@ 
 				}
 				//wrap parts in AND condition
 				if ($parts > 1) {
-					$filter = '(&' . $filter . ')';
+					$filter = '(&'.$filter.')';
 				}
 				if ($filter === '') {
 					$filter = '(objectclass=*)';
@@ -949,7 +949,7 @@ 
 				if (is_array($objcs) && count($objcs) > 0) {
 					$filter .= '(|';
 					foreach ($objcs as $objc) {
-						$filter .= '(objectclass=' . $objc . ')';
+						$filter .= '(objectclass='.$objc.')';
 					}
 					$filter .= ')';
 					$parts++;
@@ -959,14 +959,14 @@ 
 				if (is_array($cns) && count($cns) > 0) {
 					$filter .= '(|';
 					foreach ($cns as $cn) {
-						$filter .= '(cn=' . $cn . ')';
+						$filter .= '(cn='.$cn.')';
 					}
 					$filter .= ')';
 				}
 				$parts++;
 				//wrap parts in AND condition
 				if ($parts > 1) {
-					$filter = '(&' . $filter . ')';
+					$filter = '(&'.$filter.')';
 				}
 				break;
 
@@ -989,7 +989,7 @@ 
 						$attr = 'cn';
 					}
 					if ($attr !== '') {
-						$filterUsername = '(' . $attr . $loginpart . ')';
+						$filterUsername = '('.$attr.$loginpart.')';
 						$parts++;
 					}
 				}
@@ -1005,7 +1005,7 @@ 
 				if (is_array($attrsToFilter) && count($attrsToFilter) > 0) {
 					$filterAttributes = '(|';
 					foreach ($attrsToFilter as $attribute) {
-						$filterAttributes .= '(' . $attribute . $loginpart . ')';
+						$filterAttributes .= '('.$attribute.$loginpart.')';
 					}
 					$filterAttributes .= ')';
 					$parts++;
@@ -1080,7 +1080,7 @@ 
 
 		if ($login === true) {
 			$this->ldap->unbind($cr);
-			\OCP\Util::writeLog('user_ldap', 'Wiz: Bind successful to Port '. $port . ' TLS ' . (int)$tls, ILogger::DEBUG);
+			\OCP\Util::writeLog('user_ldap', 'Wiz: Bind successful to Port '.$port.' TLS '.(int) $tls, ILogger::DEBUG);
 			return true;
 		}
 
@@ -1337,7 +1337,7 @@ 
 		//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 = [];
 
 		//In case the port is already provided, we will check this first

apps/user_ldap/lib/Command/Search.php

Spacing +3 added lines, -3 removed lines

@@ -112,8 +112,8 @@ 
 		$configPrefixes = $helper->getServerConfigurationPrefixes(true);
 		$ldapWrapper = new LDAP();
 
-		$offset = (int)$input->getOption('offset');
-		$limit = (int)$input->getOption('limit');
+		$offset = (int) $input->getOption('offset');
+		$limit = (int) $input->getOption('limit');
 		$this->validateOffsetAndLimit($offset, $limit);
 
 		if ($input->getOption('group')) {
@@ -140,7 +140,7 @@ 
 
 		$result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset);
 		foreach ($result as $id => $name) {
-			$line = $name . ($printID ? ' ('.$id.')' : '');
+			$line = $name.($printID ? ' ('.$id.')' : '');
 			$output->writeln($line);
 		}
 		return 0;

apps/twofactor_backupcodes/lib/BackgroundJob/RememberBackupCodesJob.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 		}
 
 		$providers = $this->registry->getProviderStates($user);
-		$state2fa = array_reduce($providers, function (bool $carry, bool $state) {
+		$state2fa = array_reduce($providers, function(bool $carry, bool $state) {
 			return $carry || $state;
 		}, false);