X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fchk_login.php;h=3014e87d8d85c3bbf9e6589e4cb5f270e78eabf1;hp=05522c424783e98dc309067a2a6556fc88b6238e;hb=7c15ca79161bf475e958810a5b585bce869a2af9;hpb=8a9324b2d931f54f54f4319fd7234910af77012c

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 05522c4247..3014e87d8d 100644
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * 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                           *
+ * 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 *
@@ -32,63 +37,86 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
+if (!defined('__SECURITY')) {
+	die();
+} // END - if
+
+// Initial message part
+$message = "<strong>{--VALIDATING_LOGIN--}</strong>";
+
+if (isUserIdSet() && (isSessionVariableSet('u_hash'))) {
+	// Is 'theme' installed and activated?
+	if (isExtensionActive('theme')) {
+		// Get theme from profile
+		if (!fetchUserData(getUserId())) {
+			// Userid is not valid
+			debug_report_bug('User id '.getUserId() . ' is invalid.');
+		} // END - if
 
-OPEN_TABLE("500", "guest_login_header dashed", "center");
+		// Load data
+		$data = getUserDataArray();
 
-OUTPUT_HTML("<br /><STRONG>".VALIDATING_LOGIN."</STRONG><br />");
+		// Change to new theme
+		setTheme($data['curr_theme']);
 
-if (!empty($GLOBALS['userid']) && !empty($_COOKIE['u_hash']) && !empty($_COOKIE['lifetime']))
-{
-	// Get theme from profile
-	$result = SQL_QUERY_ESC("SELECT curr_theme FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
-	 array($GLOBALS['userid']), __FILE__, __LINE__);
-	list($NewTheme) = SQL_FETCHROW($result);
-	SQL_FREERESULT($result);
+		// Remmeber login failures if available
+		if (getExtensionVersion('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__);
 
-	// Change to new theme
-	@setcookie("mxchange_theme", $NewTheme, (time() + 60*60*24*365), COOKIE_PATH);
-	$_COOKIE['mxchange_theme'] = $NewTheme;
+			// Store it in session
+			setSession('mxchange_member_failures', $data['login_failures']);
+			setSession('mxchange_member_last_fail', $data['last_failure']);
+		} // END - if
+	} // 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')) {
-		// Update last login
-		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
-SET last_login=UNIX_TIMESTAMP()
-WHERE userid=%d AND last_login < (UNIX_TIMESTAMP() - %d)
-LIMIT 1", array($GLOBALS['userid'], $CONFIG['login_timeout']),
- __FILE__, __LINE__);
-		if (SQL_AFFECTEDROWS($link) == 1) $bonus = true;
-	}
-	if (($bonus) && ($_GET['mode'] == "bonus") && (EXT_IS_ACTIVE("bonus"))) 	{
+	if ((getExtensionVersion('sql_patches') >= '0.2.8') && (getExtensionVersion('bonus') >= '0.2.1') && (getConfig('bonus_login_yn') == 'Y')) {
+		// Update last login if far enougth away
+		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(
+				getUserId(),
+				getConfig('login_timeout')
+			), __FILE__, __LINE__
+		);
+		if (SQL_AFFECTEDROWS() == 1) $bonus = true;
+	} // END - if
+
+	if (($bonus === true) && (getRequestElement('mode') == 'bonus') && (isExtensionActive('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 (isExtensionActive('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");
-}
- else
-{
+	$message .= loadTemplate('member_login_js', true);
+} else {
 	// Login failed!
-	LOAD_TEMPLATE("login_failed_js");
+	$message .= loadTemplate('login_failed_js', true);
 }
 
-// Close table
-CLOSE_TABLE();
+// Output final message
+loadTemplate('admin_settings_saved', false, $message);
 
-//
+// [EOF]
 ?>