More constant rewrites

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

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index a96bc1d65161a3d31f33dbbb85eb73bf3bbd7dd4..1790aeb1f174a65a864f3a3e900318121dd13543 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -37,21 +37,20 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
-// @TODO Replace with own template!
-OPEN_TABLE("500", "guest_login_header dashed", "center");
-OUTPUT_HTML("<br /><strong>".VALIDATING_LOGIN."</strong><br />");
+// Initial message part
+$MSG = "<strong>{--VALIDATING_LOGIN--}</strong>";
 
-if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash')) && (isSessionVariableSet('lifetime'))) {
-       // Login failtures are supported since 0.4.7
+if (!empty($GLOBALS['userid']) && (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") {
+       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",
+       $result = SQL_QUERY_ESC("SELECT curr_theme".$ADD." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Load data
@@ -61,59 +60,59 @@ if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash')) && (isSession
        SQL_FREERESULT($result);
 
        // Change to new theme
-       set_session("mxchange_theme", $data['curr_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__);
 
                // 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") && ($_CONFIG['bonus_login_yn'] == "N") && ($_CONFIG['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
-               $result = 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'],
-                               $_CONFIG['login_timeout']
+                               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
-               OUTPUT_HTML("<font class=\"tiny\">
-  ".BONUS_LOGIN_BONUS_ADDED_1."
-  <strong>".TRANSLATE_COMMA($_CONFIG['login_bonus'])." ".POINTS."</strong>
-  ".BONUS_LOGIN_BONUS_ADDED_2."
-</font>");
+               $MSG .= "<div class=\"tiny\">
+  {--BONUS_LOGIN_BONUS_ADDED_1--}
+  <strong>".TRANSLATE_COMMA(getConfig('login_bonus'))." {!POINTS!}</strong>
+  {--BONUS_LOGIN_BONUS_ADDED_2--}
+</div>";
        } elseif (EXT_IS_ACTIVE("bonus")) {
                // No login bonus added!
-               OUTPUT_HTML("<font class=\"member_failed\">".BONUS_LOGIN_BONUS_NOT_ADDED."</font>");
+               $MSG .= "<div class=\"member_failed\">{--BONUS_LOGIN_BONUS_NOT_ADDED--}</div>";
        }
 
        // Redirect to member area
-       LOAD_TEMPLATE("member_login_js");
+       $MSG .= LOAD_TEMPLATE("member_login_js", true);
 } else {
        // Login failed!
-       LOAD_TEMPLATE("login_failed_js");
+       $MSG .= LOAD_TEMPLATE("login_failed_js", true);
 }
 
-// Close table
-CLOSE_TABLE();
+// Output final message
+LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
 
 //
 ?>