Way more usage of EL code:

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index eef42adeac517b639406097beb144815af6ce6cd..d2b5e4cf246619045a0ecc7244b04677319f3372 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -52,7 +52,7 @@ $ret = 'init';
 // Is no admin registered?
 if (!isAdminRegistered()) {
        // Admin is not registered so we have to inform the user
-       if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass1')) || (strlen(postRequestParameter('pass1')) < 4) || (!isPostRequestParameterSet('pass2')) || (strlen(postRequestParameter('pass2')) < 4) || (postRequestParameter('pass1') != postRequestParameter('pass2')))) {
+       if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass1')) || (strlen(postRequestParameter('pass1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestParameterSet('pass2')) || (strlen(postRequestParameter('pass2')) < getConfig('minium_admin_pass_length')) || (postRequestParameter('pass1') != postRequestParameter('pass2')))) {
                setPostRequestParameter('ok', '***');
        } // END - if
 
@@ -73,7 +73,7 @@ if (!isAdminRegistered()) {
                switch ($ret) {
                        case 'done':
                                // Change ADMIN_REGISTERED entry
-                               $done = changeDataInInclude(getCachePath() . 'config-local.php', 'ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+                               $done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
 
                                // Was it successfull?
                                if ($done === true) {
@@ -147,14 +147,14 @@ if (!isAdminRegistered()) {
                        // No password 1 entered or to short?
                        if (!isPostRequestParameterSet('pass1')) {
                                $pass1Message = '{--ADMIN_NO_PASS1--}';
-                       } elseif (strlen(postRequestParameter('pass1')) < 4) {
+                       } elseif (strlen(postRequestParameter('pass1')) < getConfig('minium_admin_pass_length')) {
                                $pass1Message = '{--ADMIN_SHORT_PASS1--}';
                        }
 
                        // No password 2 entered or to short?
                        if (!isPostRequestParameterSet('pass2')) {
                                $pass2Message = '{--ADMIN_NO_PASS2--}';
-                       } elseif (strlen(postRequestParameter('pass2')) < 4) {
+                       } elseif (strlen(postRequestParameter('pass2')) < getConfig('minium_admin_pass_length')) {
                                $pass2Message = '{--ADMIN_SHORT_PASS2--}';
                        }
 
@@ -173,7 +173,7 @@ if (!isAdminRegistered()) {
                } // END - if
 
                // Output message in seperate template
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
+               displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
 
                // Load register template
                loadTemplate('admin_reg_form', false, $content);
@@ -182,7 +182,7 @@ if (!isAdminRegistered()) {
        // Is the form submitted?
        if ((isPostRequestParameterSet('send_link')) && (isPostRequestParameterSet('email'))) {
                // Output result
-               loadTemplate('admin_settings_saved', false, sendAdminPasswordResetLink(postRequestParameter('email')));
+               displayMessage(sendAdminPasswordResetLink(postRequestParameter('email')));
        } elseif (isGetRequestParameterSet('hash')) {
                // Output form for hash validation
                loadTemplate('admin_validate_reset_hash_form', false, getRequestParameter('hash'));
@@ -194,28 +194,28 @@ if (!isAdminRegistered()) {
                if ($valid === true) {
                        // Prepare content first
                        $content = array(
-                               'hash'  => secureString(postRequestParameter('hash')),
-                               'login' => secureString(postRequestParameter('login'))
+                               'hash'  => postRequestParameter('hash'),
+                               'login' => postRequestParameter('login')
                        );
 
                        // Validation okay so display form for final password change
-                       loadTemplate('form_reset_password_form', false, $content);
+                       loadTemplate('admin_reset_password_form', false, $content);
                } else {
                        // Cannot validate the login data and hash
-                       loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
+                       displayMessage('{--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
                if (adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('login'))) {
                        // Output result
-                       loadTemplate('form_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
+                       loadTemplate('admin_reset_password_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
                } else {
                        // Validation failed
-                       loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
+                       displayMessage('{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
                }
        } else {
                // Output reset password form
-               loadTemplate('admin_send_reset_link');
+               loadTemplate('admin_reset_password_send_link');
        }
 } elseif ((!isSessionVariableSet('admin_id')) || (!isSessionVariableSet('admin_md5')) || (!isSessionVariableSet('admin_last'))) {
        // At leat one administrator account was created
@@ -228,12 +228,12 @@ if (!isAdminRegistered()) {
                // Registration of first admin is done
                if (getRequestParameter('register') == 'done') {
                        // Regisration done!
-                       loadTemplate('admin_settings_saved', false, '{--ADMIN_REGISTER_DONE--}');
+                       displayMessage('{--ADMIN_REGISTER_DONE--}');
                } // END - if
        } // END - if
 
        // Check if the admin has submitted data or not
-       if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('password')) || (strlen(postRequestParameter('password')) < 4))) {
+       if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('password')) || (strlen(postRequestParameter('password')) < getConfig('minium_admin_pass_length')))) {
                setPostRequestParameter('ok', '***');
        } // END - if
 
@@ -267,7 +267,7 @@ if (!isAdminRegistered()) {
 
                        case '404': // Administrator login not found
                                setPostRequestParameter('ok', $ret);
-                               $ret = getMaskedMessage('ADMIN_ACCOUNT_404', postRequestParameter('login'));
+                               $ret = '{%message,ADMIN_ACCOUNT_404=' . postRequestParameter('login') . '%}';
                                destroyAdminSession();
                                break;
 
@@ -299,24 +299,34 @@ if (!isAdminRegistered()) {
                        $loginMessage = '';
                        $passwdMessage = '';
 
-                       // No login entered?
-                       if (!isPostRequestParameterSet('login')) $loginMessage = '{--ADMIN_NO_LOGIN--}';
-
-                       // An error comes back from login?
-                       if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
-
-                       // No password entered?
-                       if (!isPostRequestParameterSet('password')) $passwdMessage = '{--ADMIN_NO_PASS--}';
-
-                       // Or password too short?
-                       if (strlen(postRequestParameter('password')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+                       // Check for login
+                       if (!isPostRequestParameterSet('login')) {
+                               // No login entered?
+                               $loginMessage = '{--ADMIN_NO_LOGIN--}';
+                       } elseif ((!empty($ret)) && (postRequestParameter('ok') == '404')) {
+                               // An error comes back from login?
+                               $loginMessage = $ret;
+                       }
 
-                       // An error comes back from login?
-                       if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) $passwdMessage = $ret;
+                       // Check for password
+                       if (!isPostRequestParameterSet('password')) {
+                               // No password entered?
+                               $passwdMessage = '{--ADMIN_NO_PASS--}';
+                       } elseif (strlen(postRequestParameter('password')) < getConfig('minium_admin_pass_length')) {
+                               // Or password too short?
+                               $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+                       } elseif ((!empty($ret)) && (postRequestParameter('ok') == 'password')) {
+                               // An error comes back from login?
+                               $passwdMessage = $ret;
+                       }
 
-                       // Load message template
-                       $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
-                       $content['pass_message']  = loadTemplate('admin_login_msg', true, $passwdMessage);
+                       // Load message templates if the messages have been set
+                       if (!empty($loginMessage)) {
+                               $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
+                       } // END - if
+                       if (!empty($passwdMessage)) {
+                               $content['pass_message']  = loadTemplate('admin_login_msg', true, $passwdMessage);
+                       } // END - if
                } // END - if
 
                // Load login form
@@ -407,13 +417,13 @@ if (!isAdminRegistered()) {
 
                case '404': // Administrator login not found
                        setPostRequestParameter('ok', $ret);
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_ACCOUNT_404', getCurrentAdminId()));
+                       displayMessage('{%message,ADMIN_ACCOUNT_404=' . getCurrentAdminId() . '%}');
                        destroyAdminSession();
                        break;
 
                case 'password': // Wrong password
                        setPostRequestParameter('ok', $ret);
-                       loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');
+                       displayMessage('{--WRONG_PASS--}');
                        destroyAdminSession();
                        break;