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

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 4a2f2a233e..6c10396024 100644
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -11,7 +11,12 @@
  * Kurzbeschreibung  : Loginbereich (leitet an das richtige Lgin-Modul  *
  *                     weiter)                                          *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -34,33 +39,32 @@
 
 // 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(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "user");
+} elseif ((!EXT_IS_ACTIVE('user')) && (!IS_ADMIN())) {
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('user'));
 	return;
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", __FILE__);
+ADD_DESCR('guest', __FILE__);
 
-global $DATA, $ERROR;
+global $DATA;
 
 // Initialize variables
-$ERROR = 0;
-$probe_nickname = false;
+$errorCode = 0;
 $uid = false;
-$hash = "";
-$URL = "";
-$ADD = "";
+$hash = '';
+$URL = '';
+$add = '';
 
 // Already logged in?
-if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash'))) {
+if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
 	// Maybe, then continue with it
-	$uid = $GLOBALS['userid'];
-} elseif ((REQUEST_ISSET_POST(('id'))) && (REQUEST_ISSET_POST(('password'))) && (IS_FORM_SENT())) {
+	$uid = getUserId();
+} 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 {
@@ -70,93 +74,93 @@ if ((!empty($GLOBALS['userid'])) && (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 = "";
+	$uid = 0; $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_POST(('new_pass'))) REQUEST_SET_POST('new_pass', '');
+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)
-	$ERROR = constant('CODE_EXTENSION_PROBLEM');
-} elseif (IS_FORM_SENT()) {
+	$errorCode = getCode('EXTENSION_PROBLEM');
+} 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))) {
 	// Try the userid/email lookup (see inc/libs/user_functions.php)
-	$ERROR = USER_DO_NEW_PASSWORD(REQUEST_POST('email'), $uid);
+	$errorCode = USER_DO_NEW_PASSWORD(REQUEST_POST('email'), $uid);
 }
 
 // Login problems?
-if (REQUEST_ISSET_GET(('login'))) {
+if (REQUEST_ISSET_GET('login')) {
 	// Use code from URL
-	$ERROR = SQL_ESCAPE(REQUEST_GET('login'));
+	$errorCode = REQUEST_GET('login');
 } // END  - if
 
 // Login problems?
-if (!empty($ERROR)) {
+if (!empty($errorCode)) {
 	// Ok, which one now?
-	$MSG = "<tr>
+	$message = "<tr>
   <td width=\"10\" class=\"seperator\">&nbsp;</td>
   <td colspan=\"7\" align=\"center\">
     <span class=\"guest_failed\">";
 
-	switch ($ERROR) {
-		case constant('CODE_WRONG_PASS'):
-			$MSG .= getMessage('LOGIN_WRONG_PASS');
+	switch ($errorCode) {
+		case getCode('WRONG_PASS'):
+			$message .= getMessage('LOGIN_WRONG_PASS');
 			break;
 
-		case constant('CODE_WRONG_ID'):
-			$MSG .= getMessage('LOGIN_WRONG_ID');
+		case getCode('WRONG_ID'):
+			$message .= getMessage('LOGIN_WRONG_ID');
 			break;
 
-		case constant('CODE_ID_LOCKED'):
-			$MSG .= getMessage('LOGIN_ID_LOCKED');
+		case getCode('ID_LOCKED'):
+			$message .= getMessage('LOGIN_ID_LOCKED');
 			break;
 
-		case constant('CODE_ID_UNCONFIRMED'):
-			$MSG .= getMessage('LOGIN_ID_UNCONFIRMED');
+		case getCode('ID_UNCONFIRMED'):
+			$message .= getMessage('LOGIN_ID_UNCONFIRMED');
 			break;
 
-		case constant('CODE_NO_COOKIES'):
-			$MSG .= getMessage('LOGIN_NO_COOKIES');
+		case getCode('NO_COOKIES'):
+			$message .= getMessage('LOGIN_NO_COOKIES');
 			break;
 
-		case constant('CODE_EXTENSION_PROBLEM'):
+		case getCode('EXTENSION_PROBLEM'):
 			if (IS_ADMIN()) {
-				$MSG .= sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "nickname");
+				$message .= sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'nickname');
 			} else {
-				$MSG .= getMessage('LOGIN_WRONG_ID');
+				$message .= getMessage('LOGIN_WRONG_ID');
 			}
 			break;
 
 		default:
-			DEBUG_LOG(__FILE__, __LINE__, sprintf("Unhandled error code %s detected.", $ERROR));
-			$MSG .= getMessage('LOGIN_WRONG_ID');
+			DEBUG_LOG(__FILE__, __LINE__, sprintf("Unhandled error code %s detected.", $errorCode));
+			$message .= getMessage('LOGIN_WRONG_ID');
 			break;
-		}
-		$MSG .= "</span>
+	}
+	$message .= "</span>
   </td>
   <td width=\"10\" class=\"seperator\">&nbsp;</td>
 </tr>\n";
-		define('LOGIN_FAILURE_MSG', $MSG);
+	define('LOGIN_FAILURE_MSG', $message);
 } else {
 	// No problems, no output
-	define('LOGIN_FAILURE_MSG', "");
+	define('LOGIN_FAILURE_MSG', '');
 }
 
 // Display login form with resend-password form
-if (EXT_IS_ACTIVE("nickname")) {
-	LOAD_TEMPLATE("guest_nickname_login");
+if (EXT_IS_ACTIVE('nickname')) {
+	LOAD_TEMPLATE('guest_nickname_login');
 } else {
-	LOAD_TEMPLATE("guest_login");
+	LOAD_TEMPLATE('guest_login');
 }
 
 // Was an URL constructed?
@@ -164,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