X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fchk_login.php;h=d02817258a48a17521308d0efbab02aa806d2492;hb=6c79a2ab7254e656340ee4504e652662babae7c1;hp=8d46fd5d7d3f50a34748ce48d45e0009cd887dd4;hpb=a090e351c49fe021fb3064325694da03402332e0;p=mailer.git

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 8d46fd5d7d..d02817258a 100644
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -17,7 +17,7 @@
  * 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 *
@@ -38,84 +38,86 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
+	die();
+} // END - if
 
 // Initial message part
 $message = "<strong>{--VALIDATING_LOGIN--}</strong>";
 
-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.6.1') {
-		// Load them here
-		$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(getUserId()), __FILE__, __LINE__);
-
-	// Load data
-	$data = SQL_FETCHARRAY($result);
+// Is the member id and u_hash set?
+if (isMemberIdSet() && (isSessionVariableSet('u_hash'))) {
+	// Is 'theme' installed and activated?
+	if (isExtensionActive('theme')) {
+		// Get theme from profile
+		if (!fetchUserData(getMemberId())) {
+			// Userid is not valid
+			debug_report_bug('User id '.getMemberId() . ' is invalid.');
+		} // END - if
 
-	// Free result
-	SQL_FREERESULT($result);
+		// Load data
+		$data = getUserDataArray();
 
-	// Change to new theme
-	set_session('mxchange_theme', $data['curr_theme']);
+		// Change to new theme
+		setTheme($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
+		// 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__);
+				array(getMemberId()), __FILE__, __LINE__);
 
-		// Store it in session
-		set_session('mxchange_member_failures', $data['login_failures']);
-		set_session('mxchange_member_last_fail', $data['last_failure']);
+			// 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') && (getConfig('bonus_login_yn') == 'Y')) {
+	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)
+		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(),
+				getMemberId(),
 				getConfig('login_timeout')
 			), __FILE__, __LINE__
 		);
 		if (SQL_AFFECTEDROWS() == 1) $bonus = true;
 	} // END - if
 
-	if (($bonus) && (REQUEST_GET('mode') == 'bonus') && (EXT_IS_ACTIVE('bonus'))) {
+	if (($bonus === true) && (getRequestElement('mode') == 'bonus') && (isExtensionActive('bonus'))) {
 		// Output message with added points
 		$message .= "<div class=\"tiny\">
-  ".sprintf(getMessage('BONUS_LOGIN_BONUS_ADDED'), TRANSLATE_COMMA(getConfig('login_bonus')))."
+  ".sprintf(getMessage('BONUS_LOGIN_BONUS_ADDED'), translateComma(getConfig('login_bonus')))."
 </div>";
-	} elseif (EXT_IS_ACTIVE('bonus')) {
+	} elseif (isExtensionActive('bonus')) {
 		// No login bonus added!
 		$message .= "<div class=\"member_failed\">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>";
 	}
 
 	// Redirect to member area
-	$message .= LOAD_TEMPLATE("member_login_js", true);
+	$message .= loadTemplate('member_login_js', true);
 } else {
 	// Login failed!
-	$message .= LOAD_TEMPLATE("login_failed_js", true);
+	$message .= loadTemplate('login_failed_js', true);
 }
 
 // Output final message
-LOAD_TEMPLATE('admin_settings_saved', false, $message);
+loadTemplate('admin_settings_saved', false, $message);
 
-//
+// [EOF]
 ?>