opendir() should be rewritten to GET_DIR_AS_ARRAY()

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

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index 7004976e00674d551b75c1fd611c4f7beacb60d5..3dc66760420cf8085ae033e5a7c3c0ac4aa192bb 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -43,19 +43,19 @@ if (!defined('__SECURITY')) {
 }
 
 // Initial message part
-$MSG = "<strong>{--VALIDATING_LOGIN--}</strong>";
+$message = "<strong>{--VALIDATING_LOGIN--}</strong>";
 
 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",
+       $result = SQL_QUERY_ESC("SELECT curr_theme".$add." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                array(getUserId()), __FILE__, __LINE__);
 
        // Load data
@@ -99,25 +99,23 @@ LIMIT 1",
 
        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);
 
 //
 ?>