X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guestedit.php;h=ebbcad632dbd57472034dcacb561f183f130ab96;hb=2142149f3f72f1a2476f95a87937c044d63bbaf2;hp=d27a0f11c59e4349f39e5db513ee5f2a633c93e2;hpb=0c030e7ade850b0e42a434f4b02ca69fbffd504f;p=mailer.git

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index d27a0f11c5..ebbcad632d 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -32,19 +32,18 @@
  ************************************************************************/
 
 // 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__));
+ADD_DESCR("admin", __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
-$AND = "what = ''"; $SUB = "";
+$AND = "(what = '' OR what IS NULL)"; $SUB = "";
 
-if (!empty($_GET['sub']))
-{
+if (!empty($_GET['sub'])) {
 	$AND = sprintf("action='%s'", SQL_ESCAPE($_GET['sub']));
 	$SUB = SQL_ESCAPE($_GET['sub']);
 }
@@ -242,14 +241,10 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 
 	// Load template
 	LOAD_TEMPLATE("admin_gmenu_status");
-}
- else
-{
-	if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid'])))
-	{
+} else {
+	if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid']))) {
 		// Get IDs
-		if (!empty($_GET['w']))
-		{
+		if (!empty($_GET['w'])) {
 			// Sub menus selected
 			$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_guest_menu WHERE action='%s' AND sort='%s' LIMIT 1",
 			 array($_GET['act'], bigintval($_GET['tid'])), __FILE__, __LINE__);
@@ -259,9 +254,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 			 array($_GET['act'], bigintval($_GET['fid'])), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-		}
-		 else
-		{
+		} else {
 			// Main menu selected
 			$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_guest_menu WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
 			 array(bigintval($_GET['tid'])), __FILE__, __LINE__);
@@ -273,26 +266,22 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 			SQL_FREERESULT($result);
 		}
 
-		if ((!empty($tid)) && (!empty($fid)))
-		{
+		if ((!empty($tid)) && (!empty($fid))) {
 			// Sort menu
 			$result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-			 array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);
+				array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);
 			$result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-			 array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
-		}
-	}
+				array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
+		} // END - if
+	} // END - if
 
 	// By default list menus
-	if (empty($SUB))
-	{
+	if (empty($SUB)) {
 		// List only main menus
 		$query = SQL_QUERY("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_guest_menu WHERE (what='' OR what IS NULL) ORDER BY sort ASC", __FILE__, __LINE__);
-	}
-	 else
-	{
+	} else {
 		// List sub menus
-		$query = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_guest_menu WHERE action='%s' AND what != '' ORDER BY sort ASC",
+		$query = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_guest_menu WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort ASC",
 		 array($SUB), __FILE__, __LINE__);
 	}