Encapsulation and fixes:

[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 5b5d0156a89968336c630ee03384b76f94933109..bb91e4f749bb48612a5b93166a62683637a4268b 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -19,6 +19,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -48,17 +49,17 @@ addMenuDescription('admin', __FILE__);
 // Init variable to avoid a notice
 $CATS = '';
 
-if (isPostRequestElementSet('add')) {
+if (isFormSent('add')) {
        // Add a new category
        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `cat`='%s' LIMIT 1",
-               array(postRequestElement('catname')), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == '0') {
+               array(postRequestParameter('catname')), __FILE__, __LINE__);
+       if (SQL_HASZERONUMS($result)) {
                // Category does not exists, we simply add it...
                SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('%s','%s','%s')",
                        array(
-                               postRequestElement('catname'),
-                               postRequestElement('visible'),
-                               bigintval(postRequestElement('parent') + 1)
+                               postRequestParameter('catname'),
+                               postRequestParameter('visible'),
+                               bigintval(postRequestParameter('parent') + 1)
                        ), __FILE__, __LINE__);
                $content = getMessage('CATEGORY_ADDED');
        } else {
@@ -71,22 +72,22 @@ if (isPostRequestElementSet('add')) {
 
        // Display message
        loadTemplate('admin_settings_saved', false, $content);
-} elseif ((isFormSent()) && (isPostRequestElementSet('id')) && (is_array(postRequestElement('id')))) {
+} elseif ((isFormSent()) && (isPostRequestParameterSet('id')) && (is_array(postRequestParameter('id')))) {
        // Change or delete categories...
        $TEXT = '';
-       foreach (postRequestElement('id') as $id => $cat) {
+       foreach (postRequestParameter('id') as $id => $cat) {
                // Secure id
                $id = bigintval($id);
 
                // Is the entry set?
                if (!empty($cat)) {
-                       switch (getRequestElement('do')) {
+                       switch (getRequestParameter('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,
-                                                       postRequestElement('vis', $id),
-                                                       postRequestElement('sort', $id),
+                                                       postRequestParameter('vis', $id),
+                                                       postRequestParameter('sort', $id),
                                                        $id
                                                ), __FILE__, __LINE__);
                                        $TEXT = getMessage('CATEGORIES_SAVED');
@@ -102,7 +103,7 @@ if (isPostRequestElementSet('add')) {
                        } // END - switch
                } else {
                        // Entry not saved
-                       $TEXT .= sprintf(getMessage('CATEGORY_NOT_SAVED'), $id);
+                       $TEXT .= getMaskedMessage('CATEGORY_NOT_SAVED', $id);
                }
        } // END - foreach
 
@@ -110,10 +111,10 @@ if (isPostRequestElementSet('add')) {
                // Display message
                loadTemplate('admin_settings_saved', false, $TEXT);
        } // END - if
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('del')) && (countPostSelection() > 0)) {
        // Delete categories
        $OUT = ''; $SW = 2;
-       foreach (postRequestElement('sel') as $id => $value) {
+       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__);
@@ -136,10 +137,10 @@ if (isPostRequestElementSet('add')) {
 
        // Load main template
        loadTemplate('admin_del_cats', false, $OUT);
-} elseif ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
+} elseif ((isFormSent('edit')) && (countPostSelection() > 0)) {
        // Edit categories
        $OUT = ''; $SW = 2;
-       foreach (postRequestElement('sel') as $id => $value) {
+       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__);