X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fguest%2Fwhat-login.php;h=caa950e645b78557451d185eaf89168301672848;hb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69;hp=b8bc4b148bec3b39d90ddf3945674250ef30ff7a;hpb=086762b9606889fbda59d946b7b557d764ec2c0e;p=mailer.git

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index b8bc4b148b..caa950e645 100644
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/14/2003 *
- * ===============                              Last change: 04/28/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/14/2003 *
+ * ===================                          Last change: 04/28/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-login.php                                   *
@@ -19,6 +19,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -51,52 +52,52 @@ if ((!isExtensionActive('user')) && (!isAdmin())) {
 } // END - if
 
 // Initialize variables
-$errorCode = 0;
+$errorCode = '0';
 $userid = false;
 $hash = '';
 $URL = '';
 $add = '';
 
 // Already logged in?
-if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
+if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 	// Maybe, then continue with it
-	$userid = getUserId();
-} elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent())) {
+	$userid = getMemberId();
+} elseif ((isPostRequestParameterSet('id')) && (isPostRequestParameterSet('password')) && (isFormSent())) {
 	// Set userid and crypt password when login data was submitted
-	if ((isExtensionActive('nickname')) && (isNicknameOrUserid(postRequestElement('id')))) {
+	if ((isExtensionActive('nickname')) && (isNicknameUsed(postRequestParameter('id')))) {
 		// Nickname entered
-		$userid = SQL_ESCAPE(postRequestElement('id'));
+		$userid = SQL_ESCAPE(postRequestParameter('id'));
 	} else {
 		// Direct userid entered
-		$userid  = bigintval(postRequestElement('id'));
+		$userid  = bigintval(postRequestParameter('id'));
 	}
-} elseif (isPostRequestElementSet('new_pass')) {
+} elseif (isPostRequestParameterSet('new_pass')) {
 	// New password requested
-	$userid = 0;
-	if (isPostRequestElementSet('id')) $userid = bigintval(postRequestElement('id'));
+	$userid = '0';
+	if ((isPostRequestParameterSet('id')) && (postRequestParameter('id') > 0)) $userid = bigintval(postRequestParameter('id'));
 } else {
 	// Not logged in
-	$userid = 0; $hash = '';
+	$userid = '0'; $hash = '';
 }
 
 if (isMember()) {
 	// Login immidiately...
 	$URL = 'modules.php?module=login';
-} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestElement('id') . '')) {
+} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestParameter('id') . '')) {
 	// Invalid input (no nickname extension installed but nickname entered)
 	$errorCode = getCode('EXTENSION_PROBLEM');
 } elseif (isFormSent()) {
 	// Try the login (see inc/libs/user_functions.php)
-	$URL = doUserLogin(postRequestElement('id'), postRequestElement('password'));
-} elseif ((isPostRequestElementSet('new_pass')) && (isset($userid))) {
+	$URL = doUserLogin(postRequestParameter('id'), postRequestParameter('password'));
+} elseif ((isPostRequestParameterSet('new_pass')) && (isset($userid))) {
 	// Try the userid/email lookup (see inc/libs/user_functions.php)
-	$errorCode = doNewUserPassword(postRequestElement('email'), $userid);
+	$errorCode = doNewUserPassword(postRequestParameter('email'), $userid);
 }
 
 // Login problems?
-if (isGetRequestElementSet('login')) {
+if (isGetRequestParameterSet('login')) {
 	// Use code from URL
-	$errorCode = getRequestElement('login');
+	$errorCode = getRequestParameter('login');
 } // END  - if
 
 // No problems, no output by detault
@@ -106,17 +107,21 @@ $content['message'] = '';
 if (!empty($errorCode)) {
 	// @TODO Move this HTML code into a template
 	$message = "<tr>
-  <td width=\"10\" class=\"seperator\">&nbsp;</td>
-  <td colspan=\"7\" align=\"center\">
+  <td colspan=\"4\" align=\"center\">
     <span class=\"guest_failed\">";
 
+	// Do we have a userid set?
+	if (isSessionVariableSet('current_userid')) {
+		// Then prefetch data for this account
+		fetchUserData(getSession('current_userid'));
+	} // END - if
+
 	// Convert the code to message
 	$message .= getMessageFromErrorCode($errorCode);
 
 	// Continue with HTML
 	$message .= "</span>
   </td>
-  <td width=\"10\" class=\"seperator\">&nbsp;</td>
 </tr>\n";
 	$content['message'] = $message;
 } // END - if
@@ -131,7 +136,7 @@ if (isExtensionActive('nickname')) {
 // Was an URL constructed?
 if (!empty($URL)) {
 	// URL was constructed
-	if (getTotalFatalErrors() > 0) {
+	if (ifFatalErrorsDetected()) {
 		// Handle fatal errors
 		runFilterChain('handle_fatal_errors');
 	} else {