X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_cats.php;h=924be5cb3e5b203c43088a4437748e61b0d6bc7a;hp=feffa1cfb374d03037e8ce0f7677cbf2c6ae69ac;hb=fb573d4c3d981d52fd969a6d7167d8dc839be688;hpb=2e04164985cae54359663633a8796567d71082a7

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index feffa1cfb3..924be5cb3e 100644
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -15,12 +15,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * 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                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -44,7 +42,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Init variable to avoid a notice
 $CATS = '';
@@ -52,48 +50,48 @@ $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 {
 		// Category does already exists
-		$content = '<span class="admin_failed">{--CATEGORY_ALREADY_EXISTS--}</span>';
+		$content = '<span class="notice">{--CATEGORY_ALREADY_EXISTS--}</span>';
 	}
 
 	// Free memory
 	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--}';
 					break;
 
-				case 'del': // Delete categories
+				case 'delete': // 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",
@@ -103,30 +101,30 @@ 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('del')) && (ifPostContainsSelections())) {
+} 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_del_cats_row', true, $id);
+		$OUT .= loadTemplate('admin_delete_cats_row', true, $id);
 	} // END - foreach
 
 	// Load main template
-	loadTemplate('admin_del_cats', false, $OUT);
+	loadTemplate('admin_delete_cats', false, $OUT);
 } 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);
 
@@ -134,7 +132,7 @@ if (isFormSent('add')) {
 		SQL_FREERESULT($result);
 
 		// Prepare data for the row template
-		$content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id'])
+		$content['visible_selection'] = addSelectionBox('yn', $content['visible'], 'visible', $content['id']);
 
 		// Load row template and switch colors
 		$OUT .= loadTemplate('admin_edit_cats_row', true, $content);
@@ -147,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 = '';
@@ -160,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