nextcloud / server

apps/user_ldap/lib/Wizard.php

Spacing +22 added lines, -22 removed lines

@@ -117,7 +117,7 @@ 
 			throw new \Exception('Internal error: Invalid object type', 500);
 		}
 
-		return (int)$result;
+		return (int) $result;
 	}
 
 	public function countGroups() {
@@ -206,7 +206,7 @@ 
 
 		$filter = $this->access->combineFilterWithAnd([
 			$this->configuration->ldapUserFilter,
-			$attr . '=*'
+			$attr.'=*'
 		]);
 
 		$limit = ($existsCheck === false) ? null : 1;
@@ -233,7 +233,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
@@ -245,7 +245,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);
@@ -273,7 +273,7 @@ 
 
 		$attr = $this->configuration->ldapEmailAttribute;
 		if ($attr !== '') {
-			$count = (int)$this->countUsersWithAttribute($attr, true);
+			$count = (int) $this->countUsersWithAttribute($attr, true);
 			if ($count > 0) {
 				return false;
 			}
@@ -679,7 +679,7 @@ 
 			$p = $setting['port'];
 			$t = $setting['tls'];
 			$this->logger->debug(
-				'Wiz: trying port '. $p . ', TLS '. $t,
+				'Wiz: trying port '.$p.', TLS '.$t,
 				['app' => 'user_ldap']
 			);
 			//connectAndBind may throw Exception, it needs to be catched by the
@@ -701,11 +701,11 @@ 
 			if ($settingsFound === true) {
 				$config = [
 					'ldapPort' => $p,
-					'ldapTLS' => (int)$t
+					'ldapTLS' => (int) $t
 				];
 				$this->configuration->setConfiguration($config);
 				$this->logger->debug(
-					'Wiz: detected Port ' . $p,
+					'Wiz: detected Port '.$p,
 					['app' => 'user_ldap']
 				);
 				$this->result->addChange('ldap_port', $p);
@@ -750,7 +750,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;
@@ -901,7 +901,7 @@ 
 				if (is_array($objcs) && count($objcs) > 0) {
 					$filter .= '(|';
 					foreach ($objcs as $objc) {
-						$filter .= '(objectclass=' . $objc . ')';
+						$filter .= '(objectclass='.$objc.')';
 					}
 					$filter .= ')';
 					$parts++;
@@ -917,7 +917,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;
 							}
@@ -927,11 +927,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;
 						}
@@ -941,7 +941,7 @@ 
 				}
 				//wrap parts in AND condition
 				if ($parts > 1) {
-					$filter = '(&' . $filter . ')';
+					$filter = '(&'.$filter.')';
 				}
 				if ($filter === '') {
 					$filter = '(objectclass=*)';
@@ -954,7 +954,7 @@ 
 				if (is_array($objcs) && count($objcs) > 0) {
 					$filter .= '(|';
 					foreach ($objcs as $objc) {
-						$filter .= '(objectclass=' . $objc . ')';
+						$filter .= '(objectclass='.$objc.')';
 					}
 					$filter .= ')';
 					$parts++;
@@ -964,14 +964,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;
 
@@ -994,7 +994,7 @@ 
 						$attr = 'cn';
 					}
 					if ($attr !== '') {
-						$filterUsername = '(' . $attr . $loginpart . ')';
+						$filterUsername = '('.$attr.$loginpart.')';
 						$parts++;
 					}
 				}
@@ -1010,7 +1010,7 @@ 
 				if (is_array($attrsToFilter) && count($attrsToFilter) > 0) {
 					$filterAttributes = '(|';
 					foreach ($attrsToFilter as $attribute) {
-						$filterAttributes .= '(' . $attribute . $loginpart . ')';
+						$filterAttributes .= '('.$attribute.$loginpart.')';
 					}
 					$filterAttributes .= ')';
 					$parts++;
@@ -1095,7 +1095,7 @@ 
 		if ($login === true) {
 			$this->ldap->unbind($cr);
 			$this->logger->debug(
-				'Wiz: Bind successful to Port '. $port . ' TLS ' . (int)$tls,
+				'Wiz: Bind successful to Port '.$port.' TLS '.(int) $tls,
 				['app' => 'user_ldap']
 			);
 			return true;
@@ -1354,7 +1354,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