X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-login.php;h=6c103960240194df0970c83f74cbb26f11430cb7;hp=822a6f6f5a92f52d30d5210c49756fe7e4492400;hb=63d14ce28ba29ba7f176f7aefa78c7c2b96ab5f1;hpb=a090e351c49fe021fb3064325694da03402332e0

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 822a6f6f5a..6c10396024 100644
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -39,10 +39,10 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } elseif ((!EXT_IS_ACTIVE('user')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'user');
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('user'));
 	return;
 }
 
@@ -53,7 +53,6 @@ global $DATA;
 
 // Initialize variables
 $errorCode = 0;
-$probe_nickname = false;
 $uid = false;
 $hash = '';
 $URL = '';
@@ -63,9 +62,9 @@ $add = '';
 if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
 	// Maybe, then continue with it
 	$uid = getUserId();
-} elseif ((REQUEST_ISSET_POST(('id'))) && (REQUEST_ISSET_POST(('password'))) && (IS_FORM_SENT())) {
+} elseif ((REQUEST_ISSET_POST('id')) && (REQUEST_ISSET_POST(('password'))) && (isFormSent())) {
 	// Set userid and crypt password when login data was submitted
-	if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID(REQUEST_POST('id')))) {
+	if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE(REQUEST_POST('id')))) {
 		// Nickname entered
 		$uid = SQL_ESCAPE(REQUEST_POST('id'));
 	} else {
@@ -75,7 +74,7 @@ if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
 } elseif (REQUEST_ISSET_POST(('new_pass'))) {
 	// New password requested
 	$uid = 0;
-	if (REQUEST_ISSET_POST(('id'))) $uid = REQUEST_POST('id');
+	if (REQUEST_ISSET_POST('id')) $uid = REQUEST_POST('id');
 } else {
 	// Not logged in
 	$uid = 0; $hash = '';
@@ -83,15 +82,15 @@ if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
 
 // Set unset variables
 if (!REQUEST_ISSET_POST(('new_pass'))) REQUEST_SET_POST('new_pass', '');
-if (!REQUEST_ISSET_GET(('login')))     REQUEST_SET_GET('login'    , '');
+if (!REQUEST_ISSET_GET('login'))     REQUEST_SET_GET('login'    , '');
 
 if (IS_MEMBER()) {
 	// Login immidiately...
-	$URL = "modules.php?module=login";
-} elseif ((IS_FORM_SENT()) && ("".$uid."" != "".REQUEST_POST('id')."")) {
+	$URL = 'modules.php?module=login';
+} elseif ((isFormSent()) && (''.$uid.'' != ''.REQUEST_POST('id') . '')) {
 	// Invalid input (no nickname extension installed but nickname entered)
 	$errorCode = getCode('EXTENSION_PROBLEM');
-} elseif (IS_FORM_SENT()) {
+} elseif (isFormSent()) {
 	// Try the login (see inc/libs/user_functions.php)
 	$URL = USER_DO_LOGIN(REQUEST_POST('id'), REQUEST_POST('password'));
 } elseif ((REQUEST_ISSET_POST(('new_pass'))) && (isset($uid))) {
@@ -100,9 +99,9 @@ if (IS_MEMBER()) {
 }
 
 // Login problems?
-if (REQUEST_ISSET_GET(('login'))) {
+if (REQUEST_ISSET_GET('login')) {
 	// Use code from URL
-	$errorCode = REQUEST_GET(('login'));
+	$errorCode = REQUEST_GET('login');
 } // END  - if
 
 // Login problems?
@@ -146,12 +145,12 @@ if (!empty($errorCode)) {
 			DEBUG_LOG(__FILE__, __LINE__, sprintf("Unhandled error code %s detected.", $errorCode));
 			$message .= getMessage('LOGIN_WRONG_ID');
 			break;
-		}
-		$message .= "</span>
+	}
+	$message .= "</span>
   </td>
   <td width=\"10\" class=\"seperator\">&nbsp;</td>
 </tr>\n";
-		define('LOGIN_FAILURE_MSG', $message);
+	define('LOGIN_FAILURE_MSG', $message);
 } else {
 	// No problems, no output
 	define('LOGIN_FAILURE_MSG', '');
@@ -159,9 +158,9 @@ if (!empty($errorCode)) {
 
 // Display login form with resend-password form
 if (EXT_IS_ACTIVE('nickname')) {
-	LOAD_TEMPLATE("guest_nickname_login");
+	LOAD_TEMPLATE('guest_nickname_login');
 } else {
-	LOAD_TEMPLATE("guest_login");
+	LOAD_TEMPLATE('guest_login');
 }
 
 // Was an URL constructed?
@@ -169,10 +168,10 @@ if (!empty($URL)) {
 	// URL was constructed
 	if (getTotalFatalErrors()) {
 		// Fatal errors!
-		LOAD_INC_ONCE("inc/fatal_errors.php");
+		loadIncludeOnce('inc/fatal_errors.php');
 	} else {
 		// Load URL
-		LOAD_URL($URL);
+		redirectToUrl($URL);
 	}
 } // END - if