X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-login.php;h=49228e9cf397cb6e8a404bc2f423a6744a2b42eb;hb=49a9663311b732d12ba0c53af2f9eb39a7850fbc;hp=dca4bbdcd4b190298345365a2d5715aa100cbf34;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index dca4bbdcd4..49228e9cf3 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 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	die();
+	exit();
 } // END - if
 
 // Add description as navigation point
@@ -60,7 +60,7 @@ $add = '';
 if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 	// Maybe, then continue with it
 	$userid = getMemberId();
-} elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent())) {
+} elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent('login'))) {
 	// Set userid and crypt password when login data was submitted
 	if (isNicknameUsed(postRequestElement('id'))) {
 		// Nickname entered
@@ -94,13 +94,22 @@ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 if (isMember()) {
 	// Login immidiately...
 	$url = 'modules.php?module=login';
-} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestElement('id') . '')) {
+} elseif ((isFormSent('login')) && ('' . $userid . '' != '' . postRequestElement('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))) {
+} elseif (isFormSent('login')) {
+	// Are both 'id' and 'password' set?
+	if ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password'))) {
+		// Try the login (see inc/libs/user_functions.php)
+		$url = doUserLogin(postRequestElement('id'), postRequestElement('password'));
+	} elseif (!isPostRequestElementSet('id')) {
+		// Empty 'id'
+		$errorCode = getCode('LOGIN_EMPTY_ID');
+	} else {
+		// Empty 'password'
+		$errorCode = getCode('LOGIN_EMPTY_PASSWORD');
+	}
+} elseif ((isPostRequestElementSet('new_pass')) && (!empty($userid))) {
 	// Try the userid/email lookup (see inc/libs/user_functions.php)
 	$errorCode = doNewUserPassword(postRequestElement('email'), $userid);
 }
@@ -117,17 +126,13 @@ $content['message'] = '';
 // Login problems?
 if (!empty($errorCode)) {
 	// Do we have a userid set?
-	if (isSessionVariableSet('current_userid')) {
+	if (isSessionVariableSet('userid')) {
 		// Then prefetch data for this account
-		fetchUserData(getSession('current_userid'));
+		fetchUserData(getSession('userid'));
 	} // END - if
 
 	// @TODO Move this HTML code into a template
-	$content['message'] = '<tr>
-  <td colspan="4" align="center">
-    <span class="notice">' . getMessageFromErrorCode($errorCode) . '</span>
-  </td>
-</tr>';
+	$content['message'] = loadTemplate('guest_login_error_message', true, $errorCode);
 } // END - if
 
 // Display login form with resend-password form