diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-09-15 09:10:07 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-09-15 09:12:10 +0200 |
| commit | 256d5b7216711e8c183222be1a0dc3850b623944 (patch) | |
| tree | 88d8ba107a8706b1d16167b86ebcda9a102a7a68 /plugins | |
| parent | b8c2554f1fc8051b6a1c03f6d7a78d4100a9686b (diff) | |
In password virtualmin driver removed support for username in format based on user alias (#1489332)
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/password/config.inc.php.dist | 3 | ||||
| -rw-r--r-- | plugins/password/drivers/virtualmin.php | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist index e960bbe00..a40e2a93f 100644 --- a/plugins/password/config.inc.php.dist +++ b/plugins/password/config.inc.php.dist @@ -322,8 +322,7 @@ $rcmail_config['hmailserver_server'] = array( // 5: domain-username // 6: username_domain // 7: domain_username -// 8: username@domain; mbox.username -$rcmail_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 d2b765a9e..98bb50e63 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); } |