Adding of request parameters partialy finished

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 8b22bcb6821f4fa2fbaecdb6df6d617ea2e9674f..fabb66504888bea817e944a75537a72334e8ef3e 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/31/2003 *
- * ===============                              Last change: 07/02/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 08/31/2003 *
+ * ===================                          Last change: 07/02/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : admin.php                                        *
@@ -54,7 +54,7 @@ $ret = 'init';
 if (!isAdminRegistered()) {
        // Admin is not registered so we have to inform the user
        if ((isFormSent()) && ((!isPostRequestElementSet('login')) || (!isPostRequestElementSet('pass1')) || (strlen(postRequestElement('pass1')) < 4) || (!isPostRequestElementSet('pass2')) || (strlen(postRequestElement('pass2')) < 4) || (postRequestElement('pass1') != postRequestElement('pass2')))) {
-               setRequestPostElement('ok', '***');
+               setPostRequestElement('ok', '***');
        } // END - if
 
        if ((isFormSent()) && (postRequestElement('ok') != '***')) {
@@ -200,7 +200,7 @@ if (!isAdminRegistered()) {
 
        // Check if the admin has submitted data or not
        if ((isFormSent()) && ((!isPostRequestElementSet('login')) || (!isPostRequestElementSet('pass')) || (strlen(postRequestElement('pass')) < 4))) {
-               setRequestPostElement('ok', '***');
+               setPostRequestElement('ok', '***');
        } // END - if
 
        if ((isFormSent()) && (postRequestElement('ok') != '***')) {
@@ -228,14 +228,14 @@ if (!isAdminRegistered()) {
                         break;
 
                        case '404': // Administrator login not found
-                               setRequestPostElement('ok', $ret);
-                               $ret = sprintf(getMessage('ADMIN_404'), postRequestElement('login'));
+                               setPostRequestElement('ok', $ret);
+                               $ret = getMaskedMessage('ADMIN_404', postRequestElement('login'));
                                destroyAdminSession();
                                break;
 
                        case 'pass': // Wrong password
-                               setRequestPostElement('ok', $ret);
-                               $ret = '{--WRONG_PASS--} [<a href="{?URL?}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_RESET_PASS--}</a>]';
+                               setPostRequestElement('ok', $ret);
+                               $ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
                                destroyAdminSession();
                                break;
 
@@ -278,10 +278,6 @@ if (!isAdminRegistered()) {
                        // Load message template
                        $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
                        $content['pass_message']  = loadTemplate('admin_login_msg', true, $passwdMessage);
-
-                       // Reset variables
-                       unset($loginMessage);
-                       unset($passwdMessage);
                } // END - if
 
                // Load login form
@@ -368,13 +364,13 @@ if (!isAdminRegistered()) {
                        break;
 
                case '404': // Administrator login not found
-                       setRequestPostElement('ok', $ret);
-                       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_404'), getSession('admin_login')));
+                       setPostRequestElement('ok', $ret);
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_404', getSession('admin_login')));
                        destroyAdminSession();
                        break;
 
                case 'pass': // Wrong password
-                       setRequestPostElement('ok', $ret);
+                       setPostRequestElement('ok', $ret);
                        loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS'));
                        destroyAdminSession();
                        break;