plugins/kolab_auth
Aleksander Machniak
machniak at kolabsys.com
Sat Aug 3 12:58:15 CEST 2013
plugins/kolab_auth/kolab_auth_ldap.php | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
New commits:
commit 53d7357cef9ef46e53a7e52309c3a0d1e16d07ac
Author: Aleksander Machniak <machniak at kolabsys.com>
Date: Sat Aug 3 12:57:57 2013 +0200
code cleanup
diff --git a/plugins/kolab_auth/kolab_auth_ldap.php b/plugins/kolab_auth/kolab_auth_ldap.php
index 3a83d10..4584c60 100644
--- a/plugins/kolab_auth/kolab_auth_ldap.php
+++ b/plugins/kolab_auth/kolab_auth_ldap.php
@@ -391,17 +391,11 @@ class kolab_auth_ldap extends rcube_ldap_generic
list($usr, $dom) = explode('@', $user);
// unrealm domain, user login can contain a domain alias
- if ($dom != $domain && ($r_domain = $this->find_domain($dom))) {
- // $dom is a domain DN string?
- if (strpos($r_domain, '=')) {
- $dc = $r_domain;
- }
- else {
- $dc = 'dc=' . implode(',dc=', explode('.', $r_domain));
- }
+ if ($dom != $domain && ($dc = $this->find_domain($dom))) {
+ // @FIXME: we should replace domain in $user, I suppose
}
}
- else if ($domain && !strpos($user, '@')) {
+ else if ($domain) {
$user .= '@' . $domain;
}
@@ -426,7 +420,7 @@ class kolab_auth_ldap extends rcube_ldap_generic
*
* @param string $domain Domain name
*
- * @return string Domain name or domain DN string
+ * @return string Domain DN string
*/
function find_domain($domain)
{
@@ -458,7 +452,9 @@ class kolab_auth_ldap extends rcube_ldap_generic
return $entry['inetdomainbasedn'];
}
- return is_array($entry[$name_attr]) ? 'dc=' . implode(',dc=', explode('.', $entry[$name_attr][0])) : 'dc=' . implode(',dc=', explode('.', $entry[$name_attr]));
+ $domain = is_array($entry[$name_attr]) ? $entry[$name_attr][0] : $entry[$name_attr];
+
+ return $domain ? 'dc=' . implode(',dc=', explode('.', $domain)) : null;
}
}
More information about the commits
mailing list