From 0b17aae0cd86e0d253f804045cfe131bff50be1d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 23 Sep 2013 05:40:24 -0400
Subject: [PATCH] Fix setting domain in virtualmin password driver (#1489332)
---
plugins/password/drivers/virtualmin.php | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php
index 2d2f73f..36c5466 100644
--- a/plugins/password/drivers/virtualmin.php
+++ b/plugins/password/drivers/virtualmin.php
@@ -18,8 +18,7 @@
{
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 @@
$domain = substr(strrchr($username, "@"), 1);
}
+ if (!$domain) {
+ $domain = $rcmail->user->get_username('domain');
+ }
+
$username = escapeshellcmd($username);
$domain = escapeshellcmd($domain);
$newpass = escapeshellcmd($newpass);
--
Gitblit v1.9.1