summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-09-23 11:40:24 +0200
committerAleksander Machniak <alec@alec.pl>2013-09-23 11:42:38 +0200
commit065fdbaa6560e017d87f96414a2146ff6bc84969 (patch)
tree4156cd16a4bb14c828f61c5cf32eee1c23712267 /plugins
parent62fe7203e641696566af66d8ea447482a0398426 (diff)
Fix setting domain in virtualmin password driver (#1489332)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/password/drivers/virtualmin.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php
index 98bb50e63..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'];
@@ -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);