From a0f006748f6127e1e8cca23ffd7fabe1c75d5336 Mon Sep 17 00:00:00 2001 From: "GDR\\!" Date: Thu, 24 May 2012 11:56:39 +0200 Subject: Password plugin made compatible with modern Virtualmin Added a new username format in Virtualmin driver, which works for default Virtualmin settings where username is user.postfix and domain is taken from email address. Example: email - info@goodcoffee.com login - info.goodcof --- plugins/password/drivers/virtualmin.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'plugins/password') diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php index b2547e07f..f6b9bd412 100644 --- a/plugins/password/drivers/virtualmin.php +++ b/plugins/password/drivers/virtualmin.php @@ -48,6 +48,10 @@ 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); } -- cgit v1.2.3 From 145503a32d6a3afb013ba165231cd2192bb2a7fe Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 4 Sep 2012 11:01:03 +0200 Subject: Fix parse error in virtualmin driver (#1488668) --- plugins/password/drivers/virtualmin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/password') diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php index f6b9bd412..f9eca9633 100644 --- a/plugins/password/drivers/virtualmin.php +++ b/plugins/password/drivers/virtualmin.php @@ -51,7 +51,7 @@ class rcube_virtualmin_password case 8: // domain taken from alias, username left as it was $email = $rcmail->user->data['alias']; $domain = substr(strrchr($email, "@"), 1); - break + break; default: // username@domain $domain = substr(strrchr($username, "@"), 1); } -- cgit v1.2.3