Some internal TODOs fixed, rewrites to script inclusion

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

diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php
index bcdddce43cd21005d4500044e69e580c09ad79d0..635deeee7626959b924f66b89c13e91babc8babd 100644 (file)
--- a/inc/modules/chk_login.php
+++ b/inc/modules/chk_login.php
@@ -37,9 +37,8 @@ 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'))) {
        // Login failtures are supported since 0.4.7
@@ -95,25 +94,25 @@ LIMIT 1",
 
        if (($bonus) && ($_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(getConfig('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);
 
 //
 ?>