HTML->XHTML converted

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 719533118c282da673b8d8cd738f95bbb0ad7623..0635460a527b70722322ff871033e0d6fa1fdafd 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -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, "<div class=\"admin\">".ADMIN_REGISTER_DONE."</div>");
        } // END - if
 
        // Check if the admin has submitted data or not
@@ -235,7 +235,7 @@ if (!isBooleanConstantAndTrue('admin_registered')) {
 
                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?
@@ -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