New naming convention applied to many functions, see #118 for details

[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 a000ebfd519c6fa5422fe38734d332b5f9df96e4..7d8f4a3b8abf72d30a5dc5bcb5c2f355e0f604f7 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -51,7 +51,7 @@ $CATS = '';
 
 if (REQUEST_ISSET_POST(('add'))) {
        // Add a new category
-       $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_cats` WHERE cat='%s' LIMIT 1",
+       $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...
@@ -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 ((IS_FORM_SENT()) && (REQUEST_ISSET_POST('id')) && (is_array(REQUEST_POST('id')))) {
        // Change or delete categories...
        $TEXT = '';
        foreach (REQUEST_POST('id') as $id => $cat) {
@@ -79,8 +79,8 @@ 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),
@@ -90,8 +90,8 @@ if (REQUEST_ISSET_POST(('add'))) {
                                $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",
                                        array($id), __FILE__, __LINE__);
@@ -108,12 +108,12 @@ 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",
+               $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,13 +133,13 @@ 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",
+               $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);
@@ -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)."...";