X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guest_add.php;h=1728bdd49809636cb9b9bb9f6b49c96aefed4e8c;hb=c3f2beb3f1d47c9593d262d7f5dac47640b4aa52;hp=f23636efd305a9b921f88c0ee0f8564dc417c357;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index f23636efd3..1728bdd498 100644
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-guest_add.php                               *
@@ -45,9 +45,9 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if (((!isPostRequestElementSet('title')) || (!isPostRequestElementSet(('menu')))) && (isFormSent())) {
+if (((!isPostRequestParameterSet('title')) || (!isPostRequestParameterSet('menu'))) && (isFormSent())) {
 	// Abort adding the menu entry
-	unsetPostRequestElement('ok');
+	unsetPostRequestParameter('ok');
 } // END - if
 
 if (!isFormSent()) {
@@ -55,7 +55,14 @@ if (!isFormSent()) {
 	$menus = array(); $titles = array(); $below = array();
 
 	// Get all available main menus
-	$result = SQL_QUERY("SELECT action, title, sort FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
+	$result = SQL_QUERY("SELECT
+	`action`, `title`, `sort`
+FROM
+	`{?_MYSQL_PREFIX?}_guest_menu`
+WHERE
+	(`what`='' OR `what` IS NULL)
+ORDER BY
+	`sort` ASC", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Read menu structure
 		// @TODO Cant this be rewritten?
@@ -93,10 +100,17 @@ if (!isFormSent()) {
 
 		// Load sub menus :)
 		foreach ($menus as $key_main => $value_main) {
-			$result = SQL_QUERY_ESC("SELECT what, title, sort
-FROM `{?_MYSQL_PREFIX?}_guest_menu`
-WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
-			array($value_main), __FILE__, __LINE__);
+			// Query for sub menus
+			$result = SQL_QUERY_ESC("SELECT
+	`what`, `title`, `sort`
+FROM
+	`{?_MYSQL_PREFIX?}_guest_menu`
+WHERE
+	`action`='%s' AND
+	`what` != '' AND
+	`what` IS NOT NULL
+ORDER BY `sort` ASC",
+				array($value_main), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) > 0) {
 				// Initialize arrays
 				$menus[$value_main] = array();
@@ -106,7 +120,7 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
 				// Read menu structure
 				while ($content = SQL_FETCHARRAY($result)) {
 					// Menu actions
-					$menus[$value_main][] = $content['action'];
+					$menus[$value_main][] = $content['what'];
 
 					// Menu titles
 					$titles[$value_main][] = $content['title'];
@@ -140,7 +154,7 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
 	}
 
 	$OUT = "    <select class=\"admin_select\" name=\"sort\" size=\"1\">
-      <option value=\"0\">".IS_FIRST_MENU."</option>";
+      <option value=\"0\">{--IS_FIRST_MENU--}</option>";
 	foreach ($below as $key => $m) {
 		if (is_array($m)) {
 			foreach ($m as $key2 => $m2) {
@@ -167,25 +181,25 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
 	loadTemplate('admin_guest_add', false, $content);
 } elseif (!isDemoModeActive()) {
 	// Insert new menu entry
-	if (isPostRequestElementSet(('menu'))) {
+	if (isPostRequestParameterSet('menu')) {
 		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
-		array(
-		postRequestElement('menu'),
-		postRequestElement('name'),
-		postRequestElement('title'),
-		bigintval(postRequestElement('sort')),
-		postRequestElement('visible'),
-		postRequestElement('active'),
-		), __FILE__, __LINE__);
+			array(
+				postRequestParameter('menu'),
+				postRequestParameter('name'),
+				postRequestParameter('title'),
+				bigintval(postRequestParameter('sort')),
+				postRequestParameter('visible'),
+				postRequestParameter('active'),
+			), __FILE__, __LINE__);
 	} else {
-		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
-		array(
-		postRequestElement('name'),
-		postRequestElement('title'),
-		bigintval(postRequestElement('sort')),
-		postRequestElement('visible'),
-		postRequestElement('active'),
-		), __FILE__, __LINE__);
+		SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_guest_menu` (`action`, `title`, `sort`, `visible`, `locked`) VALUES ('%s','%s','%s','%s','%s')",
+			array(
+				postRequestParameter('name'),
+				postRequestParameter('title'),
+				bigintval(postRequestParameter('sort')),
+				postRequestParameter('visible'),
+				postRequestParameter('active'),
+			), __FILE__, __LINE__);
 	}
 	loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
 } else {
@@ -193,5 +207,5 @@ WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
 	loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
 }
 
-//
+// [EOF]
 ?>