X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_cats.php;h=1649e42a4247a45d862424da736ee65a1a0003cc;hp=59fadde8d521b4348282e05cc1989696a44ee877;hb=a4dd1eb45ae25ed017a862a4edac1e2828acbee6;hpb=30ae22f62ae87c53a56baf0d134569ba91011111

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 59fadde8d5..1649e42a42 100644
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -64,7 +64,7 @@ if (isFormSent('add')) {
 		$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
@@ -86,11 +86,11 @@ if (isFormSent('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 = '{--CATEGORIES_SAVED--}';
+					$TEXT = '{--ADMIN_CATEGORIES_SAVED--}';
 					break;
 
 				case 'del': // Delete categories
@@ -98,12 +98,12 @@ if (isFormSent('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 = '{--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
 
@@ -115,22 +115,8 @@ if (isFormSent('add')) {
 	// Delete categories
 	$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(
-			'id'  => $id,
-			'cat' => $cat,
-		);
-
 		// Load row template and switch colors
-		$OUT .= loadTemplate('admin_del_cats_row', true, $content);
+		$OUT .= loadTemplate('admin_del_cats_row', true, $id);
 	} // END - foreach
 
 	// Load main template
@@ -140,18 +126,15 @@ if (isFormSent('add')) {
 	$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(
-			'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);
@@ -171,9 +154,6 @@ if (isFormSent('add')) {
 
 		// List already existing categories for editing
 		while ($content = SQL_FETCHARRAY($result)) {
-			// Prepare data for the row template
-			$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) . '...';