X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_cats.php;h=bb91e4f749bb48612a5b93166a62683637a4268b;hb=995488beda665a1fc3de65df95f2d1ae236d1245;hp=e9008fb4e8647de4d7a6e29776cb6e51c19ac308;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index e9008fb4e8..bb91e4f749 100644
--- 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 *
@@ -40,7 +41,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -48,18 +49,22 @@ 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') {
+	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `cat`='%s' LIMIT 1",
+		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)), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_cats` (`cat`, `visible`, `sort`) VALUES ('%s','%s','%s')",
+			array(
+				postRequestParameter('catname'),
+				postRequestParameter('visible'),
+				bigintval(postRequestParameter('parent') + 1)
+			), __FILE__, __LINE__);
 		$content = getMessage('CATEGORY_ADDED');
 	} else {
 		// Category does already exists
-		$content = "<span class=\"admin_failed\">{--CATEGORY_ALREADY_EXISTS--}</span>";
+		$content = '<span class="admin_failed">{--CATEGORY_ALREADY_EXISTS--}</span>';
 	}
 
 	// Free memory
@@ -67,50 +72,49 @@ 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),
-					$id
-					), __FILE__, __LINE__);
+					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('sort', $id),
+							$id
+						), __FILE__, __LINE__);
 					$TEXT = getMessage('CATEGORIES_SAVED');
 					break;
 
 				case 'del': // 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",
+					SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s",
 						array($id), __FILE__, __LINE__);
 					$TEXT = getMessage('CATEGORIES_DELETED');
 					break;
-			}
+			} // END - switch
 		} else {
 			// Entry not saved
-			$TEXT .= sprintf(getMessage('CATEGORY_NOT_SAVED'), $id);
+			$TEXT .= getMaskedMessage('CATEGORY_NOT_SAVED', $id);
 		}
-	}
+	} // END - foreach
 
 	if (isset($TEXT)) {
 		// Display message
 		loadTemplate('admin_settings_saved', false, $TEXT);
-	}
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
+	} // END - if
+} 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__);
@@ -129,15 +133,14 @@ if (isPostRequestElementSet('add')) {
 		// 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 ((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__);
@@ -156,7 +159,7 @@ if (isPostRequestElementSet('add')) {
 		// Load row template and switch colors
 		$OUT .= loadTemplate('admin_edit_cats_row', true, $content);
 		$SW = 3 - $SW;
-	}
+	} // END - foreach
 
 	// Load main template
 	loadTemplate('admin_edit_cats', false, $OUT);
@@ -177,8 +180,9 @@ if (isPostRequestElementSet('add')) {
 			$content['vis'] = translateYesNo($content['visible']);
 
 			// Put cat descriptions into variable for the selection box
-			if (strlen($content['cat']) > 20) $content['cat'] = substr($content['cat'], 0, 17)."...";
-			$CATS .= "      <option value=\"".$content['sort']."\">".$content['cat']."</option>\n";
+			$cat = $content['cat'];
+			if (strlen($cat) > 40) $cat = substr($cat, 0, 37) . '...';
+			$CATS .= '<option value="' . $content['sort'] . '">' . $cat . '</option>';
 
 			// Load row template and switch color
 			$OUT .= loadTemplate('admin_config_cats_row', true, $content);