X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-login.php;h=2ca840a43caf23491a927d3a90594885abd1d46a;hp=708239941d06f04deed6cd2a484f4d378b6f4c9c;hb=cd7d344ea7007cfa20413acd3e03e50f0ab86d86;hpb=8fad776382e63b3f73f8dbe289f229d79cfc2c22

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 708239941d..2ca840a43c 100644
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -17,7 +17,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -49,9 +49,9 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
 	return;
 } // END - if
 
-// Initialize variables
+// Initialize variables as not logged in
 $errorCode = '0';
-$userid = false;
+$userid = NULL;
 $hash = '';
 $url = '';
 $add = '';
@@ -85,10 +85,6 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 			$userid  = bigintval(postRequestElement('id'));
 		}
 	} // END - if
-} else {
-	// Not logged in
-	$userid = NULL;
-	$hash = '';
 }
 
 if (isMember()) {
@@ -131,15 +127,15 @@ if (!empty($errorCode)) {
 		fetchUserData(getSession('userid'));
 	} // END - if
 
-	// @TODO Move this HTML code into a template
-	$content['message'] = loadTemplate('guest_login_error_message', true, $errorCode);
+	// Add message code
+	$content['message'] = loadTemplate('guest_login_error_message', TRUE, $errorCode);
 } // END - if
 
 // Display login form with resend-password form
 if (isExtensionActive('nickname')) {
-	loadTemplate('guest_nickname_login', false, $content);
+	loadTemplate('guest_nickname_login', FALSE, $content);
 } else {
-	loadTemplate('guest_login', false, $content);
+	loadTemplate('guest_login', FALSE, $content);
 }
 
 // Was an URL constructed?