SF.net SVN: postfixadmin:[1078] trunk/setup.php

[<chr...@us...>]

Revision: 1078
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1078&view=rev
Author:   christian_boltz
Date:     2011-07-18 21:59:55 +0000 (Mon, 18 Jul 2011)

Log Message:
-----------
setup.php:
- renamed $tMessage to $setupMessage

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

Modified Paths:
--------------
    trunk/setup.php

Modified: trunk/setup.php
===================================================================
--- trunk/setup.php	2011-07-18 21:56:08 UTC (rev 1077)
+++ trunk/setup.php	2011-07-18 21:59:55 UTC (rev 1078)
@@ -316,7 +316,7 @@
     $pAdminCreate_admin_username_text = $PALANG['pAdminCreate_admin_username_text'];
     $pAdminCreate_admin_password_text = "";
     $tUsername = '';
-    $tMessage = '';
+    $setupMessage = '';
     $lostpw_error = 0;
 
     $setuppw = "";
@@ -325,11 +325,11 @@
     if (safepost("form") == "setuppw") {
         # "setup password" form submitted
         if (safepost('setup_password') != safepost('setup_password2')) {
-            $tMessage = "The two passwords differ!";
+            $setupMessage = "The two passwords differ!";
             $lostpw_error = 1;
         } else {
             list ($lostpw_error, $lostpw_result) = check_setup_password(safepost('setup_password'), 1);
-            $tMessage = $lostpw_result;
+            $setupMessage = $lostpw_result;
             $setuppw = "changed";
         }
     } elseif (safepost("form") == "createadmin") {
@@ -337,7 +337,7 @@
         list ($pw_check_error, $pw_check_result) = check_setup_password(safepost('setup_password'));
         if ($pw_check_result != 'pass_OK') {
             $error += 1;
-            $tMessage = $pw_check_result;
+            $setupMessage = $pw_check_result;
         }
 
         if($error == 0 && $pw_check_result == 'pass_OK') {
@@ -352,7 +352,7 @@
                 db_insert('domain', array('domain' => 'ALL')); // all other fields should default through the schema.
             }
 
-            list ($error, $tMessage, $pAdminCreate_admin_username_text, $pAdminCreate_admin_password_text) = create_admin($fUsername, $fPassword, $fPassword2, array('ALL'), TRUE);
+            list ($error, $setupMessage, $pAdminCreate_admin_username_text, $pAdminCreate_admin_password_text) = create_admin($fUsername, $fPassword, $fPassword2, array('ALL'), TRUE);
             if ($error != 0) {
                 if (isset ($_POST['fUsername'])) $tUsername = escape_string ($_POST['fUsername']);
             }
@@ -363,7 +363,7 @@
 # show "create setup password" form
     ?>
 
-<div class="standout"><?php print $tMessage; ?></div>
+<div class="standout"><?php print $setupMessage; ?></div>
 <div id="edit_form">
 <form name="setuppw" method="post" action="setup.php">
 <input type="hidden" name="form" value="setuppw" />
@@ -392,7 +392,7 @@
     } elseif ($_SERVER['REQUEST_METHOD'] == "GET" || $error != 0 || $lostpw_error == 0) {
         ?>
 
-<div class="standout"><?php print $tMessage; ?></div>
+<div class="standout"><?php print $setupMessage; ?></div>
 <div id="edit_form">
 <form name="create_admin" method="post">
 <input type="hidden" name="form" value="createadmin" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.