Naming convention further applied, TODOs.txt updated

[mailer.git] / inc / modules / admin / what-admins_add.php

diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php
index a5f8f6cebde07ce00a1f902da610d2167372aa82..3edfbca24fc7b7ee3ece589e9567dfeca9c9026c 100644 (file)
--- a/inc/modules/admin/what-admins_add.php
+++ b/inc/modules/admin/what-admins_add.php
@@ -48,17 +48,21 @@ addMenuDescription('admin', __FILE__);
 // Display form is default
 $FORM = true;
 
-if ((isPostRequestParameterSet('add')) && (isPostRequestParameterSet('login')) && (isPostRequestParameterSet('email')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')) && (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
-       // Add admin when not added already
-       if (addAdminAccount(postRequestParameter('login'), generateHash(postRequestParameter('pass1')), postRequestParameter('email')) == 'done') {
-               // Do not ouput any form!
-               $FORM = false;
+// Is the form sent?
+if (isFormSent('add')) {
+       // Check all
+       if ((isPostRequestParameterSet('login')) && (isPostRequestParameterSet('email')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')) && (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
+               // Add admin when not added already
+               if (addAdminAccount(postRequestParameter('login'), generateHash(postRequestParameter('pass1')), postRequestParameter('email')) == 'done') {
+                       // Do not ouput any form!
+                       $FORM = false;
 
-               // Admin login saved
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_ADD_DONE'));
+                       // Admin login saved
+                       loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_ADD_DONE--}');
 
-               // Run filter chain
-               runFilterChain('post_admin_added', postRequestArray());
+                       // Run filter chain
+                       runFilterChain('post_admin_added', postRequestArray());
+               } // END - if
        } // END - if
 } // END - if
 
@@ -71,7 +75,7 @@ if ($FORM === true) {
        );
 
        // Load form from template
-       loadTemplate('admin_admins_add', false, $content);
+       loadTemplate('admin_add_admins', false, $content);
 } // END - if
 
 // [EOF]