Heavy rewrite:

[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 025dfe769f2681ca7ce5c0714264b8eb1d8aa2c8..fbede77ba6634ef80c967d32a478cf747b2c9772 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -49,14 +49,14 @@ ADD_DESCR('admin', __FILE__);
 // Init variable to avoid a notice
 $CATS = '';
 
-if (REQUEST_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(REQUEST_POST('catname')), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_cats` WHERE cat='%s' LIMIT 1",
+       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(REQUEST_POST('catname'), REQUEST_POST('visible'), bigintval(REQUEST_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
@@ -68,7 +68,7 @@ if (REQUEST_ISSET_POST(('add'))) {
 
        // Display message
        LOAD_TEMPLATE('admin_settings_saved', false, $content);
-} elseif ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('id'))) && (is_array(REQUEST_POST('id')))) {
+} elseif ((isFormSent()) && (REQUEST_ISSET_POST('id')) && (is_array(REQUEST_POST('id')))) {
        // Change or delete categories...
        $TEXT = '';
        foreach (REQUEST_POST('id') as $id => $cat) {
@@ -79,24 +79,24 @@ if (REQUEST_ISSET_POST(('add'))) {
                if (!empty($cat)) {
                        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",
+                               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,
-                                               REQUEST_POST('vis', $id),
-                                               REQUEST_POST('sort', $id),
-                                               $id
+                                       $cat,
+                                       REQUEST_POST('vis', $id),
+                                       REQUEST_POST('sort', $id),
+                                       $id
                                        ), __FILE__, __LINE__);
-                               $TEXT = CATEGORIES_SAVED;
-                               break;
+                                       $TEXT = CATEGORIES_SAVED;
+                                       break;
 
-                       case "del": // Delete categories
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",
+                               case 'del': // Delete categories
+                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_cats` WHERE `id`=%s LIMIT 1",
                                        array($id), __FILE__, __LINE__);
-                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
+                                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
                                        array($id), __FILE__, __LINE__);
-                               $TEXT = CATEGORIES_DELETED;
-                               break;
+                                       $TEXT = CATEGORIES_DELETED;
+                                       break;
                        }
                } else {
                        // Entry not saved
@@ -108,13 +108,13 @@ if (REQUEST_ISSET_POST(('add'))) {
                // Display message
                LOAD_TEMPLATE('admin_settings_saved', false, $TEXT);
        }
-} elseif ((REQUEST_ISSET_POST('del')) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
+} elseif ((REQUEST_ISSET_POST('del')) && (countPostSelection() > 0)) {
        // Delete categories
        $OUT = ''; $SW = 2;
        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__);
+               $result = SQL_QUERY_ESC("SELECT cat FROM `{!_MYSQL_PREFIX!}_cats` WHERE `id`=%s LIMIT 1",
+               array(bigintval($id)), __FILE__, __LINE__);
                list($cat) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
@@ -133,14 +133,14 @@ if (REQUEST_ISSET_POST(('add'))) {
 
        // Load main template
        LOAD_TEMPLATE("admin_del_cats");
-} elseif ((REQUEST_ISSET_POST('edit')) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
+} elseif ((REQUEST_ISSET_POST('edit')) && (countPostSelection() > 0)) {
        // Edit categories
        $OUT = ''; $SW = 2;
        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",
-                array(bigintval($id)), __FILE__, __LINE__);
+               $result = SQL_QUERY_ESC("SELECT cat, visible, sort FROM `{!_MYSQL_PREFIX!}_cats` WHERE `id`=%s LIMIT 1",
+               array(bigintval($id)), __FILE__, __LINE__);
                list($cat, $vis, $sort) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
@@ -149,7 +149,7 @@ if (REQUEST_ISSET_POST(('add'))) {
                        'sw'   => $SW,
                        'id'   => $id,
                        'cat'  => $cat,
-                       'vis'  => ADD_SELECTION("yn", $vis, "vis", $id),
+                       'vis'  => ADD_SELECTION('yn', $vis, "vis", $id),
                        'sort' => $sort,
                );
 
@@ -175,7 +175,7 @@ if (REQUEST_ISSET_POST(('add'))) {
                while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare data for the row template
                        $content['sw']  = $SW;
-                       $content['vis'] = TRANSLATE_YESNO($content['visible']);
+                       $content['vis'] = translateYesNo($content['visible']);
 
                        // Put cat descriptions into variable for the selection box
                        if (strlen($content['cat']) > 20) $content['cat'] = substr($content['cat'], 0, 17)."...";