More improved SQL queries

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 719533118c282da673b8d8cd738f95bbb0ad7623..2d11145709e5a936fbfa73896d31cd8e6d51674a 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -44,7 +44,7 @@ if ((empty($GLOBALS['action'])) && ($check == "admin_only")) {
 } // END - if
 
 // Load include file
-require_once(PATH."inc/modules/admin/admin-inc.php");
+LOAD_INC_ONCE("inc/modules/admin/admin-inc.php");
 
 // Fix "deleted" cookies in PHP4 (PHP5 does remove them, PHP4 sets them to deleted!)
 FIX_DELETED_COOKIES(array('admin_login', 'admin_md5', 'admin_last', 'admin_to'));
@@ -170,7 +170,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        LOAD_TEMPLATE("admin_reset_password_form", false, $content);
                } else {
                        // Cannot validate the login data and hash
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
                }
        } elseif ((isset($_POST['reset_pass'])) && (!empty($_POST['hash'])) && (!empty($_POST['login'])) && (!empty($_POST['pass1'])) && ($_POST['pass1'] == $_POST['pass2'])) {
                // Okay, we shall the admin password here. So first revalidate the hash
@@ -182,7 +182,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        LOAD_TEMPLATE("admin_reset_pass_done", false, $OUT);
                } else {
                        // Validation failed
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
                }
        } else {
                // Output reset password form
@@ -197,7 +197,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
        if (!empty($_GET['register'])) {
                // Registration of first admin is done
-               if ($_GET['register'] == "done") OUTPUT_HTML("<STRONG class=\"admin\">".ADMIN_REGISTER_DONE."</STRONG>");
+               if ($_GET['register'] == "done") LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_REGISTER_DONE'));
        } // END - if
 
        // Check if the admin has submitted data or not
@@ -229,13 +229,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
                case "404": // Administrator login not found
                        $_POST['ok'] = $ret;
-                       $ret = ADMIN_NOT_FOUND;
+                       $ret = getMessage('ADMIN_NOT_FOUND');
                        DESTROY_ADMIN_SESSION();
                        break;
 
                case "pass": // Wrong password
                        $_POST['ok'] = $ret;
-                       $ret = WRONG_PASS." [<A href=\"".URL."/modules.php?module=admin&amp;reset_pass=1\">".ADMIN_RESET_PASS."</A>]\n";
+                       $ret = "{!WRONG_PASS!} [<a href=\"{!URL!}/modules.php?module=admin&amp;reset_pass=1\">{!ADMIN_RESET_PASS!}</a>]\n";
                        DESTROY_ADMIN_SESSION();
                        break;
 
@@ -329,10 +329,10 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                }
        } else {
                // Something went wrong here...
-               OUTPUT_HTML("<STRONG class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</STRONG>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_fatal\">".ADMIN_LOGOUT_FAILED."</div>");
 
                // Add fatal message
-               ADD_FATAL(CANNOT_UNREG_SESS);
+               addFatalMessage(CANNOT_UNREG_SESS);
        }
 } else {
        // Maybe an Admin want's to login?
@@ -355,7 +355,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
                        if (!empty($_GET['area'])) $area = SQL_ESCAPE($_GET['area']);
 
                        // Load "logical-area menu-system" file
-                       require_once(PATH."inc/modules/admin/lasys-inc.php");
+                       LOAD_INC_ONCE("inc/modules/admin/lasys-inc.php");
 
                        // Create new-style menu system will "logical areas"
                        ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
@@ -369,13 +369,13 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
        case "404": // Administrator login not found
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();
-               ADD_FATAL(ADMIN_NOT_FOUND);
+               addFatalMessage(ADMIN_NOT_FOUND);
                break;
 
        case "pass": // Wrong password
                $_POST['ok'] = $ret;
                DESTROY_ADMIN_SESSION();
-               ADD_FATAL(WRONG_PASS);
+               addFatalMessage(WRONG_PASS);
                break;
 
        default: // Others will be logged