From 6ffe0beaa4524f3a0cce64415052bbdda44a16d8 Mon Sep 17 00:00:00 2001
From: GDR\! <gdr@go2.pl>
Date: Thu, 24 May 2012 06:07:44 -0400
Subject: [PATCH] Password plugin made compatible with modern Virtualmin
---
plugins/password/drivers/virtualmin.php | 4 ++++
plugins/password/config.inc.php.dist | 3 ++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index aed0eaf..37c7931 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -308,7 +308,8 @@
// 5: domain-username
// 6: username_domain
// 7: domain_username
-$rcmail_config['password_virtualmin_format'] = 0;
+// 8: username@domain; mbox.username
+$rcmail_config['password_virtualmin_format'] = 8;
// pw_usermod Driver options
diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php
index b2547e0..f6b9bd4 100644
--- a/plugins/password/drivers/virtualmin.php
+++ b/plugins/password/drivers/virtualmin.php
@@ -48,6 +48,10 @@
$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);
}
--
Gitblit v1.9.1