From 20f6dea345b665e272497f28b7f00fcf000b0bf0 Mon Sep 17 00:00:00 2001 From: S-A-L13 Date: Tue, 27 Feb 2024 13:46:02 +0100 Subject: [PATCH] minor changes --- plugins/ldap-identities/LdapIdentities.php | 72 +++++++++++----------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/plugins/ldap-identities/LdapIdentities.php b/plugins/ldap-identities/LdapIdentities.php index a354487a5..4cc3e69d0 100644 --- a/plugins/ldap-identities/LdapIdentities.php +++ b/plugins/ldap-identities/LdapIdentities.php @@ -280,49 +280,49 @@ class LdapIdentities implements IIdentities 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. + // 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; + /** + @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; + 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; - // 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); - } + // 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; } + return $entries; + } + /** * @param array $entry * @param string $attribute