A lot more wrapper functions added, templates renamed

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index eef42adeac517b639406097beb144815af6ce6cd..ad48308d35370e76953e9e2c1d3d2fcb9fce1f46 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -199,7 +199,7 @@ if (!isAdminRegistered()) {
                        );
 
                        // 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--}');
@@ -208,14 +208,14 @@ if (!isAdminRegistered()) {
                // 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--}');
                }
        } 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
@@ -300,19 +300,29 @@ if (!isAdminRegistered()) {
                        $passwdMessage = '';
 
                        // No login entered?
-                       if (!isPostRequestParameterSet('login')) $loginMessage = '{--ADMIN_NO_LOGIN--}';
+                       if (!isPostRequestParameterSet('login')) {
+                               $loginMessage = '{--ADMIN_NO_LOGIN--}';
+                       } // END - if
 
                        // An error comes back from login?
-                       if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
+                       if ((!empty($ret)) && (postRequestParameter('ok') == '404')) {
+                               $loginMessage = $ret;
+                       } // END - if
 
                        // No password entered?
-                       if (!isPostRequestParameterSet('password')) $passwdMessage = '{--ADMIN_NO_PASS--}';
+                       if (!isPostRequestParameterSet('password')) {
+                               $passwdMessage = '{--ADMIN_NO_PASS--}';
+                       } // END - if
 
                        // Or password too short?
-                       if (strlen(postRequestParameter('password')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+                       if (strlen(postRequestParameter('password')) < 4) {
+                               $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+                       } // END - if
 
                        // An error comes back from login?
-                       if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) $passwdMessage = $ret;
+                       if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) {
+                               $passwdMessage = $ret;
+                       } // END - if
 
                        // Load message template
                        $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);