In password virtualmin driver removed support for username in format based ...

Aleksander Machniak

2013-09-15 256d5b7216711e8c183222be1a0dc3850b623944

In password virtualmin driver removed support for username in format based on user alias (#1489332)

Conflicts:

	plugins/password/config.inc.php.dist

 plugins/password/config.inc.php.dist

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

 plugins/password/drivers/virtualmin.php

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