- 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

1 files changed, 1 insertions, 33 deletions

diff --git a/plugins/password/password.php b/plugins/password/password.php
index eb9f19bda..eb0a30b0f 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -240,39 +240,7 @@ class password extends rcube_plugin
             default:
                 return $this->gettext('internalerror');
         }
-    }
-
-    static function username_local()
-    {
-        return password::user_login('local');
-    }
-
-    static function username_domain()
-    {
-        return password::user_login('domain');
-    }
-    
-    static function user_login($part = null)
-    {
-        $user_info = explode('@', $_SESSION['username']);
-  
-        // at least we should always have the local part
-        if ($part == 'local') {
-            return $user_info[0];
-        }
-        else if ($part == 'domain') {
-            if (!empty($user_info[1])) {
-                return $user_info[1];
-            }
-            // if no domain was provided use the default if available
-            if ($domain = rcmail::get_instance()->config->get('mail_domain')) {
-                return $domain;
-            }
-            return '';
-        }
-
-        return $_SESSION['username'];
-    }                                          
+    }                                     
 }
 
 ?>