- Removed user_login/username_local/username_domain methods,

  use rcube_user::get_username instead (#1486707)


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

2 files changed, 5 insertions, 4 deletions

diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index a8aba0f74..f86abd7f4 100644
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@@ -133,14 +133,15 @@ function search_userdn($rcmail)
  */
 function substitute_vars($str)
 {
+    $rcmail = rcmail::get_instance();
     $str = str_replace(array(
             '%login',
             '%name',
             '%domain',
         ), array(
             $_SESSION['username'],
-            password::username_local(),
-            password::username_domain(),
+            $rcmail->user->get_username('local'),
+            $rcmail->user->get_username('domain'),
         ), $str
     );
 
diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index 2ed65d0a3..8677f231c 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -106,8 +106,8 @@ function password_save($curpass, $passwd)
     }
 
     // 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('%l', $db->quote($rcmail->user->get_username('local'), 'text'), $sql);
+    $sql = str_replace('%d', $db->quote($rcmail->user->get_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);