X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fchk_login.php;h=a2330df0c28f6f89a287bf053520c3303e315d95;hb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;hp=ec132bb18aaf6d21aa77c71dbf62fcab7345df83;hpb=508228c85fba8448d00865b1639cb8cd7a69e457;p=mailer.git

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index ec132bb18a..a2330df0c2 100644
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Pruefen ob die Login-Cookies gesetzt sind        *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -38,86 +38,87 @@
 
 // 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);
-}
+} // END - if
 
 // Initial message part
-$MSG = "<strong>{--VALIDATING_LOGIN--}</strong>";
+$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
+	// Is 'theme' installed and activated?
+	if (EXT_IS_ACTIVE('theme')) {
+		// 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__);
+		// 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);
+		// Load data
+		$data = SQL_FETCHARRAY($result);
 
-	// Free result
-	SQL_FREERESULT($result);
+		// Free result
+		SQL_FREERESULT($result);
 
-	// Change to new theme
-	set_session('mxchange_theme', $data['curr_theme']);
+		// Change to new 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
+		// 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__);
+				array(getUserId()), __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 ((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
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data`
-SET last_login=UNIX_TIMESTAMP()
-WHERE userid=%s AND last_login < (UNIX_TIMESTAMP() - %s)
+SET `last_login`=UNIX_TIMESTAMP()
+WHERE `userid`=%s AND `last_login` < (UNIX_TIMESTAMP() - %s)
 LIMIT 1",
-			array(
-				getUserId(),
-				getConfig('login_timeout')
-			), __FILE__, __LINE__
+		array(
+			getUserId(),
+			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) && (REQUEST_GET('mode') == 'bonus') && (EXT_IS_ACTIVE('bonus'))) {
 		// Output message with added points
-		$MSG .= "<div class=\"tiny\">
-  {--BONUS_LOGIN_BONUS_ADDED_1--}
-  <strong>".TRANSLATE_COMMA(getConfig('login_bonus'))." {!POINTS!}</strong>
-  {--BONUS_LOGIN_BONUS_ADDED_2--}
+		$message .= "<div class=\"tiny\">
+  ".sprintf(getMessage('BONUS_LOGIN_BONUS_ADDED'), translateComma(getConfig('login_bonus')))."
 </div>";
-	} elseif (EXT_IS_ACTIVE("bonus")) {
+	} elseif (EXT_IS_ACTIVE('bonus')) {
 		// No login bonus added!
-		$MSG .= "<div class=\"member_failed\">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>";
+		$message .= "<div class=\"member_failed\">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>";
 	}
 
 	// Redirect to member area
-	$MSG .= LOAD_TEMPLATE("member_login_js", true);
+	$message .= LOAD_TEMPLATE("member_login_js", true);
 } else {
 	// Login failed!
-	$MSG .= LOAD_TEMPLATE("login_failed_js", true);
+	$message .= LOAD_TEMPLATE("login_failed_js", true);
 }
 
 // Output final message
-LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
+LOAD_TEMPLATE('admin_settings_saved', false, $message);
 
 //
 ?>