Even more variables renamed and login procedure prepared for filter

[mailer.git] / inc / modules / chk_login.php

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 25d6a4b8ff04878cec535617c8e5ffea1b0b3dcf..3dc66760420cf8085ae033e5a7c3c0ac4aa192bb 100644 (file)
--- 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                  *
@@ -38,20 +43,20 @@ if (!defined('__SECURITY')) {
 }
 
 // Initial message part
-$MSG = "<strong>{!VALIDATING_LOGIN!}</strong>";
+$message = "<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 = "";
+       $add = "";
        if (GET_EXT_VERSION("sql_patches") >= "0.6.1") {
                // Load them here
-               $ADD = ", login_failures, UNIX_TIMESTAMP(last_failure) AS last_failure";
+               $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);
@@ -69,7 +74,7 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
 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']);
@@ -85,34 +90,32 @@ 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!}
-  <strong>".TRANSLATE_COMMA(getConfig('login_bonus'))." {!POINTS!}</strong>
-  {!BONUS_LOGIN_BONUS_ADDED_2!}
+               $message .= "<div class=\"tiny\">
+  ".sprintf(getMessage('BONUS_LOGIN_BONUS_ADDED'), TRANSLATE_COMMA(getConfig('login_bonus')))."
 </div>";
        } 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);
 
 //
 ?>