X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fchk_login.php;h=a2bce2d724edc4e37c399e4b03db5566581d036a;hb=d70996f3e1e42dc259a9bdaf736592720fd0c7ce;hp=2146f9838594bae271688fe877712e7f88f825f5;hpb=747c49b9f46a3d7d1d881c9e1c273ecf107f8d8b;p=mailer.git

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 2146f98385..a2bce2d724 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:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * 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                  *
@@ -38,9 +43,9 @@ if (!defined('__SECURITY')) {
 }
 
 // Initial message part
-$MSG = "<strong>{!VALIDATING_LOGIN!}</strong>";
+$MSG = "<strong>{--VALIDATING_LOGIN--}</strong>";
 
-if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
+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 = "";
@@ -50,8 +55,8 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
 	} // 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);
@@ -65,11 +70,11 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
 	// 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`
+		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($GLOBALS['userid']), __FILE__, __LINE__);
+			array(getUserId()), __FILE__, __LINE__);
 
 		// Store it in session
 		set_session('mxchange_member_failures', $data['login_failures']);
@@ -80,28 +85,28 @@ LIMIT 1",
 	$bonus = false;
 	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`
+		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'],
+				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
 		$MSG .= "<div class=\"tiny\">
-  {!BONUS_LOGIN_BONUS_ADDED_1!}
+  {--BONUS_LOGIN_BONUS_ADDED_1--}
   <strong>".TRANSLATE_COMMA(getConfig('login_bonus'))." {!POINTS!}</strong>
-  {!BONUS_LOGIN_BONUS_ADDED_2!}
+  {--BONUS_LOGIN_BONUS_ADDED_2--}
 </div>";
 	} elseif (EXT_IS_ACTIVE("bonus")) {
 		// No login bonus added!
-		$MSG .= "<div class=\"member_failed\">{!BONUS_LOGIN_BONUS_NOT_ADDED!}</div>";
+		$MSG .= "<div class=\"member_failed\">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>";
 	}
 
 	// Redirect to member area