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 ffb9c69fdd4600155cc6a81133a696839cf54733..261878ad0623b77382ee3a1a45ba6dd704a511d4 100644 (file)
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
  * $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                    *
  * -------------------------------------------------------------------- *
  * 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
                        );
 
                        // 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--}');
                } 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
                // 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--}');
                } else {
                        // Validation failed
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED2--}');


@@ -349,7 +347,7 @@ if (!isAdminRegistered()) {
                }
        } else {
                // Something went wrong here...
                }
        } 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--}');
 
                // Add fatal message
                addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');