summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-09-15 09:10:07 +0200
committerAleksander Machniak <alec@alec.pl>2013-09-15 09:10:07 +0200
commit1f22878608dcdcbffa6db82914d89cbd0d32b0e1 (patch)
tree95c6208e6073c1dda723ef389e93b318cbf3064b /plugins
parent75c7adc41b6a1fb8ba614c4c1eb34312000d80ac (diff)
In password virtualmin driver removed support for username in format based on user alias (#1489332)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/password/config.inc.php.dist3
-rw-r--r--plugins/password/drivers/virtualmin.php4
2 files changed, 1 insertions, 6 deletions
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index 82f6617e5..bfea52918 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -320,8 +320,7 @@ $config['hmailserver_server'] = array(
// 5: domain-username
// 6: username_domain
// 7: domain_username
-// 8: username@domain; mbox.username
-$config['password_virtualmin_format'] = 8;
+$config['password_virtualmin_format'] = 0;
// pw_usermod Driver options
diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php
index 2c7aee617..2d2f73f97 100644
--- a/plugins/password/drivers/virtualmin.php
+++ b/plugins/password/drivers/virtualmin.php
@@ -48,10 +48,6 @@ 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);
}