Typo fixed :-(

[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 691f063d763ee122cc218139cb86678ce9d691ea..59fadde8d521b4348282e05cc1989696a44ee877 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -49,7 +49,7 @@ addMenuDescription('admin', __FILE__);
 // Init variable to avoid a notice
 $CATS = '';
 
-if (isPostRequestParameterSet('add')) {
+if (isFormSent('add')) {
        // Add a new category
        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `cat`='%s' LIMIT 1",
                array(postRequestParameter('catname')), __FILE__, __LINE__);
@@ -61,7 +61,7 @@ if (isPostRequestParameterSet('add')) {
                                postRequestParameter('visible'),
                                bigintval(postRequestParameter('parent') + 1)
                        ), __FILE__, __LINE__);
-               $content = getMessage('CATEGORY_ADDED');
+               $content = '{--CATEGORY_ADDED--}';
        } else {
                // Category does already exists
                $content = '<span class="admin_failed">{--CATEGORY_ALREADY_EXISTS--}</span>';
@@ -90,7 +90,7 @@ if (isPostRequestParameterSet('add')) {
                                                        postRequestParameter('sort', $id),
                                                        $id
                                                ), __FILE__, __LINE__);
-                                       $TEXT = getMessage('CATEGORIES_SAVED');
+                                       $TEXT = '{--CATEGORIES_SAVED--}';
                                        break;
 
                                case 'del': // Delete categories
@@ -98,7 +98,7 @@ if (isPostRequestParameterSet('add')) {
                                                array($id), __FILE__, __LINE__);
                                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s",
                                                array($id), __FILE__, __LINE__);
-                                       $TEXT = getMessage('CATEGORIES_DELETED');
+                                       $TEXT = '{--CATEGORIES_DELETED--}';
                                        break;
                        } // END - switch
                } else {
@@ -111,9 +111,9 @@ if (isPostRequestParameterSet('add')) {
                // Display message
                loadTemplate('admin_settings_saved', false, $TEXT);
        } // END - if
-} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('del')) && (ifPostContainsSelections())) {
        // Delete categories
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        foreach (postRequestParameter('sel') as $id => $value) {
                // Load data of category
                $result = SQL_QUERY_ESC("SELECT `cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
@@ -125,21 +125,19 @@ if (isPostRequestParameterSet('add')) {
 
                // Prepare data for the row template
                $content = array(
-                       'sw'  => $SW,
                        'id'  => $id,
                        'cat' => $cat,
                );
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_del_cats_row', true, $content);
-               $SW = 3 - $SW;
        } // END - foreach
 
        // Load main template
        loadTemplate('admin_del_cats', false, $OUT);
-} elseif ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Edit categories
-       $OUT = ''; $SW = 2;
+       $OUT = '';
        foreach (postRequestParameter('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",
@@ -149,7 +147,6 @@ if (isPostRequestParameterSet('add')) {
 
                // Prepare data for the row template
                $content = array(
-                       'sw'   => $SW,
                        'id'   => $id,
                        'cat'  => $cat,
                        'vis'  => addSelectionBox('yn', $vis, 'vis', $id),
@@ -158,7 +155,6 @@ if (isPostRequestParameterSet('add')) {
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_edit_cats_row', true, $content);
-               $SW = 3 - $SW;
        } // END - foreach
 
        // Load main template
@@ -169,14 +165,13 @@ if (isPostRequestParameterSet('add')) {
 
        // Load all categories
        $result = SQL_QUERY("SELECT `id`, `cat`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // Init variables
-               $OUT = ''; $SW = 2;
+               $OUT = '';
 
                // List already existing categories for editing
                while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare data for the row template
-                       $content['sw']  = $SW;
                        $content['vis'] = translateYesNo($content['visible']);
 
                        // Put cat descriptions into variable for the selection box
@@ -186,7 +181,6 @@ if (isPostRequestParameterSet('add')) {
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_config_cats_row', true, $content);
-                       $SW = 3 - $SW;
                } // END - while
 
                // Free memory