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

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

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 5bda6c5df8fd3929021bb2b36ef1c478b30a6d4f..2789835efb00b024e7124982ff5a728209ce9014 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -44,14 +44,14 @@ ADD_DESCR("admin", __FILE__);
 // Init variable to avoid a notice
 $CATS = "";
 
-if (isset($_POST['add'])) {
+if (REQUEST_ISSET_POST(('add'))) {
        // Add a new category
        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_cats` WHERE cat='%s' LIMIT 1",
-               array($_POST['catname']), __FILE__, __LINE__);
+               array(REQUEST_POST('catname')), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Category does not exists, we simply add it...
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_cats` (cat, visible, sort) VALUES ('%s','%s','%s')",
-                       array($_POST['catname'], $_POST['visible'], bigintval($_POST['parent'] + 1)), __FILE__, __LINE__);
+                       array(REQUEST_POST('catname'), REQUEST_POST('visible'), bigintval(REQUEST_POST('parent') + 1)), __FILE__, __LINE__);
                $content = CATEGORY_ADDED;
        } else {
                // Category does already exists
@@ -63,20 +63,25 @@ if (isset($_POST['add'])) {
 
        // Display message
        LOAD_TEMPLATE("admin_settings_saved", false, $content);
-} elseif ((isset($_POST['ok'])) && (isset($_POST['id'])) && (is_array($_POST['id']))) {
+} elseif ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('id'))) && (is_array(REQUEST_POST('id')))) {
        // Change or delete categories...
        $TEXT = "";
-       foreach ($_POST['id'] as $id => $cat) {
+       foreach (REQUEST_POST('id') as $id => $cat) {
                // Secure ID
                $id = bigintval($id);
 
                // Is the entry set?
                if (!empty($cat)) {
-                       switch ($_GET['do'])
+                       switch (REQUEST_GET('do'))
                        {
                        case "edit": // Change categories
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_cats` SET cat='%s', `visible`='%s', sort=%s WHERE id=%s LIMIT 1",
-                                       array($cat, $_POST['vis'][$id], $_POST['sort'][$id], $id), __FILE__, __LINE__);
+                                       array(
+                                               $cat,
+                                               REQUEST_POST('vis', $id),
+                                               REQUEST_POST('sort', $id),
+                                               $id
+                                       ), __FILE__, __LINE__);
                                $TEXT = CATEGORIES_SAVED;
                                break;
 
@@ -98,10 +103,10 @@ if (isset($_POST['add'])) {
                // Display message
                LOAD_TEMPLATE("admin_settings_saved", false, $TEXT);
        }
-} elseif ((isset($_POST['del'])) && ((SELECTION_COUNT($_POST['sel']) > 0) || (isset($_POST['sel'][0])))) {
+} elseif ((REQUEST_ISSET_POST(('del'))) && ((SELECTION_COUNT(REQUEST_POST('sel')) > 0) || (REQUEST_ISSET_POST(('sel', 0))))) {
        // Delete categories
        $SW = 2; $OUT = "";
-       foreach ($_POST['sel'] as $id => $value) {
+       foreach (REQUEST_POST('sel') as $id => $value) {
                // Load data of category
                $result = SQL_QUERY_ESC("SELECT cat FROM `{!_MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",
                        array(bigintval($id)), __FILE__, __LINE__);
@@ -123,10 +128,10 @@ if (isset($_POST['add'])) {
 
        // Load main template
        LOAD_TEMPLATE("admin_del_cats");
-} elseif ((isset($_POST['edit'])) && ((SELECTION_COUNT($_POST['sel']) > 0) || (isset($_POST['sel'][0])))) {
+} elseif ((REQUEST_ISSET_POST(('edit'))) && ((SELECTION_COUNT(REQUEST_POST('sel')) > 0) || (REQUEST_ISSET_POST(('sel', 0))))) {
        // Edit categories
        $SW = 2; $OUT = "";
-       foreach ($_POST['sel'] as $id => $value)
+       foreach (REQUEST_POST('sel') as $id => $value)
        {
                // Load data from the category
                $result = SQL_QUERY_ESC("SELECT cat, visible, sort FROM `{!_MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",