A lot double-quotes rewritten to single-quotes, some redirect URLs fixed

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

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 635deeee7626959b924f66b89c13e91babc8babd..33e652776f3221006443bb84d0a6c8214427bccb 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                  *
@@ -33,25 +38,25 @@
 
 // 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);
 }
 
 // Initial message part
-$MSG = "<strong>{!VALIDATING_LOGIN!}</strong>";
+$message = "<strong>{--VALIDATING_LOGIN--}</strong>";
 
-if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
-       // Login failtures are supported since 0.4.7
+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.4.7") {
+       $add = '';
+       if (GET_EXT_VERSION('sql_patches') >= '0.6.1') {
                // Load them here
-               $ADD = ", login_failtures, UNIX_TIMESTAMP(last_failture) AS last_failture";
+               $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);
@@ -62,57 +67,55 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
        // Change to new theme
        set_session('mxchange_theme', $data['curr_theme']);
 
-       // Remmeber login failtures if available
-       if (GET_EXT_VERSION("sql_patches") >= "0.4.7") {
-               // Reset login failtures
-               SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data
-SET login_failtures=0, last_failture='0000-00-00 00:00:00'
+       // 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($GLOBALS['userid']), __FILE__, __LINE__);
+                       array(getUserId()), __FILE__, __LINE__);
 
                // Store it in session
-               set_session('mxchange_member_failtures', $data['login_failtures']);
-               set_session('mxchange_member_last_fail', $data['last_failture']);
+               set_session('mxchange_member_failures', $data['login_failures']);
+               set_session('mxchange_member_last_fail', $data['last_failure']);
        } // 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
+               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!}
-  <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")) {
+       } 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);
 
 //
 ?>