diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-05-24 12:40:01 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-05-24 12:40:01 +0200 |
| commit | aaf4370a1f0a2ed802debfcb01ac184c4217c416 (patch) | |
| tree | 7f748ec3b9734faa52fd549d170328e92618171b | |
| parent | 4d708e6c1d084cbf65e984fcd08c90678c9b2c60 (diff) | |
| parent | 2d1709a37b8c20433444c680a0a4c159c43bc9a7 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
| -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); } |