Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2012-05-24 aaf4370a1f0a2ed802debfcb01ac184c4217c416

Merge branch 'master' of github.com:roundcube/roundcubemail

 plugins/password/config.inc.php.dist

@@ -308,7 +308,8 @@
// 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

 plugins/password/drivers/virtualmin.php

@@ -48,6 +48,10 @@
            $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);
        }