diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-05-26 10:35:26 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-05-26 10:35:26 +0200 |
| commit | ead98f4efb712deb124655fd6fe0bf30d8e642c5 (patch) | |
| tree | 349b9cdadccd50c9817e5b4b4ba6e30024b5f4fa /plugins/password | |
| parent | 9a8a86efcae2c3c5ff36f71cbba7acd5ce3d4c6f (diff) | |
| parent | d4d2e427a561d2fc93e6922f7c6d0ea3e8f6f4a9 (diff) | |
Merge branch 'release-0.8' of github.com:roundcube/roundcubemail into release-0.8
Diffstat (limited to 'plugins/password')
| -rw-r--r-- | plugins/password/config.inc.php.dist | 3 | ||||
| -rw-r--r-- | plugins/password/drivers/virtualmin.php | 4 |
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); } |