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

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

diff --git a/inc/modules/admin/what-admins_mails.php b/inc/modules/admin/what-admins_mails.php
index 04124c3ca15e91cb07283a1e227414df6875d416..fddbc9a0aed0cf7487f8ba6c1ae59a971cc709c9 100644 (file)
--- a/inc/modules/admin/what-admins_mails.php
+++ b/inc/modules/admin/what-admins_mails.php
@@ -40,16 +40,16 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['edit']))
+if (REQUEST_ISSET_POST(('edit')))
 {
        // Check if entires are checked
-       $SEL = SELECTION_COUNT($_POST['sel']);
+       $SEL = SELECTION_COUNT(REQUEST_POST('sel'));
        if ($SEL > 0)
        {
                // Add option for events
                $GLOBALS['cache_array']['admins'] = ADD_OPTION_LINES("admins", "id", "login", "", "email");
                $SW = 2; $rowNameS = "";
-               foreach ($_POST['sel'] as $template => $sel) {
+               foreach (REQUEST_POST('sel') as $template => $sel) {
                        // First of all load data from DB
                        $result = SQL_QUERY_ESC("SELECT admin_id, id FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY `id`",
                         array($template), __FILE__, __LINE__);
@@ -117,11 +117,10 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)
        {
                // Shall I change entries?
-               if (isset($_POST['change']))
+               if (REQUEST_ISSET_POST(('change')))
                {
                        // Ok, update database
-                       foreach ($_POST['admin_id'] as $id => $aid)
-                       {
+                       foreach (REQUEST_POST('admin_id') as $id => $aid) {
                                // Secure IDs
                                $id  = bigintval($id);
                                $aid = bigintval($aid);
@@ -130,17 +129,17 @@ ORDER BY m.admin_id, m.mail_template", __FILE__, __LINE__);
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins_mails` SET admin_id=%s WHERE id=%s ORDER BY `id` LIMIT 1",
                                        array($aid, $id), __FILE__, __LINE__);
 
-                               if (($aid < 1) && (!empty($_POST['template'][$id])))
+                               if (($aid < 1) && (REQUEST_ISSET_POST(('template', $id))))
                                {
                                        // Remove any other admin entries
                                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' AND id != '%s'",
-                                               array($_POST['template'][$id], $id), __FILE__, __LINE__);
+                                               array(REQUEST_POST('template', $id), $id), __FILE__, __LINE__);
                                }
-                               if ($_POST['admin_new'][$_POST['template'][$id]] > 0)
+                               if (REQUEST_POST('admin_new', REQUEST_POST('template', $id)) > 0)
                                {
                                        // Add new admin
                                        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES ('%s','%s')",
-                                               array($aid, $_POST['template'][$id]), __FILE__, __LINE__);
+                                               array($aid, REQUEST_POST('template', $id)), __FILE__, __LINE__);
                                }
                        }