'what' files should be loaded only once

[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 dec8982086599a566620a8056f23f90736791946..924be5cb3e5b203c43088a4437748e61b0d6bc7a 100644 (file)
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -18,7 +18,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -50,14 +50,14 @@ $CATS = '';
 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__);
+               array(postRequestElement('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')",
+               SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`,`visible`,`sort`) VALUES ('%s','%s','%s')",
                        array(
-                               postRequestParameter('catname'),
-                               postRequestParameter('visible'),
-                               bigintval(postRequestParameter('parent') + 1)
+                               postRequestElement('catname'),
+                               postRequestElement('visible'),
+                               bigintval(postRequestElement('parent') + 1)
                        ), __FILE__, __LINE__);
                $content = '{--CATEGORY_ADDED--}';
        } else {
@@ -69,23 +69,23 @@ if (isFormSent('add')) {
        SQL_FREERESULT($result);
 
        // Display message
-       loadTemplate('admin_settings_saved', false, $content);
-} elseif ((isFormSent()) && (isPostRequestParameterSet('id')) && (is_array(postRequestParameter('id')))) {
+       displayMessage($content);
+} elseif ((isFormSent()) && (isPostRequestElementSet('id')) && (is_array(postRequestElement('id')))) {
        // Change or delete categories...
        $TEXT = '';
-       foreach (postRequestParameter('id') as $id => $cat) {
+       foreach (postRequestElement('id') as $id => $cat) {
                // Secure id
                $id = bigintval($id);
 
                // Is the entry set?
                if (!empty($cat)) {
-                       switch (getRequestParameter('do')) {
+                       switch (getRequestElement('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,
-                                                       postRequestParameter('visible', $id),
-                                                       postRequestParameter('sort', $id),
+                                                       postRequestElement('visible', $id),
+                                                       postRequestElement('sort', $id),
                                                        $id
                                                ), __FILE__, __LINE__);
                                        $TEXT = '{--ADMIN_CATEGORIES_SAVED--}';
@@ -101,18 +101,18 @@ if (isFormSent('add')) {
                        } // END - switch
                } else {
                        // Entry not saved
-                       $TEXT .= getMaskedMessage('ADMIN_CATEGORY_NOT_SAVED', $id);
+                       $TEXT .= '{%message,ADMIN_CATEGORY_NOT_SAVED=' . $id . '%}';
                }
        } // END - foreach
 
        if (isset($TEXT)) {
                // Display message
-               loadTemplate('admin_settings_saved', false, $TEXT);
+               displayMessage($TEXT);
        } // END - if
 } elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
        // Delete categories
        $OUT = '';
-       foreach (postRequestParameter('sel') as $id => $value) {
+       foreach (postRequestElement('sel') as $id => $value) {
                // Load row template and switch colors
                $OUT .= loadTemplate('admin_delete_cats_row', true, $id);
        } // END - foreach
@@ -122,9 +122,9 @@ if (isFormSent('add')) {
 } elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
        // Edit categories
        $OUT = '';
-       foreach (postRequestParameter('sel') as $id => $value) {
+       foreach (postRequestElement('sel') as $id => $value) {
                // Load data from the category
-               $result = SQL_QUERY_ESC("SELECT `id`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
+               $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);
 
@@ -145,7 +145,7 @@ if (isFormSent('add')) {
        $CATS = '';
 
        // Load all categories
-       $result = SQL_QUERY("SELECT `id`, `cat`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT `id`,`cat`,`visible`,`sort` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
        if (!SQL_HASZERONUMS($result)) {
                // Init variables
                $OUT = '';
@@ -158,14 +158,14 @@ if (isFormSent('add')) {
                        $CATS .= '<option value="' . $content['sort'] . '">' . $cat . '</option>';
 
                        // Load row template and switch color
-                       $OUT .= loadTemplate('admin_config_cats_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_cats_row', true, $content);
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load main template
-               loadTemplate('admin_config_cats', false, $OUT);
+               loadTemplate('admin_list_cats', false, $OUT);
        } // END - if
 
        // Remember in array