diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-09-20 08:18:54 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-09-20 08:18:54 +0200 |
| commit | b334a01791689a16c8d6b10955df850b891ff40e (patch) | |
| tree | 34173fc260a63a18ec56b75825cdc0925c84f594 /plugins | |
| parent | 1bfd8ac27aa09421e77b629806dc9f667aa32cb6 (diff) | |
| parent | c1ff572e176dc930c52063e53364daa315d34666 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
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 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); } |