X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-login.php;h=da708d588231593c4364baff469fa34c8a7df9e0;hb=e8ce566b7f77e4f96fa8a6d6ced4b8f5053c447a;hp=6b108994f6918487ef27986af1ab8e2de9ecd362;hpb=e71e9e1380d65ccd06beef6fbc594bec10371f5f;p=mailer.git

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 6b108994f6..da708d5882 100644
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -11,9 +11,14 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -34,143 +39,106 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-} elseif ((!EXT_IS_ACTIVE("user")) && (!IS_ADMIN())) {
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "user");
-	return;
+	die();
 }
 
 // Add description as navigation point
-ADD_DESCR("guest", __FILE__);
+addMenuDescription('guest', __FILE__);
 
-global $DATA, $ERROR;
+if ((!isExtensionActive('user')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('user'));
+	return;
+} // END - if
 
 // Initialize variables
-$ERROR = 0;
-$probe_nickname = false;
-$uid = false;
-$hash = "";
-$URL = "";
-$ADD = "";
+$errorCode = '0';
+$userid = false;
+$hash = '';
+$URL = '';
+$add = '';
 
 // Already logged in?
-if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash'))) {
+if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
 	// Maybe, then continue with it
-	$uid = $GLOBALS['userid'];
-} elseif ((!empty($_POST['id'])) && (!empty($_POST['password'])) && (isset($_POST['ok']))) {
+	$userid = getMemberId();
+} elseif ((isPostRequestElementSet('id')) && (isPostRequestElementSet('password')) && (isFormSent())) {
 	// Set userid and crypt password when login data was submitted
-	if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($_POST['id']))) {
+	if (isNicknameUsed(postRequestElement('id'))) {
 		// Nickname entered
-		$uid = SQL_ESCAPE($_POST['id']);
+		$userid = SQL_ESCAPE(postRequestElement('id'));
 	} else {
 		// Direct userid entered
-		$uid  = bigintval($_POST['id']);
+		$userid  = bigintval(postRequestElement('id'));
 	}
-} elseif (!empty($_POST['new_pass'])) {
+} elseif (isPostRequestElementSet('new_pass')) {
 	// New password requested
-	$uid = 0;
-	if (!empty($_POST['id'])) $uid = $_POST['id'];
+	$userid = '0';
+	if (isPostRequestElementSet('id')) $userid = bigintval(postRequestElement('id'));
 } else {
 	// Not logged in
-	$uid = 0; $hash = "";
+	$userid = '0'; $hash = '';
 }
 
-// Set unset variables
-if (empty($_POST['new_pass'])) $_POST['new_pass'] = "";
-if (empty($_GET['login']))     $_GET['login']     = "";
-
-if (IS_MEMBER()) {
+if (isMember()) {
 	// Login immidiately...
-	$URL = "modules.php?module=login";
-} elseif ((isset($_POST['ok'])) && ("".$uid."" != "".$_POST['id']."")) {
+	$URL = 'modules.php?module=login';
+} elseif ((isFormSent()) && ('' . $userid . '' != '' . postRequestElement('id') . '')) {
 	// Invalid input (no nickname extension installed but nickname entered)
-	$ERROR = CODE_EXTENSION_PROBLEM;
-} elseif (isset($_POST['ok'])) {
+	$errorCode = getCode('EXTENSION_PROBLEM');
+} elseif (isFormSent()) {
 	// Try the login (see inc/libs/user_functions.php)
-	$URL = USER_DO_LOGIN($_POST['id'], $_POST['password']);
-} elseif ((!empty($_POST['new_pass'])) && (isset($uid))) {
+	$URL = doUserLogin(postRequestElement('id'), postRequestElement('password'));
+} elseif ((isPostRequestElementSet('new_pass')) && (isset($userid))) {
 	// Try the userid/email lookup (see inc/libs/user_functions.php)
-	$ERROR = USER_DO_NEW_PASSWORD($_POST['email'], $uid);
+	$errorCode = doNewUserPassword(postRequestElement('email'), $userid);
 }
 
 // Login problems?
-if (!empty($_GET['login'])) {
+if (isGetRequestElementSet('login')) {
 	// Use code from URL
-	$ERROR = SQL_ESCAPE($_GET['login']);
+	$errorCode = getRequestElement('login');
 } // END  - if
 
+// No problems, no output by detault
+$content['message'] = '';
+
 // Login problems?
-if (!empty($ERROR)) {
-	// Ok, which one now?
-	$MSG = "<tr>
+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\">
     <span class=\"guest_failed\">";
 
-	switch ($ERROR) {
-		case CODE_WRONG_PASS:
-			$MSG .= LOGIN_WRONG_PASS;
-			break;
-
-		case CODE_WRONG_ID:
-			$MSG .= LOGIN_WRONG_ID;
-			break;
+	// Convert the code to message
+	$message .= getMessageFromErrorCode($errorCode);
 
-		case CODE_ID_LOCKED:
-			$MSG .= LOGIN_ID_LOCKED;
-			break;
-
-		case CODE_ID_UNCONFIRMED:
-			$MSG .= LOGIN_ID_UNCONFIRMED;
-			break;
-
-		case CODE_NO_COOKIES:
-			$MSG .= LOGIN_NO_COOKIES;
-			break;
-
-		case CODE_EXTENSION_PROBLEM:
-			if (IS_ADMIN()) {
-				$MSG .= sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "nickname");
-			} else {
-				$MSG .= LOGIN_WRONG_ID;
-			}
-			break;
-
-		default:
-			DEBUG_LOG(__FILE__, __LINE__, sprintf("Unhandled error code %s detected.", $ERROR));
-			$MSG .= LOGIN_WRONG_ID;
-			break;
-		}
-		$MSG .= "</span>
+	// Continue with HTML
+	$message .= "</span>
   </td>
   <td width=\"10\" class=\"seperator\">&nbsp;</td>
 </tr>\n";
-		define('LOGIN_FAILURE_MSG', $MSG);
-} else {
-	// No problems, no output
-	define('LOGIN_FAILURE_MSG', "");
-}
+	$content['message'] = $message;
+} // END - if
 
 // Display login form with resend-password form
-if (EXT_IS_ACTIVE("nickname")) {
-	LOAD_TEMPLATE("guest_nickname_login");
+if (isExtensionActive('nickname')) {
+	loadTemplate('guest_nickname_login', false, $content);
 } else {
-	LOAD_TEMPLATE("guest_login");
+	loadTemplate('guest_login', false, $content);
 }
 
 // Was an URL constructed?
 if (!empty($URL)) {
 	// URL was constructed
-	global $FATAL;
-	if (!empty($FATAL[0])) {
-		// Fatal errors!
-		require_once(PATH."inc/fatal_errors.php");
+	if (getTotalFatalErrors() > 0) {
+		// Handle fatal errors
+		runFilterChain('handle_fatal_errors');
 	} else {
 		// Load URL
-		LOAD_URL($URL);
+		redirectToUrl($URL);
 	}
 } // END - if
 
-//
+// [EOF]
 ?>