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

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index 59fadde8d5..770725dd1e 100644
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -15,11 +15,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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 = '';
@@ -64,14 +62,14 @@ 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
 	SQL_FREERESULT($result);
 
 	// Display message
-	loadTemplate('admin_settings_saved', false, $content);
+	displayMessage($content);
 } elseif ((isFormSent()) && (isPostRequestParameterSet('id')) && (is_array(postRequestParameter('id')))) {
 	// Change or delete categories...
 	$TEXT = '';
@@ -86,72 +84,55 @@ 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
+				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",
 						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 .= '{%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) {
-		// 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_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) {
 		// 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,23 +152,20 @@ 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) . '...';
 			$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