webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-09 05:02:44 +03:00
Code Activity

functions.inc.php - create_admin()

Browse Source 
- check password with validate_password()
- cleanup the handling of the success message

This fixes 50% of
https://sourceforge.net/tracker/?func=detail&aid=1951979&group_id=191583&atid=937964


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1193 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
Christian Boltz
2011-09-25 18:53:58 +00:00
parent 69b3df10e4
commit d6d4fb4748
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
functions.inc.php
View File

@@ -2277,15 +2277,23 @@ function create_admin($fUsername, $fPassword, $fPassword2, $fDomains, $no_genera
$pAdminCreate_admin_username_text_error = $PALANG['pAdminCreate_admin_username_text_error2'];
}
$generated_password = 0;
if (empty ($fPassword) or empty ($fPassword2) or ($fPassword != $fPassword2)) {
if (empty ($fPassword) and empty ($fPassword2) and $CONF['generate_password'] == "YES" && $no_generate_password == 0) {
$fPassword = generate_password ();
$generated_password = 1;
} else {
$error = 1;
$pAdminCreate_admin_password_text_error = $PALANG['pAdminCreate_admin_password_text_error'];
}
}
$validpass = validate_password($fPassword);
if(count($validpass) > 0 && $generated_password == 0) { # skip this check for generated passwords
$pAdminCreate_admin_password_text_error = $validpass[0]; # TODO: honor all error messages, not only the first one
$error = 1;
}
if ($error != 1) {
$password = pacrypt($fPassword);
// $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
@@ -2309,15 +2317,10 @@ function create_admin($fUsername, $fPassword, $fPassword2, $fDomains, $no_genera
}
}
$pAdminCreate_admin_message = $PALANG['pAdminCreate_admin_result_success'] . "<br />($fUsername";
if ($CONF['generate_password'] == "YES" && $no_generate_password == 0) {
$pAdminCreate_admin_message .= " / $fPassword)</br />";
} else {
if ($CONF['show_password'] == "YES" && $no_generate_password == 0) {
$pAdminCreate_admin_message .= " / $fPassword)</br />";
} else {
$pAdminCreate_admin_message .= ")</br />";
}
if ($CONF['show_password'] == "YES" || $generated_password == 1) {
$pAdminCreate_admin_message .= " / $fPassword";
}
$pAdminCreate_admin_message .= ")</br />";
}
}