X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guest_add.php;h=863931eb6117c108f720ed8bac96c14e64b2675e;hb=22a33b87f9894a94efb71de7630f12129e34f83b;hp=414d847ce009b7547e1c7996a7f2c393b7399b67;hpb=8a9324b2d931f54f54f4319fd7234910af77012c;p=mailer.git

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index 414d847ce0..863931eb61 100644
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -32,16 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
-// Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
-OUTPUT_HTML("</FONT><br />");
 
-OPEN_TABLE("100%", "admin_content admin_content_align", "");
+// Add description as navigation point
+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'])))
@@ -55,7 +52,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='' 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
@@ -76,7 +73,7 @@ if (!isset($_POST['ok']))
 
 		// Remove double eintries
 		$prev = ""; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
-		foreach ($menus as $key=>$value)
+		foreach ($menus as $key => $value)
 		{
 			if ($value == $prev)
 			{
@@ -91,11 +88,11 @@ if (!isset($_POST['ok']))
 		}
 		$menus = $dmy; $titles = $dmy2; $below = $dmy3;
 		// Load sub menus :)
-		foreach ($menus as $key_main=>$value_main)
+		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 != '' ORDER BY sort",
+WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
  array(bigintval($value_main)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) > 0)
 			{
@@ -122,7 +119,7 @@ WHERE action='%s' AND what != '' ORDER BY sort",
 
 				// Remove double eintries
 				$prev = ""; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];
-				foreach ($menus[$value_main] as $key=>$value)
+				foreach ($menus[$value_main] as $key => $value)
 				{
 					if ($value == $prev)
 					{
@@ -142,14 +139,14 @@ WHERE action='%s' AND what != '' ORDER BY sort",
 
 	$OUT = "    <SELECT class=\"admin_select\" name=\"sort\" size=\"1\">
       <OPTION value=\"0\">".IS_FIRST_MENU."</OPTION>";
-  	foreach ($below as $key=>$m)
+  	foreach ($below as $key => $m)
 	{
 		if (is_array($m))
 		{
-			foreach ($m as $key2=>$m2)
+			foreach ($m as $key2 => $m2)
 			{
 				$OUT .= "      <OPTION value=\"".$m2."\">".$titles[$key][$key2];
-				foreach ($menus as $k=>$v)
+				foreach ($menus as $k => $v)
 				{
 					if (($v == $key) && (!is_array($v)))
 					{
@@ -178,9 +175,7 @@ WHERE action='%s' AND what != '' ORDER BY sort",
 	// Insert new menu entry
 	if (!empty($_POST['menu']))
 	{
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_guest_menu
-(action, what, title, sort, visible, locked)
-VALUES('%s', '%s', '%s', '%s', '%s', '%s')",
+		$result = 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'],
@@ -192,9 +187,7 @@ VALUES('%s', '%s', '%s', '%s', '%s', '%s')",
 	}
 	 else
 	{
-		$result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_guest_menu
-(action, title, sort, visible, locked)
-VALUES('%s', '%s', '%s', '%s', '%s')",
+		$result = 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'],
@@ -211,6 +204,5 @@ VALUES('%s', '%s', '%s', '%s', '%s')",
 	LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_NOT_SAVED);
 }
 
-CLOSE_TABLE();
 //
 ?>