Complete rewrite of and , wrapper functions added, see bug #101

[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 c1054846cbb493b4d4bdd2b3e0db36e3b8b0fbcf..4f7f51e59fcb844ca26fd013c36f77e59b96e640 100644 (file)
--- a/inc/modules/admin/what-admins_add.php
+++ b/inc/modules/admin/what-admins_add.php
@@ -43,9 +43,9 @@ ADD_DESCR("admin", __FILE__);
 // Display form is default
 $FORM = true;
 
-if ((isset($_POST['add'])) && (!empty($_POST['login'])) && (!empty($_POST['email'])) && (!empty($_POST['pass1'])) && (!empty($_POST['pass2'])) && ($_POST['pass1'] == $_POST['pass2'])) {
+if ((REQUEST_ISSET_POST(('add'))) && (REQUEST_ISSET_POST(('login'))) && (REQUEST_ISSET_POST(('email'))) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2'))) && (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
        // Add admin when not added already
-       if (REGISTER_ADMIN($_POST['login'], generateHash($_POST['pass1']), $_POST['email']) == "done") {
+       if (REGISTER_ADMIN(REQUEST_POST('login'), generateHash(REQUEST_POST('pass1')), REQUEST_POST('email')) == "done") {
                // Do not ouput any form!
                $FORM = false;
 
@@ -53,16 +53,16 @@ if ((isset($_POST['add'])) && (!empty($_POST['login'])) && (!empty($_POST['email
                LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_ADD_DONE'));
 
                // Run filter chain
-               RUN_FILTER('post_admin_added', $_POST);
+               RUN_FILTER('post_admin_added', REQUEST_POST_ARRAY());
        } // END - if
 } // END - if
 
 // Shall we display the form?
 if ($FORM === true) {
        // Set missing elements
-       // @TODO Do we need this ugly code here?
-       if (!isset($_POST['login'])) $_POST['login'] = "";
-       if (!isset($_POST['email'])) $_POST['email'] = "";
+       // @TODO Do we still need this ugly code here?
+       if (!REQUEST_ISSET_POST(('login'))) REQUEST_SET_POST('login', "");
+       if (!REQUEST_ISSET_POST(('email'))) REQUEST_SET_POST('email', "");
 
        // Load form from template
        LOAD_TEMPLATE("admin_admins_add");