X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_cats.php;h=d51e798a05a686a30f317cdca84d5becae2d3aaf;hb=d0dfa5c5907273f7afa601407ee3d86bd369b3cd;hp=691f063d763ee122cc218139cb86678ce9d691ea;hpb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69;p=mailer.git

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 691f063d76..d51e798a05 100644
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -49,7 +49,7 @@ addMenuDescription('admin', __FILE__);
 // Init variable to avoid a notice
 $CATS = '';
 
-if (isPostRequestParameterSet('add')) {
+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__);
@@ -61,7 +61,7 @@ if (isPostRequestParameterSet('add')) {
 				postRequestParameter('visible'),
 				bigintval(postRequestParameter('parent') + 1)
 			), __FILE__, __LINE__);
-		$content = getMessage('CATEGORY_ADDED');
+		$content = '{--CATEGORY_ADDED--}';
 	} else {
 		// Category does already exists
 		$content = '<span class="admin_failed">{--CATEGORY_ALREADY_EXISTS--}</span>';
@@ -86,11 +86,11 @@ if (isPostRequestParameterSet('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 = getMessage('CATEGORIES_SAVED');
+					$TEXT = '{--ADMIN_CATEGORIES_SAVED--}';
 					break;
 
 				case 'del': // Delete categories
@@ -98,12 +98,12 @@ if (isPostRequestParameterSet('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 = getMessage('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 (isPostRequestParameterSet('add')) {
 		// Display message
 		loadTemplate('admin_settings_saved', false, $TEXT);
 	} // END - if
-} elseif ((isPostRequestParameterSet('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 ((isPostRequestParameterSet('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 (isPostRequestParameterSet('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 (isPostRequestParameterSet('add')) {
 
 			// Load row template and switch color
 			$OUT .= loadTemplate('admin_config_cats_row', true, $content);
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory