X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guestedit.php;h=cf7ed37a8325b8754ebe4b9a236d3ddcd7dd730a;hp=ebbcad632dbd57472034dcacb561f183f130ab96;hb=056162fe45aa0d850bb22870e1caf9595a847a9b;hpb=7eb9da85bfb337997a58a244cb610c97a8d10c13

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index ebbcad632d..cf7ed37a83 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -44,9 +44,9 @@ ADD_DESCR("admin", __FILE__);
 $AND = "(what = '' OR what IS NULL)"; $SUB = "";
 
 if (!empty($_GET['sub'])) {
-	$AND = sprintf("action='%s'", SQL_ESCAPE($_GET['sub']));
+	$AND = sprintf("action='%s' AND what IS NOT NULL", SQL_ESCAPE($_GET['sub']));
 	$SUB = SQL_ESCAPE($_GET['sub']);
-}
+} // END - if
 
 // Get count of (maybe) selected menu points
 $chk = 0;
@@ -65,12 +65,12 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 		if ($confirm == 1)
 		{
 			$cnt++;
-			$query = SQL_QUERY_ESC("SELECT title, action, what FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT title, action, what FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s LIMIT 1",
 			 array(bigintval($sel)), __FILE__, __LINE__);
-			if (SQL_NUMROWS($query) == 1)
+			if (SQL_NUMROWS($result) == 1)
 			{
 				// Entry found so we load the stuff...
-				list($menu, $act, $wht) = SQL_FETCHROW($query);
+				list($menu, $act, $wht) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
 				$DATA = array(
 					'cnt'    => $cnt,
@@ -112,12 +112,12 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 		if ($confirm == 1)
 		{
 			$cnt++;
-			$query = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s LIMIT 1",
 			 array(bigintval($sel)), __FILE__, __LINE__);
-			if (SQL_NUMROWS($query) == 1)
+			if (SQL_NUMROWS($result) == 1)
 			{
 				// Entry found so we load the stuff...
-				list($menu) = SQL_FETCHROW($query);
+				list($menu) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
 				$DATA = array(
 					'cnt'  => $cnt,
@@ -157,7 +157,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 			$sel = bigintval($sel);
 
 			// Update entry
-			$query = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET title='%s', action='%s', what='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET title='%s', action='%s', what='%s' WHERE ".$AND." AND id=%s LIMIT 1",
 			 array($menu, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel], $sel),__FILE__, __LINE__);
 		}
 		LOAD_TEMPLATE("admin_data_saved");
@@ -167,7 +167,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 		foreach ($_POST['sel'] as $sel => $menu)
 		{
 			// Delete enty
-			$query = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s LIMIT 1",
 			 array(bigintval($sel)), __FILE__, __LINE__);
 		}
 		LOAD_TEMPLATE("admin_data_saved");
@@ -278,31 +278,22 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 	// By default list menus
 	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__);
+		$result = 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 {
 		// List sub menus
-		$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",
+		$result = 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__);
 	}
 
 	// Get number of menu entries
-	$max = SQL_NUMROWS($query);
+	$max = SQL_NUMROWS($result);
 	if ($max > 0)
 	{
-		// Some entties does exist!
-		if (!empty($SUB))
-		{
-			// Set sub value
-			define('__SUB_VALUE', $SUB);
-		}
-		 else
-		{
-			// No sub menu selected
-			define('__SUB_VALUE', "");
-		}
+		// Set sub value
+		define('__SUB_VALUE', $SUB);
 
 		$SW = 2; $cnt = 0; $OUT = "";
-		while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($query))
+		while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($result))
 		{
 			$cnt++;
 			if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
@@ -337,7 +328,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 		}
 
 		// Free memory
-		SQL_FREERESULT($query);
+		SQL_FREERESULT($result);
 		define('__MENU_ROWS', $OUT);
 
 		// Load template