summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-05-24 03:25:56 -0700
committerAleksander Machniak <alec@alec.pl>2012-05-24 03:25:56 -0700
commit2d1709a37b8c20433444c680a0a4c159c43bc9a7 (patch)
treeb90513eb181f98415f6840ac396611e179edc94a
parent7eb4f2e1be6ee02bb386731209c77a156716b292 (diff)
parent6ffe0beaa4524f3a0cce64415052bbdda44a16d8 (diff)
Merge pull request #9 from gjedeer/master
Virtualmin plugin updated for current setups
-rw-r--r--plugins/password/config.inc.php.dist3
-rw-r--r--plugins/password/drivers/virtualmin.php4
2 files changed, 6 insertions, 1 deletions
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index aed0eaf28..37c79315d 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -308,7 +308,8 @@ $rcmail_config['hmailserver_server'] = array(
// 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 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);
}