From f0c33d00dcb1c9fa394b45aba51466871a3f90af Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 24 Aug 2009 19:18:47 +0000
Subject: - Password/LDAP: support %name, %domain in userdn (#1486055)

git-svn-id: https://svn.roundcube.net/trunk@2869 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/plugins/password/drivers/ldap.php | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'roundcubemail/plugins/password/drivers/ldap.php')

diff --git a/roundcubemail/plugins/password/drivers/ldap.php b/roundcubemail/plugins/password/drivers/ldap.php
index 108782624..e38f13f8c 100644
--- a/roundcubemail/plugins/password/drivers/ldap.php
+++ b/roundcubemail/plugins/password/drivers/ldap.php
@@ -21,6 +21,14 @@ function password_save($curpass, $passwd)
     
     // 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;}
     
     // Connection Method
-- 
cgit v1.2.3