X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fchk_login.php;h=64e2f26ce1dfa1ace676eb59ba84bd33fdcd2fe4;hp=88bc2e0bb69cd0dbd78320e508e7ffcefe1d0aa6;hb=7b0f17cd637e388049d2167811e4332cec1e979b;hpb=41e2891fb998d13b22b8d7984358f258cc85267d

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 88bc2e0bb6..64e2f26ce1 100644
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Pruefen ob die Login-Cookies gesetzt sind        *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                  *
@@ -32,27 +37,26 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
-// @TODO Replace with own template!
-OPEN_TABLE("500", "guest_login_header dashed", "center");
-OUTPUT_HTML("<br /><STRONG>".VALIDATING_LOGIN."</STRONG><br />");
+// Initial message part
+$message = "<strong>{--VALIDATING_LOGIN--}</strong>";
 
-if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash')) && (isSessionVariableSet('lifetime'))) {
-	// Login failtures are supported since 0.4.7
+if (isUserIdSet() && (isSessionVariableSet('u_hash'))) {
+	// Login failures are supported since 0.4.7
 	// Do we have 0.4.7 of sql_patches or later?
-	$ADD = "";
-	if (GET_EXT_VERSION("sql_patches") >= "0.4.7") {
+	$add = '';
+	if (GET_EXT_VERSION('sql_patches') >= '0.6.1') {
 		// Load them here
-		$ADD = ", login_failtures, UNIX_TIMESTAMP(last_failture) AS last_failture";
+		$add = ", login_failures, UNIX_TIMESTAMP(last_failure) AS last_failure";
 	} // END - if
 
 	// Get theme from profile
-	$result = SQL_QUERY_ESC("SELECT curr_theme".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-		array($GLOBALS['userid']), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT curr_theme".$add." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+		array(getUserId()), __FILE__, __LINE__);
 
 	// Load data
 	$data = SQL_FETCHARRAY($result);
@@ -61,53 +65,57 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash')) && (isSession
 	SQL_FREERESULT($result);
 
 	// Change to new theme
-	set_session("mxchange_theme", $data['curr_theme']);
+	setSession('mxchange_theme', $data['curr_theme']);
+
+	// Remmeber login failures if available
+	if (GET_EXT_VERSION('sql_patches') >= '0.6.1') {
+		// Reset login failures
+		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
+SET login_failures=0, last_failure='0000-00-00 00:00:00'
+WHERE userid=%s
+LIMIT 1",
+			array(getUserId()), __FILE__, __LINE__);
 
-	// Remmeber login failtures if available
-	if (GET_EXT_VERSION("sql_patches") >= "0.4.7") {
 		// Store it in session
-		set_session('mxchange_member_failtures', $data['login_failtures']);
-		set_session('mxchange_member_last_fail', $data['last_failture']);
+		setSession('mxchange_member_failures', $data['login_failures']);
+		setSession('mxchange_member_last_fail', $data['last_failure']);
 	} // END - if
 
 	// Bonus is not given by default ;-)
 	$bonus = false;
-	if ((GET_EXT_VERSION("sql_patches") >= "0.2.8") && (GET_EXT_VERSION("bonus") >= "0.2.1") && ($_CONFIG['bonus_login_yn'] == "N") && ($_CONFIG['bonus_login_yn'] == "Y")) {
-
+	if ((GET_EXT_VERSION('sql_patches') >= '0.2.8') && (GET_EXT_VERSION('bonus') >= '0.2.1') && (getConfig('bonus_login_yn') == 'Y')) {
 		// Update last login if far enougth away
-		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
+		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
 SET last_login=UNIX_TIMESTAMP()
 WHERE userid=%s AND last_login < (UNIX_TIMESTAMP() - %s)
 LIMIT 1",
 			array(
-				$GLOBALS['userid'],
-				$_CONFIG['login_timeout']
+				getUserId(),
+				getConfig('login_timeout')
 			), __FILE__, __LINE__
 		);
 		if (SQL_AFFECTEDROWS() == 1) $bonus = true;
 	} // END - if
 
-	if (($bonus) && ($_GET['mode'] == "bonus") && (EXT_IS_ACTIVE("bonus"))) {
+	if (($bonus) && (REQUEST_GET('mode') == 'bonus') && (EXT_IS_ACTIVE('bonus'))) {
 		// Output message with added points
-		OUTPUT_HTML("<FONT class=\"tiny\">
-  ".BONUS_LOGIN_BONUS_ADDED_1."
-  <STRONG>".TRANSLATE_COMMA($_CONFIG['login_bonus'])." ".POINTS."</STRONG>
-  ".BONUS_LOGIN_BONUS_ADDED_2."
-</FONT>");
-	} elseif (EXT_IS_ACTIVE("bonus")) {
+		$message .= "<div class=\"tiny\">
+  ".sprintf(getMessage('BONUS_LOGIN_BONUS_ADDED'), translateComma(getConfig('login_bonus')))."
+</div>";
+	} elseif (EXT_IS_ACTIVE('bonus')) {
 		// No login bonus added!
-		OUTPUT_HTML("<FONT class=\"member_failed\">".BONUS_LOGIN_BONUS_NOT_ADDED."</FONT>");
+		$message .= "<div class=\"member_failed\">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>";
 	}
 
 	// Redirect to member area
-	LOAD_TEMPLATE("member_login_js");
+	$message .= LOAD_TEMPLATE("member_login_js", true);
 } else {
 	// Login failed!
-	LOAD_TEMPLATE("login_failed_js");
+	$message .= LOAD_TEMPLATE("login_failed_js", true);
 }
 
-// Close table
-CLOSE_TABLE();
+// Output final message
+LOAD_TEMPLATE('admin_settings_saved', false, $message);
 
 //
 ?>