banananetwork
/
postfixadmin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

functions.inc.php:

Browse Source 
- create_admin():
  - renamed some internal variables
  - removed a variable setting that was always overwritten in the next line
  - disabled setting a var to $PALANG['pAdminCreate_admin_username_text']

This commit is part of the huge cleanup patch by Dale Blount (lnxus@SF),
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=3370510&group_id=191583


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1103 a1433add-5e2c-0410-b055-b7f2511e0802
pull/2/head
Christian Boltz 14 years ago
parent 12694a420f
commit 0bc0c29a77
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File

31
functions.inc.php
Unescape Escape View File

@ -2179,18 +2179,18 @@ function create_admin($fUsername, $fPassword, $fPassword2, $fDomains, $no_genera
global $PALANG; global $PALANG;
global $CONF; global $CONF;
$error = 0; $error = 0;
$tMessage = ''; $pAdminCreate_admin_message = '';
$pAdminCreate_admin_username_text = ''; $pAdminCreate_admin_username_text_error = '';
$pAdminCreate_admin_password_text = ''; $pAdminCreate_admin_password_text_error = '';
if (!check_email ($fUsername)) { if (!check_email ($fUsername)) {
$error = 1; $error = 1;
$pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text_error1']; $pAdminCreate_admin_username_text_error = $PALANG['pAdminCreate_admin_username_text_error1'];
} }
if (empty ($fUsername) or admin_exist ($fUsername)) { if (empty ($fUsername) or admin_exist ($fUsername)) {
$error = 1; $error = 1;
$pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text_error2']; $pAdminCreate_admin_username_text_error = $PALANG['pAdminCreate_admin_username_text_error2'];
} }
if (empty ($fPassword) or empty ($fPassword2) or ($fPassword != $fPassword2)) { if (empty ($fPassword) or empty ($fPassword2) or ($fPassword != $fPassword2)) {
@ -2198,18 +2198,17 @@ function create_admin($fUsername, $fPassword, $fPassword2, $fDomains, $no_genera
$fPassword = generate_password (); $fPassword = generate_password ();
} else { } else {
$error = 1; $error = 1;
$pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text']; $pAdminCreate_admin_password_text_error = $PALANG['pAdminCreate_admin_password_text_error'];
$pAdminCreate_admin_password_text = $PALANG['pAdminCreate_admin_password_text_error'];
} }
} }
if ($error != 1) { if ($error != 1) {
$password = pacrypt($fPassword); $password = pacrypt($fPassword);
$pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text']; // $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
$result = db_query ("INSERT INTO " . table_by_key('admin') . " (username,password,created,modified) VALUES ('$fUsername','$password',NOW(),NOW())"); $result = db_query ("INSERT INTO " . table_by_key('admin') . " (username,password,created,modified) VALUES ('$fUsername','$password',NOW(),NOW())");
if ($result['rows'] != 1) { if ($result['rows'] != 1) {
$tMessage = $PALANG['pAdminCreate_admin_result_error'] . "<br />($fUsername)<br />"; $pAdminCreate_admin_message = $PALANG['pAdminCreate_admin_result_error'] . "<br />($fUsername)<br />";
} else { } else {
if (!empty ($fDomains[0])) { if (!empty ($fDomains[0])) {
for ($i = 0; $i < sizeof ($fDomains); $i++) { for ($i = 0; $i < sizeof ($fDomains); $i++) {
@ -2217,14 +2216,14 @@ function create_admin($fUsername, $fPassword, $fPassword2, $fDomains, $no_genera
$result = db_query ("INSERT INTO " . table_by_key ('domain_admins') . " (username,domain,created) VALUES ('$fUsername','$domain',NOW())"); $result = db_query ("INSERT INTO " . table_by_key ('domain_admins') . " (username,domain,created) VALUES ('$fUsername','$domain',NOW())");
} }
} }
$tMessage = $PALANG['pAdminCreate_admin_result_success'] . "<br />($fUsername"; $pAdminCreate_admin_message = $PALANG['pAdminCreate_admin_result_success'] . "<br />($fUsername";
if ($CONF['generate_password'] == "YES" && $no_generate_password == 0) { if ($CONF['generate_password'] == "YES" && $no_generate_password == 0) {
$tMessage .= " / $fPassword)</br />"; $pAdminCreate_admin_message .= " / $fPassword)</br />";
} else { } else {
if ($CONF['show_password'] == "YES" && $no_generate_password == 0) { if ($CONF['show_password'] == "YES" && $no_generate_password == 0) {
$tMessage .= " / $fPassword)</br />"; $pAdminCreate_admin_message .= " / $fPassword)</br />";
} else { } else {
$tMessage .= ")</br />"; $pAdminCreate_admin_message .= ")</br />";
} }
} }
} }
@ -2236,9 +2235,9 @@ function create_admin($fUsername, $fPassword, $fPassword2, $fDomains, $no_genera
return array( return array(
$error, $error,
$tMessage, $pAdminCreate_admin_message,
$pAdminCreate_admin_username_text, $pAdminCreate_admin_username_text_error,
$pAdminCreate_admin_password_text $pAdminCreate_admin_password_text_error
); );

Write Preview
Loading…
Cancel
Save