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 2146f9838594bae271688fe877712e7f88f825f5..1790aeb1f174a65a864f3a3e900318121dd13543 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Initial message part
-$MSG = "<strong>{!VALIDATING_LOGIN!}</strong>";
+$MSG = "<strong>{--VALIDATING_LOGIN--}</strong>";
 
 if (!empty($GLOBALS['userid']) && (isSessionVariableSet('u_hash'))) {
        // Login failures are supported since 0.4.7
@@ -50,7 +50,7 @@ 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",
+       $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
@@ -65,7 +65,7 @@ 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",
@@ -80,7 +80,7 @@ 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",
@@ -92,16 +92,16 @@ LIMIT 1",
                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