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

pull/122/head
Aleksander Machniak 11 years ago
parent 75c7adc41b
commit 1f22878608

@ -320,8 +320,7 @@ $config['hmailserver_server'] = array(
// 5: domain-username // 5: domain-username
// 6: username_domain // 6: username_domain
// 7: domain_username // 7: domain_username
// 8: username@domain; mbox.username $config['password_virtualmin_format'] = 0;
$config['password_virtualmin_format'] = 8;
// pw_usermod Driver options // pw_usermod Driver options

@ -48,10 +48,6 @@ class rcube_virtualmin_password
$pieces = explode("_", $username); $pieces = explode("_", $username);
$domain = $pieces[0]; $domain = $pieces[0];
break; 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 default: // username@domain
$domain = substr(strrchr($username, "@"), 1); $domain = substr(strrchr($username, "@"), 1);
} }

Loading…
Cancel
Save