- Use mail_domain value for domain variables when there is no domain in username:

  sql and ldap drivers (#1486694)
- Created package.xml 


git-svn-id: https://svn.roundcube.net/trunk@3575 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 6 deletions

diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index 7e4907906..cb837edce 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -105,12 +105,9 @@ function password_save($curpass, $passwd)
 	    $sql = str_replace('%q', $db->quote($hash_curpass, 'text'), $sql);
     }
 
-    $user_info = explode('@', $_SESSION['username']);
-    if (count($user_info) >= 2) {
-	    $sql = str_replace('%l', $db->quote($user_info[0], 'text'), $sql);
-	    $sql = str_replace('%d', $db->quote($user_info[1], 'text'), $sql);
-    }
-    
+    // at least we should always have the local part
+    $sql = str_replace('%l', $db->quote(password::username_local(), 'text'), $sql);
+    $sql = str_replace('%d', $db->quote(password::username_domain(), 'text'), $sql);
     $sql = str_replace('%u', $db->quote($_SESSION['username'],'text'), $sql);
     $sql = str_replace('%h', $db->quote($_SESSION['imap_host'],'text'), $sql);
     $sql = str_replace('%p', $db->quote($passwd,'text'), $sql);