Changeset 2869 in subversion

Timestamp:

Aug 24, 2009 3:18:47 PM (4 years ago)

Author:

alec

Message:

• Password/LDAP: support %name, %domain in userdn (#1486055)

Location:

trunk/roundcubemail/plugins/password

Files:

• config.inc.php.dist (modified) (1 diff)
• drivers/ldap.php (modified) (1 diff)

trunk/roundcubemail/plugins/password/config.inc.php.dist

@@ -88 +88 @@
 
 // LDAP user DN mask
-// The user's DN is mandatory and as we only have his login, we need to re-create his DN using a mask
-// '%login' will be replace by the current roundcube user's login
+// The user's DN is mandatory and as we only have his login,
+// we need to re-create his DN using a mask
+// '%login' will be replaced by the current roundcube user's login
+// '%name' will be replaced by the current roundcube user's name part
+// '%domain' will be replaced by the current roundcube user's domain part
 // Exemple: 'uid=%login,ou=people,dc=exemple,dc=com'
 $rcmail_config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,dc=com';

trunk/roundcubemail/plugins/password/drivers/ldap.php

@@ -22 +22 @@
     // Building user DN
     $userDN = str_replace('%login', $_SESSION['username'], $rcmail->config->get('password_ldap_userDN_mask'));
+    
+    $parts = explode('@', $_SESSION['username']);
+    if (count($parts) == 2)
+    {
+        $userDN = str_replace('%name', $parts[0], $userDN);
+        $userDN = str_replace('%domain', $parts[1], $userDN);
+    }
+
     if (empty($userDN)) {return PASSWORD_CONNECT_ERROR;}