minor changes

the-djmaze · Feb 27, 2024 · 20f6dea · 20f6dea
1 parent 0763f3d
commit 20f6dea
Showing 1 changed file with 38 additions and 38 deletions.
diff --git a/plugins/ldap-identities/LdapIdentities.php b/plugins/ldap-identities/LdapIdentities.php
@@ -280,49 +280,49 @@ private function FindLdapResults(string $searchField, string $searchValue, strin
 		return $results;
 	}
 
-		// Function CleanupMailAddresses(): If a prefix is given this function removes addresses without / with the wrong prefix and then the prefix itself from all remaining values.
-		// This is usefull for example for importing Active Directory LDAP entry "proxyAddresses" which can hold different address types with prefixes like "X400:", "smtp:" "sip:" and others.
-
-		/**
-		@param array $entries
-		@param string $mailField
-		@paraam string $mailPrefix
-		@return array
-		*/
-		private function CleanupMailAddresses(array $entries, string $mailField, string $mailPrefix)
-		{
-			if (!empty($mailPrefix)) {
-				for ($i = 0; $i < $entries["count"]; $i++) {
-					// Remove addresses without the given prefix
-					$entries[$i]["$mailField"] = array_filter($entries[$i]["$mailField"],
-													function($prefixMail)
-													{
-														// $mailPrefix can't be used here, because it's nailed to the CleanupMailAddresses function and can't be passed to the array_filter function afaik.
-														// Ideas to avoid this are welcome.
-														if (stripos($prefixMail, $this->config->mail_prefix) === 0) {
-															return TRUE;
-														}
-														return FALSE;
+	// Function CleanupMailAddresses(): If a prefix is given this function removes addresses without / with the wrong prefix and then the prefix itself from all remaining values.
+	// This is usefull for example for importing Active Directory LDAP entry "proxyAddresses" which can hold different address types with prefixes like "X400:", "smtp:" "sip:" and others.
+
+	/**
+	@param array $entries
+	@param string $mailField
+	@paraam string $mailPrefix
+	@return array
+	*/
+	private function CleanupMailAddresses(array $entries, string $mailField, string $mailPrefix)
+	{
+		if (!empty($mailPrefix)) {
+			for ($i = 0; $i < $entries["count"]; $i++) {
+				// Remove addresses without the given prefix
+				$entries[$i]["$mailField"] = array_filter($entries[$i]["$mailField"],
+												function($prefixMail)
+												{
+													// $mailPrefix can't be used here, because it's nailed to the CleanupMailAddresses function and can't be passed to the array_filter function afaik.
+													// Ideas to avoid this are welcome.
+													if (stripos($prefixMail, $this->config->mail_prefix) === 0) {
+														return TRUE;
 													}
-												);
-					// Set "count" to new value
-					$newcount = count($entries[$i]["$mailField"]);
-					if (array_key_exists("count", $entries[$i]["$mailField"])) {
-						$newcount = $newcount - 1;
-					}
-					$entries[$i]["$mailField"]["count"] = $newcount;
-
-					// Remove the prefix
-					for ($j = 0; $j < $entries[$i]["$mailField"]["count"]; $j++) {
-						$mailPrefixLen = mb_strlen($mailPrefix);
-						$entries[$i]["$mailField"][$j] = substr($entries[$i]["$mailField"][$j], $mailPrefixLen);
-					}
+													return FALSE;
+												}
+											);
+				// Set "count" to new value
+				$newcount = count($entries[$i]["$mailField"]);
+				if (array_key_exists("count", $entries[$i]["$mailField"])) {
+					$newcount = $newcount - 1;
 				}
-			}
+				$entries[$i]["$mailField"]["count"] = $newcount;
 
-			return $entries;
+				// Remove the prefix
+				for ($j = 0; $j < $entries[$i]["$mailField"]["count"]; $j++) {
+					$mailPrefixLen = mb_strlen($mailPrefix);
+					$entries[$i]["$mailField"][$j] = substr($entries[$i]["$mailField"][$j], $mailPrefixLen);
+				}
+			}
 		}
 
+		return $entries;
+	}
+
 	/**
 	 * @param array $entry
 	 * @param string $attribute