From: Roland Häder <roland@mxchange.org>
Date: Mon, 22 Dec 2008 14:44:26 +0000 (+0000)
Subject: Fixed unset variable , added some debug loggings. Resolved #18
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cd980a5c37a3f4eb1ec643b88f141f12027df2ab;p=mailer.git

Fixed unset variable , added some debug loggings. Resolved #18
---

diff --git a/inc/databases.php b/inc/databases.php
index 1bcdcbd39e..f2be6b0f0a 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -115,7 +115,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "697");
+define('CURR_SVN_REVISION', "698");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 1c58a7b53e..cbf18f8b2d 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -49,6 +49,10 @@ require_once(PATH."inc/modules/admin/admin-inc.php");
 // Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
 FIX_DELETED_COOKIES(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'));
 
+// Init return value
+$ret = "init";
+
+// Is no admin registered?
 if (!isBooleanConstantAndTrue('admin_registered')) {
 	// Admin is not registered so we have to inform the user
 	if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
@@ -83,7 +87,9 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 				// Admin does already exists!
 				$ret = ADMIN_LOGIN_ALREADY_REG;
 			} else {
-				// Any other kind
+				// Any other kind will be logged and interpreted as 'done'
+				DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
+				// @TODO Why is this set to 'done'?
 				$ret = "done";
 			}
 
@@ -195,7 +201,6 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 	} // END - if
 
 	// Check if the admin has submitted data or not
-	$ret = "";
 	if ((isset($_POST['ok'])) && ((empty($_POST['login'])) || (empty($_POST['pass'])) || (strlen($_POST['pass']) < 4))) $_POST['ok'] = "***";
 	if ((isset($_POST['ok'])) && ($_POST['ok'] != "***")) {
 		// All required data was entered so we check his account
@@ -233,6 +238,10 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 			$ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
 			DESTROY_ADMIN_SESSION();
 			break;
+
+		default: // Others will be logged
+			DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_LOGIN()", $ret));
+			break;
 		} // END - switch
 	} // END - if
 
@@ -376,6 +385,10 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 		DESTROY_ADMIN_SESSION();
 		ADD_FATAL(WRONG_PASS);
 		break;
+
+	default: // Others will be logged
+		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown return code %s from CHECK_ADMIN_COOKIES()", $ret));
+		break;
 	}
 }