X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_cats.php;h=96b8cfd3e2f7a977d054333052dc2d5e58cd6130;hp=b8ebcf8b04bb5483580e8993139443db767ad2b4;hb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c;hpb=c4ceb98e54f072c262519fc2ea31ccf6f8559049

diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index b8ebcf8b04..96b8cfd3e2 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                             *
@@ -11,9 +11,14 @@
  * Kurzbeschreibung  : Neue Kategorien hinzufuegen und bestehende       *
  *                     editieren / loeschen                             *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -33,84 +38,88 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+addMenuDescription('admin', __FILE__);
 
 // Init variable to avoid a notice
-$CATS = "";
+$CATS = '';
 
-if (REQUEST_ISSET_POST(('add'))) {
+if (isPostRequestElementSet('add')) {
 	// Add a new category
-	$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_cats` WHERE cat='%s' LIMIT 1",
-		array(REQUEST_POST('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_NUMROWS($result) == '0') {
 		// Category does not exists, we simply add it...
-		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_cats` (cat, visible, sort) VALUES ('%s','%s','%s')",
-			array(REQUEST_POST('catname'), REQUEST_POST('visible'), bigintval(REQUEST_POST('parent') + 1)), __FILE__, __LINE__);
-		$content = 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 = 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
 	SQL_FREERESULT($result);
 
 	// Display message
-	LOAD_TEMPLATE("admin_settings_saved", false, $content);
-} elseif ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('id'))) && (is_array(REQUEST_POST('id')))) {
+	loadTemplate('admin_settings_saved', false, $content);
+} elseif ((isFormSent()) && (isPostRequestElementSet('id')) && (is_array(postRequestElement('id')))) {
 	// Change or delete categories...
-	$TEXT = "";
-	foreach (REQUEST_POST('id') as $id => $cat) {
-		// Secure ID
+	$TEXT = '';
+	foreach (postRequestElement('id') as $id => $cat) {
+		// Secure id
 		$id = bigintval($id);
 
 		// Is the entry set?
 		if (!empty($cat)) {
-			switch (REQUEST_GET('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,
-						REQUEST_POST('vis', $id),
-						REQUEST_POST('sort', $id),
-						$id
-					), __FILE__, __LINE__);
-				$TEXT = 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",
-					array($id), __FILE__, __LINE__);
-				$TEXT = CATEGORIES_DELETED;
-				break;
-			}
+			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');
+					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",
+						array($id), __FILE__, __LINE__);
+					$TEXT = getMessage('CATEGORIES_DELETED');
+					break;
+			} // END - switch
 		} else {
 			// Entry not saved
-			$TEXT .= sprintf(CATEGORY_NOT_SAVED, $id);
+			$TEXT .= getMaskedMessage('CATEGORY_NOT_SAVED', $id);
 		}
-	}
+	} // END - foreach
 
 	if (isset($TEXT)) {
 		// Display message
-		LOAD_TEMPLATE("admin_settings_saved", false, $TEXT);
-	}
-} elseif ((REQUEST_ISSET_POST('del')) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
+		loadTemplate('admin_settings_saved', false, $TEXT);
+	} // END - if
+} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0)) {
 	// Delete categories
-	$SW = 2; $OUT = "";
-	foreach (REQUEST_POST('sel') as $id => $value) {
+	$OUT = ''; $SW = 2;
+	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",
+		$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
@@ -121,21 +130,19 @@ if (REQUEST_ISSET_POST(('add'))) {
 		);
 
 		// Load row template and switch colors
-		$OUT .= LOAD_TEMPLATE("admin_del_cats_row", true, $content);
+		$OUT .= loadTemplate('admin_del_cats_row', true, $content);
 		$SW = 3 - $SW;
-	}
-	define('__CAT_ROWS', $OUT);
+	} // END - foreach
 
 	// Load main template
-	LOAD_TEMPLATE("admin_del_cats");
-} elseif ((REQUEST_ISSET_POST('edit')) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
+	loadTemplate('admin_del_cats', false, $OUT);
+} elseif ((isPostRequestElementSet('edit')) && (countPostSelection() > 0)) {
 	// Edit categories
-	$SW = 2; $OUT = "";
-	foreach (REQUEST_POST('sel') as $id => $value)
-	{
+	$OUT = ''; $SW = 2;
+	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__);
+		$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);
 		SQL_FREERESULT($result);
 
@@ -144,60 +151,56 @@ if (REQUEST_ISSET_POST(('add'))) {
 			'sw'   => $SW,
 			'id'   => $id,
 			'cat'  => $cat,
-			'vis'  => ADD_SELECTION("yn", $vis, "vis", $id),
+			'vis'  => addSelectionBox('yn', $vis, 'vis', $id),
 			'sort' => $sort,
 		);
 
 		// Load row template and switch colors
-		$OUT .= LOAD_TEMPLATE("admin_edit_cats_row", true, $content);
+		$OUT .= loadTemplate('admin_edit_cats_row', true, $content);
 		$SW = 3 - $SW;
-	}
-	define('__CAT_ROWS', $OUT);
+	} // END - foreach
 
 	// Load main template
-	LOAD_TEMPLATE("admin_edit_cats");
-}
- else
-{
+	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`", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0)
-	{
+	$result = SQL_QUERY("SELECT `id`, `cat`, `visible`, `sort` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
+	if (SQL_NUMROWS($result) > 0) {
+		// Init variables
+		$OUT = ''; $SW = 2;
+
 		// List already existing categories for editing
-		$SW = 2; $OUT = ""; $CATS = "";
-		while (list($id, $cat, $visible, $sort) = SQL_FETCHROW($result))
-		{
+		while ($content = SQL_FETCHARRAY($result)) {
 			// Prepare data for the row template
-			$content = array(
-				'sw'   => $SW,
-				'id'   => $id,
-				'cat'  => $cat,
-				'vis'  => TRANSLATE_YESNO($visible),
-				'sort' => $sort,
-			);
+			$content['sw']  = $SW;
+			$content['vis'] = translateYesNo($content['visible']);
 
 			// Put cat descriptions into variable for the selection box
-			if (strlen($cat) > 20) $cat = substr($cat, 0, 17)."...";
-			$CATS .= "      <option value=\"".$sort."\">".$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 .= LOAD_TEMPLATE("admin_config_cats_row", true, $content);
+			$OUT .= loadTemplate('admin_config_cats_row', true, $content);
 			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
-		define('__CAT_ROWS', $OUT);
 
 		// Load main template
-		LOAD_TEMPLATE("admin_config_cats");
-	}
+		loadTemplate('admin_config_cats', false, $OUT);
+	} // END - if
 
-	define('CATS', $CATS);
+	// Remember in array
+	$content['cats'] = $CATS;
 
 	// Form to add a new category
-	LOAD_TEMPLATE("admin_add_cat");
+	loadTemplate('admin_add_cat', false, $content);
 }
 
-//
+// [EOF]
 ?>