From 0b17aae0cd86e0d253f804045cfe131bff50be1d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 23 Sep 2013 11:40:24 +0200 Subject: Fix setting domain in virtualmin password driver (#1489332) --- plugins/password/drivers/virtualmin.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php index 2d2f73f97..36c54664b 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']; @@ -52,6 +51,10 @@ class rcube_virtualmin_password $domain = substr(strrchr($username, "@"), 1); } + if (!$domain) { + $domain = $rcmail->user->get_username('domain'); + } + $username = escapeshellcmd($username); $domain = escapeshellcmd($domain); $newpass = escapeshellcmd($newpass); -- cgit v1.2.3