Fixes for wrong tewmplate names, new network added:

[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 b2246e48a21b7c1112159c1fe69a4562cfd16ec8..1649e42a4247a45d862424da736ee65a1a0003cc 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -64,7 +64,7 @@ if (isFormSent('add')) {
                $content = '{--CATEGORY_ADDED--}';
        } else {
                // Category does already exists
-               $content = '<span class="admin_failed">{--CATEGORY_ALREADY_EXISTS--}</span>';
+               $content = '<span class="notice">{--CATEGORY_ALREADY_EXISTS--}</span>';
        }
 
        // Free memory
@@ -86,11 +86,11 @@ if (isFormSent('add')) {
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_cats` SET `cat`='%s', `visible`='%s', `sort`=%s WHERE `id`=%s LIMIT 1",
                                                array(
                                                        $cat,
-                                                       postRequestParameter('vis', $id),
+                                                       postRequestParameter('visible', $id),
                                                        postRequestParameter('sort', $id),
                                                        $id
                                                ), __FILE__, __LINE__);
-                                       $TEXT = '{--CATEGORIES_SAVED--}';
+                                       $TEXT = '{--ADMIN_CATEGORIES_SAVED--}';
                                        break;
 
                                case 'del': // Delete categories
@@ -98,12 +98,12 @@ if (isFormSent('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 = '{--CATEGORIES_DELETED--}';
+                                       $TEXT = '{--ADMIN_CATEGORIES_DELETED--}';
                                        break;
                        } // END - switch
                } else {
                        // Entry not saved
-                       $TEXT .= getMaskedMessage('CATEGORY_NOT_SAVED', $id);
+                       $TEXT .= getMaskedMessage('ADMIN_CATEGORY_NOT_SAVED', $id);
                }
        } // END - foreach
 
@@ -111,54 +111,33 @@ if (isFormSent('add')) {
                // Display message
                loadTemplate('admin_settings_saved', false, $TEXT);
        } // END - if
-} elseif ((isFormSent('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",
-                       array(bigintval($id)), __FILE__, __LINE__);
-               list($cat) = SQL_FETCHROW($result);
-
-               // Free result
-               SQL_FREERESULT($result);
-
-               // 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;
+               $OUT .= loadTemplate('admin_del_cats_row', true, $id);
        } // END - foreach
 
        // Load main template
        loadTemplate('admin_del_cats', false, $OUT);
-} elseif ((isFormSent('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",
-               array(bigintval($id)), __FILE__, __LINE__);
-               list($cat, $vis, $sort) = SQL_FETCHROW($result);
+               $result = SQL_QUERY_ESC("SELECT `id`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
+                       array(bigintval($id)), __FILE__, __LINE__);
+               $content = SQL_FETCHARRAY($result);
+
+               // Free result
                SQL_FREERESULT($result);
 
                // Prepare data for the row template
-               $content = array(
-                       'sw'   => $SW,
-                       'id'   => $id,
-                       'cat'  => $cat,
-                       'vis'  => addSelectionBox('yn', $vis, 'vis', $id),
-                       'sort' => $sort,
-               );
+               $content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']);
 
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_edit_cats_row', true, $content);
-               $SW = 3 - $SW;
        } // END - foreach
 
        // Load main template
@@ -169,16 +148,12 @@ if (isFormSent('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
                        $cat = $content['cat'];
                        if (strlen($cat) > 40) $cat = substr($cat, 0, 37) . '...';
@@ -186,7 +161,6 @@ if (isFormSent('add')) {
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_config_cats_row', true, $content);
-                       $SW = 3 - $SW;
                } // END - while
 
                // Free memory