X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guest_add.php;h=3bd9a5c284d4375446d907944b84a3908cc63ecb;hb=77cdaff2afb97ed32985ced906a3a95ee078c2ef;hp=0cc22e2bb3d3ec930cf14dd190db8470235b5ced;hpb=27f65d023a3388a8bd85be8ee5991f776f541847;p=mailer.git

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 0cc22e2bb3..3bd9a5c284 100644
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -41,7 +41,8 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if (((empty($_POST['title'])) || (empty($_POST['menu']))) && (isset($_POST['ok'])) {
+if (((empty($_POST['title'])) || (empty($_POST['menu']))) && (isset($_POST['ok']))) {
+	// Abort adding the menu entry
 	unset($_POST['ok']);
 }
 
@@ -50,7 +51,7 @@ if (!isset($_POST['ok'])) {
 	$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`", __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		// Read menu structure
 		while (list($act, $title, $sort) = SQL_FETCHROW($result)) {
@@ -79,13 +80,16 @@ if (!isset($_POST['ok'])) {
 			}
 		}
 
-		$menus = $dmy; $titles = $dmy2; $below = $dmy3;
+		// Init variables
+		$menus  = $dmy;
+		$titles = $dmy2;
+		$below  = $dmy3;
 
 		// 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",
+FROM `{!_MYSQL_PREFIX!}_guest_menu`
+WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
  array($value_main), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) > 0)
 			{
@@ -130,15 +134,15 @@ 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>";
+	$OUT = "    <select class=\"admin_select\" name=\"sort\" size=\"1\">
+      <option value=\"0\">".IS_FIRST_MENU."</option>";
   	foreach ($below as $key => $m)
 	{
 		if (is_array($m))
 		{
 			foreach ($m as $key2 => $m2)
 			{
-				$OUT .= "      <OPTION value=\"".$m2."\">".$titles[$key][$key2];
+				$OUT .= "      <option value=\"".$m2."\">".$titles[$key][$key2];
 				foreach ($menus as $k => $v)
 				{
 					if (($v == $key) && (!is_array($v)))
@@ -146,15 +150,15 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
 						$OUT .= " (".$titles[$k].")";
 					}
 				}
-				$OUT .= "</OPTION>\n";
+				$OUT .= "</option>\n";
 			}
 		}
 		 else
 		{
-			$OUT .= "      <OPTION value=\"".$m."\">".$titles[$key]."</OPTION>\n";
+			$OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
 		}
 	}
-	$OUT .= "</SELECT>";
+	$OUT .= "</select>";
 
 	define('__BELOW_SELECTION' , $OUT);
 	define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION("guest", "what", "name"));
@@ -168,7 +172,7 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
 	// Insert new menu entry
 	if (!empty($_POST['menu']))
 	{
-		SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
+		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
  array(
 	$_POST['menu'],
 	$_POST['name'],
@@ -180,7 +184,7 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
 	}
 	 else
 	{
-		SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
+		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
  array(
 	$_POST['name'],
 	$_POST['title'],
@@ -189,12 +193,12 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
 	$_POST['active'],
 ), __FILE__, __LINE__);
 	}
-	LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
 }
  else
 {
 	// Demo mode!
-	LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_NOT_SAVED);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));
 }
 
 //