Renamed function so it might be more understandable

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

diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index dae1e4cdfeb98ed1d4442679f27722d0033db896..261878ad0623b77382ee3a1a45ba6dd704a511d4 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -186,7 +184,7 @@ if (!isAdminRegistered()) {
                        );
 
                        // Validation okay so display form for final password change
-                       loadTemplate('admin_reset_password_form', false, $content);
+                       loadTemplate('form_reset_password_form', false, $content);
                } else {
                        // Cannot validate the login data and hash
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED--}');
@@ -195,7 +193,7 @@ if (!isAdminRegistered()) {
                // Okay, we shall the admin password here. So first revalidate the hash
                if (adminResetValidateHashLogin(postRequestParameter('hash'), postRequestParameter('login'))) {
                        // Output result
-                       loadTemplate('admin_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
+                       loadTemplate('form_reset_pass_done', false, doResetAdminPassword(postRequestParameter('login'), postRequestParameter('pass1')));
                } else {
                        // Validation failed
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');
@@ -217,13 +215,13 @@ if (!isAdminRegistered()) {
        } // END - if
 
        // Check if the admin has submitted data or not
-       if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('pass')) || (strlen(postRequestParameter('pass')) < 4))) {
+       if ((isFormSent()) && ((!isPostRequestParameterSet('login')) || (!isPostRequestParameterSet('password')) || (strlen(postRequestParameter('password')) < 4))) {
                setPostRequestParameter('ok', '***');
        } // END - if
 
        if ((isFormSent()) && (postRequestParameter('ok') != '***')) {
                // All required data was entered so we check his account
-               $ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('pass'));
+               $ret = ifAdminLoginDataIsValid(postRequestParameter('login'), postRequestParameter('password'));
 
                // Which status do we have?
                switch ($ret) {
@@ -251,7 +249,7 @@ if (!isAdminRegistered()) {
                                destroyAdminSession();
                                break;
 
-                       case 'pass': // Wrong password
+                       case 'password': // Wrong password
                                setPostRequestParameter('ok', $ret);
                                $ret = '{--WRONG_PASS--} [<a href="{%url=modules.php?module=admin&amp;reset_pass=1%}">{--ADMIN_RESET_PASS--}</a>]';
                                destroyAdminSession();
@@ -285,13 +283,13 @@ if (!isAdminRegistered()) {
                        if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
 
                        // No password entered?
-                       if (!isPostRequestParameterSet('pass')) $passwdMessage = '{--ADMIN_NO_PASS--}';
+                       if (!isPostRequestParameterSet('password')) $passwdMessage = '{--ADMIN_NO_PASS--}';
 
                        // Or password too short?
-                       if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}';
+                       if (strlen(postRequestParameter('password')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}';
 
                        // An error comes back from login?
-                       if ((!empty($ret)) && (postRequestParameter('ok') == 'pass')) $passwdMessage = $ret;
+                       if ((!empty($ret)) && (postRequestParameter('ok') == 'password')) $passwdMessage = $ret;
 
                        // Load message template
                        $content['login_message'] = loadTemplate('admin_login_msg', true, $loginMessage);
@@ -349,7 +347,7 @@ if (!isAdminRegistered()) {
                }
        } else {
                // Something went wrong here...
-               loadTemplate('admin_settings_saved', false, '<div class="admin_fatal">{--ADMIN_LOGOUT_FAILED--}</div>');
+               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_LOGOUT_FAILED--}');
 
                // Add fatal message
                addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');
@@ -393,7 +391,7 @@ if (!isAdminRegistered()) {
                        destroyAdminSession();
                        break;
 
-               case 'pass': // Wrong password
+               case 'password': // Wrong password
                        setPostRequestParameter('ok', $ret);
                        loadTemplate('admin_settings_saved', false, '{--WRONG_PASS--}');
                        destroyAdminSession();