From 0e1740e5a914250f06f52edb7de783ee945b8eaa Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sun, 20 Jun 2010 10:43:08 +0000
Subject: - 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
---
 plugins/password/password.php | 34 +---------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

(limited to 'plugins/password/password.php')

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'];
-    }                                          
+    }                                     
 }
 
 ?>
-- 
cgit v1.2.3