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

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

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index b20760df3e0651e96f08d4804e032c6b90b85952..380ef3157ef19a2f76625b2f3228b96cd7052e02 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -42,23 +42,23 @@ ADD_DESCR("admin", __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
 $AND = "(`what` = '' OR `what` IS NULL)"; $SUB = "";
-if (!empty($_GET['sub']))
+if (REQUEST_ISSET_GET(('sub')))
 {
-       $AND = sprintf("action='%s' AND `what` IS NOT NULL", SQL_ESCAPE($_GET['sub']));
-       $SUB = SQL_ESCAPE($_GET['sub']);
+       $AND = sprintf("action='%s' AND `what` IS NOT NULL", SQL_ESCAPE(REQUEST_GET('sub')));
+       $SUB = SQL_ESCAPE(REQUEST_GET('sub'));
 }
 
 // Get count of (maybe) selected menu points
 $chk = 0;
-if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
+if (REQUEST_ISSET_POST(('sel'))) $chk = SELECTION_COUNT(REQUEST_POST('sel'));
 
 // List all menu points and make them editable
-if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
+if ((REQUEST_ISSET_POST(('edit'))) && ($chk > 0) && (!IS_DEMO())) {
        // Edit menu entries
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        $cnt = 0; $SW = 2;
-       foreach ($_POST['sel'] as $sel => $confirm)
+       foreach (REQUEST_POST('sel') as $sel => $confirm)
        {
                if ($confirm == 1)
                {
@@ -101,13 +101,13 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
        // Load template
        LOAD_TEMPLATE("admin_amenu_edit_form");
 }
- elseif ((isset($_POST['del'])) && (!IS_DEMO()))
+ elseif ((REQUEST_ISSET_POST(('del'))) && (!IS_DEMO()))
 {
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        // Del menu entries with or without confirmation
        $SW = 2; $cnt = 0; $OUT = "";
-       foreach ($_POST['sel'] as $sel => $confirm)
+       foreach (REQUEST_POST('sel') as $sel => $confirm)
        {
                if ($confirm == 1)
                {
@@ -146,12 +146,12 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
 
        // Load template
        LOAD_TEMPLATE("admin_amenu_delete");
-} elseif ((isset($_POST['ok'])) && (!IS_DEMO())) {
+} elseif ((IS_FORM_SENT()) && (!IS_DEMO())) {
        // An action is done...
-       switch ($_POST['ok'])
+       switch (REQUEST_POST('ok'))
        {
        case "edit": // Edit menu
-               foreach ($_POST['sel'] as $sel => $menu) {
+               foreach (REQUEST_POST('sel') as $sel => $menu) {
                        // Secure ID
                        $sel = bigintval($sel);
 
@@ -164,22 +164,22 @@ descr='%s'
 WHERE ".$AND." AND id=%s LIMIT 1",
  array(
        $menu,
-       $_POST['sel_action'][$sel],
-       $_POST['sel_what'][$sel],
-       $_POST['sel_desc'][$sel],
+       REQUEST_POST('sel_action', $sel),
+       REQUEST_POST('sel_what', $sel),
+       REQUEST_POST('sel_desc', $sel),
        $sel,
 ), __FILE__, __LINE__);
                }
 
                // Purge admin menu cache
-               CACHE_PURGE_ADMIN_MENU(0, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel]);
+               CACHE_PURGE_ADMIN_MENU(0, REQUEST_POST('sel_action', $sel), REQUEST_POST('sel_what', $sel));
 
                // Load template
                LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
                break;
 
        case "del": // Delete menu
-               foreach ($_POST['sel'] as $sel => $menu) {
+               foreach (REQUEST_POST('sel') as $sel => $menu) {
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
                                array(bigintval($sel)), __FILE__, __LINE__);
                        CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
@@ -190,32 +190,32 @@ WHERE ".$AND." AND id=%s LIMIT 1",
                break;
 
        default: // Unexpected action
-               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", $_POST['ok']));
-               define('__OK_VALUE', $_POST['ok']);
+               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", REQUEST_POST('ok')));
+               define('__OK_VALUE', REQUEST_POST('ok'));
                LOAD_TEMPLATE("admin_menu_unknown_okay");
                break;
        }
 } else {
-       if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid']))) {
+       if ((REQUEST_ISSET_GET(('act'))) && (REQUEST_ISSET_GET(('tid'))) && (REQUEST_ISSET_GET(('fid')))) {
                // Get IDs
-               if (!empty($_GET['w'])) {
+               if (REQUEST_ISSET_GET(('w'))) {
                        // Sub menus selected
                        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-                               array($_GET['act'], bigintval($_GET['tid'])), __FILE__, __LINE__);
+                               array(REQUEST_GET('act'), bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-                               array($_GET['act'], bigintval($_GET['fid'])), __FILE__, __LINE__);
+                               array(REQUEST_GET('act'), bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
                        // Main menu selected
                        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-                               array(bigintval($_GET['tid'])), __FILE__, __LINE__);
+                               array(bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-                               array(bigintval($_GET['fid'])), __FILE__, __LINE__);
+                               array(bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                }
@@ -223,9 +223,9 @@ WHERE ".$AND." AND id=%s LIMIT 1",
                if ((!empty($tid)) && (!empty($fid))) {
                        // Sort menu
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-                               array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);
+                               array(bigintval(REQUEST_GET('tid')), bigintval($fid)), __FILE__, __LINE__);
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-                               array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
+                               array(bigintval(REQUEST_GET('fid')), bigintval($tid)), __FILE__, __LINE__);
                        CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
                }
        }