From 0bc0c29a77c0837ff442b32f3116ecd703040567 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Thu, 21 Jul 2011 22:47:53 +0000
Subject: [PATCH] functions.inc.php: - 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
---
 functions.inc.php | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/functions.inc.php b/functions.inc.php
index 1f02ddc9..5590c006 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -2179,18 +2179,18 @@ function create_admin($fUsername, $fPassword, $fPassword2, $fDomains, $no_genera
     global $PALANG;
     global $CONF;
     $error = 0;
-    $tMessage = '';
-    $pAdminCreate_admin_username_text = '';
-    $pAdminCreate_admin_password_text = '';
+    $pAdminCreate_admin_message = '';
+    $pAdminCreate_admin_username_text_error = '';
+    $pAdminCreate_admin_password_text_error = '';
 
     if (!check_email ($fUsername)) {
         $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)) {
         $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)) {
@@ -2198,18 +2198,17 @@ function create_admin($fUsername, $fPassword, $fPassword2, $fDomains, $no_genera
             $fPassword = generate_password ();
         } else {
             $error = 1;
-            $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
-            $pAdminCreate_admin_password_text = $PALANG['pAdminCreate_admin_password_text_error'];
+            $pAdminCreate_admin_password_text_error = $PALANG['pAdminCreate_admin_password_text_error'];
         }
     }
 
     if ($error != 1) {
         $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())");
         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 {
             if (!empty ($fDomains[0])) {
                 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())");
                 }
             }
-            $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) {
-                $tMessage .= " / $fPassword)</br />";
+                $pAdminCreate_admin_message .= " / $fPassword)</br />";
             } else {
                 if ($CONF['show_password'] == "YES" && $no_generate_password == 0) {
-                    $tMessage .= " / $fPassword)</br />";
+                    $pAdminCreate_admin_message .= " / $fPassword)</br />";
                 } else {
-                    $tMessage .= ")</br />";
+                    $pAdminCreate_admin_message .= ")</br />";
                 }
             }
         }
@@ -2236,9 +2235,9 @@ function create_admin($fUsername, $fPassword, $fPassword2, $fDomains, $no_genera
 
     return array(
         $error,
-        $tMessage,
-        $pAdminCreate_admin_username_text,
-        $pAdminCreate_admin_password_text
+        $pAdminCreate_admin_message,
+        $pAdminCreate_admin_username_text_error,
+        $pAdminCreate_admin_password_text_error
     );