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

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

diff --git a/inc/modules/admin/what-admins_edit.php b/inc/modules/admin/what-admins_edit.php
index 6706d9a016780bfb9a151f2a794fc12bb2e10cf2..d3a151b79167580dc091b14fc6d30699b6c121a4 100644 (file)
--- a/inc/modules/admin/what-admins_edit.php
+++ b/inc/modules/admin/what-admins_edit.php
@@ -41,29 +41,31 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Set selection data to empty array when it is empty
-if (empty($_POST['sel'])) $_POST['sel'] = array();
+if (!REQUEST_ISSET_POST(('sel'))) REQUEST_SET_POST('sel', array());
 
 // Check if direct admin account was selected
-if (!empty($_GET['admin'])) {
+if (REQUEST_ISSET_GET(('admin'))) {
        // Secure ID number
-       $aid = bigintval($_GET['admin']);
-       $_POST['edit'] = "1";
-       $_POST['sel'][$aid] = "1";
+       $aid = bigintval(REQUEST_GET('admin'));
+
+       // Set required fields
+       REQUEST_SET_POST('edit', "1");
+       REQUEST_SET_POST(array('sel', $aid), "1");
 }
 
-if ((isset($_POST['edit'])) && (SELECTION_COUNT($_POST['sel']) > 0)) {
+if ((REQUEST_ISSET_POST(('edit'))) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
        // Edit account(s)
-       ADMINS_EDIT_ADMIN_ACCOUNTS($_POST);
-} elseif ((isset($_POST['change'])) && (sizeof($_POST['login']) > 0)) {
+       ADMINS_EDIT_ADMIN_ACCOUNTS(REQUEST_POST_ARRAY());
+} elseif ((REQUEST_ISSET_POST(('change'))) && (sizeof(REQUEST_POST('login')) > 0)) {
        // Change admin accounts
-       ADMINS_CHANGE_ADMIN_ACCOUNT($_POST);
-} elseif ((isset($_POST['del'])) && (SELECTION_COUNT($_POST['sel']) > 0)) {
+       ADMINS_CHANGE_ADMIN_ACCOUNT(REQUEST_POST_ARRAY());
+} elseif ((REQUEST_ISSET_POST(('del'))) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
        // Show admin accounts for deletetion
-       ADMINS_DELETE_ADMIN_ACCOUNTS($_POST);
+       ADMINS_DELETE_ADMIN_ACCOUNTS(REQUEST_POST_ARRAY());
 } else {
-       if ((isset($_POST['remove'])) && (SELECTION_COUNT($_POST['sel']) > 0)) {
+       if ((REQUEST_ISSET_POST(('remove'))) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
                // Remove accounts now
-               ADMINS_REMOVE_ADMIN_ACCOUNTS($_POST);
+               ADMINS_REMOVE_ADMIN_ACCOUNTS(REQUEST_POST_ARRAY());
        }
 
        // List all admin accounts