From 59478e06c25303a790a0840ab2ac30662c4ef781 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <root@paranoid>
Date: Tue, 5 Aug 2014 16:46:22 +0200
Subject:  c'est la merde..

---
 plugins/password/drivers/virtualmin.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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

diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php
index 2c7aee617..40f5c2529 100644
--- a/plugins/password/drivers/virtualmin.php
+++ b/plugins/password/drivers/virtualmin.php
@@ -18,8 +18,7 @@ class rcube_virtualmin_password
 {
     function save($currpass, $newpass)
     {
-        $rcmail = rcmail::get_instance();
-
+        $rcmail   = rcmail::get_instance();
         $format   = $rcmail->config->get('password_virtualmin_format', 0);
         $username = $_SESSION['username'];
 
@@ -48,14 +47,14 @@ class rcube_virtualmin_password
             $pieces = explode("_", $username);
             $domain = $pieces[0];
             break;
-        case 8: // domain taken from alias, username left as it was
-            $email = $rcmail->user->data['alias'];
-            $domain = substr(strrchr($email, "@"), 1);
-            break;
         default: // username@domain
             $domain = substr(strrchr($username, "@"), 1);
         }
 
+        if (!$domain) {
+            $domain = $rcmail->user->get_username('domain');
+        }
+
         $username = escapeshellcmd($username);
         $domain   = escapeshellcmd($domain);
         $newpass  = escapeshellcmd($newpass);
@@ -67,7 +66,7 @@ class rcube_virtualmin_password
             return PASSWORD_SUCCESS;
         }
         else {
-            rcube::raise_error(array(
+            raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
-- 
cgit v1.2.3