Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 7822bf081ffafcc12e37c2c6716ded7d0f16f7e7..05deff7ed5b7ecef3c7aff7161a69803b0db362e 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -160,7 +160,7 @@ if (!isAdminRegistered()) {
                } // END - if
 
                // Output message in seperate template
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOT_REGISTERED'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
 
                // Load register template
                loadTemplate('admin_reg_form', false, $content);
@@ -189,7 +189,7 @@ if (!isAdminRegistered()) {
                        loadTemplate('admin_reset_password_form', false, $content);
                } else {
                        // Cannot validate the login data and hash
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
+                       loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
                }
        } elseif ((isPostRequestParameterSet('reset_pass')) && (isPostRequestParameterSet('hash')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('pass1')) && (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
                // Okay, we shall the admin password here. So first revalidate the hash
@@ -198,7 +198,7 @@ if (!isAdminRegistered()) {
                        loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
                } else {
                        // Validation failed
-                       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2'));
+                       loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
                }
        } else {
                // Output reset password form
@@ -213,7 +213,7 @@ if (!isAdminRegistered()) {
 
        if (isGetRequestParameterSet('register')) {
                // Registration of first admin is done
-               if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
+               if (getRequestParameter('register') == 'done') loadTemplate('admin_settings_saved', false, '{--ADMIN_REGISTER_DONE--}');
        } // END - if
 
        // Check if the admin has submitted data or not
@@ -229,7 +229,7 @@ if (!isAdminRegistered()) {
                switch ($ret) {
                        case 'done': // Admin and password are okay, so we log in now
                                // Construct URL and redirect
-                               $URL = 'modules.php?module=admin&';
+                               $url = 'modules.php?module=admin&';
 
                                // Rewrite overview module
                                if (getWhat() == 'overview') {
@@ -237,17 +237,17 @@ if (!isAdminRegistered()) {
                                } // END - if
 
                                // Add data to URL
-                               if (isWhatSet())        $URL .= 'what='.getWhat();
-                                elseif (isActionSet()) $URL .= 'action='.getAction();
-                                elseif (isGetRequestParameterSet('area'))  $URL .= 'area='.getRequestParameter('area');
+                               if (isWhatSet())        $url .= 'what='.getWhat();
+                                elseif (isActionSet()) $url .= 'action='.getAction();
+                                elseif (isGetRequestParameterSet('area'))  $url .= 'area='.getRequestParameter('area');
 
                         // Load URL
-                        redirectToUrl($URL);
+                        redirectToUrl($url);
                         break;
 
                        case '404': // Administrator login not found
                                setPostRequestParameter('ok', $ret);
-                               $ret = getMaskedMessage('ADMIN_404', postRequestParameter('login'));
+                               $ret = getMaskedMessage('ADMIN_ACCOUNT_404', postRequestParameter('login'));
                                destroyAdminSession();
                                break;
 
@@ -312,7 +312,13 @@ if (!isAdminRegistered()) {
                        }
                } elseif (isGetRequestParameterSet('area')) {
                        // Restore old area value
-                       $content = merge_array($content, array('target' => 'area', 'value' => getRequestParameter('area')));
+                       $content = merge_array(
+                               $content,
+                               array(
+                                       'target' => 'area',
+                                       'value'  => getRequestParameter('area')
+                               )
+                       );
                } else {
                        // Set default values
                        $content = merge_array($content, array('target' => 'action', 'value' => 'login'));
@@ -383,13 +389,13 @@ if (!isAdminRegistered()) {
 
                case '404': // Administrator login not found
                        setPostRequestParameter('ok', $ret);
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_404', getSession('admin_login')));
+                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getSession('admin_login')));
                        destroyAdminSession();
                        break;
 
                case 'pass': // Wrong password
                        setPostRequestParameter('ok', $ret);
-                       loadTemplate('admin_settings_saved', false, getMessage('WRONG_PASS'));
+                       loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');
                        destroyAdminSession();
                        break;