X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_cats.php;h=2f50fa4f883388ca981c9b9b64b926e76f496b80;hp=bdbb540774a59947803ce536e28d22a6e10fe246;hb=596c8ab32594401ca84abfbfe35513ddfff31bec;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index bdbb540774..2f50fa4f88 100644
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/10/2003 *
- * ===============                              Last change: 07/04/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/10/2003 *
+ * ===================                          Last change: 07/04/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-config_cats.php                             *
@@ -15,11 +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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -40,34 +39,38 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('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(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')",
-		array(postRequestElement('catname'), postRequestElement('visible'), bigintval(postRequestElement('parent') + 1)), __FILE__, __LINE__);
-		$content = getMessage('CATEGORY_ADDED');
+		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__);
+		$content = '{--CATEGORY_ADDED--}';
 	} else {
 		// Category does already exists
-		$content = "<span class=\"admin_failed\">{--CATEGORY_ALREADY_EXISTS--}</span>";
+		$content = '<span class="bad">{--CATEGORY_ALREADY_EXISTS--}</span>';
 	}
 
 	// Free memory
 	SQL_FREERESULT($result);
 
 	// Display message
-	loadTemplate('admin_settings_saved', false, $content);
-} elseif ((isFormSent()) && (isPostRequestElementSet('id')) && (is_array(postRequestElement('id')))) {
+	displayMessage($content);
+} elseif ((isFormSent()) && (ifPostContainsSelections('id'))) {
 	// Change or delete categories...
 	$TEXT = '';
 	foreach (postRequestElement('id') as $id => $cat) {
@@ -76,127 +79,100 @@ if (isPostRequestElementSet('add')) {
 
 		// Is the entry set?
 		if (!empty($cat)) {
-			switch (getRequestElement('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,
-					postRequestElement('vis', $id),
-					postRequestElement('sort', $id),
-					$id
-					), __FILE__, __LINE__);
-					$TEXT = getMessage('CATEGORIES_SAVED');
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_cats` SET `cat`='%s',`visible`='%s',`sort`=%s WHERE `id`=%s LIMIT 1",
+						array(
+							$cat,
+							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",
+					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 .= sprintf(getMessage('CATEGORY_NOT_SAVED'), $id);
+			$TEXT .= '{%message,ADMIN_CATEGORY_NOT_SAVED=' . $id . '%}';
 		}
-	}
+	} // END - foreach
 
 	if (isset($TEXT)) {
 		// Display message
-		loadTemplate('admin_settings_saved', false, $TEXT);
-	}
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
+		displayMessage($TEXT);
+	} // END - if
+} elseif ((isFormSent('delete')) && (ifPostContainsSelections())) {
 	// Delete categories
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 	foreach (postRequestElement('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_delete_cats_row', TRUE, $id);
+	} // END - foreach
 
 	// Load main template
-	loadTemplate('admin_del_cats', false, $OUT);
-} elseif ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
+	loadTemplate('admin_delete_cats', FALSE, $OUT);
+} elseif ((isFormSent('edit')) && (ifPostContainsSelections())) {
 	// Edit categories
-	$OUT = ''; $SW = 2;
-	foreach (postRequestElement('sel') as $id => $value)
-	{
+	$OUT = '';
+	foreach (postRequestElement('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;
-	}
+		$OUT .= loadTemplate('admin_edit_cats_row', TRUE, $content);
+	} // END - foreach
 
 	// Load main template
-	loadTemplate('admin_edit_cats', false, $OUT);
+	loadTemplate('admin_edit_cats', FALSE, $OUT);
 } else {
 	// Init variable here
 	$CATS = '';
 
 	// 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
-			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);
-			$SW = 3 - $SW;
+			$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
 	$content['cats'] = $CATS;
 
 	// Form to add a new category
-	loadTemplate('admin_add_cat', false, $content);
+	loadTemplate('admin_add_cat', FALSE, $content);
 }
 
 // [EOF]