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

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index a6565aead7..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']);
 }
@@ -53,10 +52,7 @@ if (!empty($_GET['sub']))
 $chk = 0;
 if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
 
-OPEN_TABLE("100%", "admin_content admin_content_align", "");
 // List all menu points and make them editable
-OUTPUT_HTML("<br /><br /></FONT>
-<DIV align=\"center\">");
 if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 {
 	// Edit menu entries
@@ -64,12 +60,12 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 	define('__CHK_VALUE', $chk);
 
 	$cnt = 0; $SW = 2; $OUT = "";
-	foreach ($_POST['sel'] as $sel=>$confirm)
+	foreach ($_POST['sel'] as $sel => $confirm)
 	{
 		if ($confirm == 1)
 		{
 			$cnt++;
-			$query = SQL_QUERY_ESC("SELECT title, action, what FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%d LIMIT 1",
+			$query = 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)
 			{
@@ -111,12 +107,12 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 	define('__CHK_VALUE', $chk);
 
 	$cnt = 0; $OUT = ""; $SW = 2;
-	foreach ($_POST['sel'] as $sel=>$confirm)
+	foreach ($_POST['sel'] as $sel => $confirm)
 	{
 		if ($confirm == 1)
 		{
 			$cnt++;
-			$query = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%d LIMIT 1",
+			$query = 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)
 			{
@@ -155,36 +151,36 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 	switch ($_POST['ok'])
 	{
 	case "edit": // Edit menu
-		foreach ($_POST['sel'] as $sel=>$menu)
+		foreach ($_POST['sel'] as $sel => $menu)
 		{
 			// Secure selector
 			$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=%d LIMIT 1",
+			$query = 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");
 		break;
 
 	case "del": // Delete menu
-		foreach ($_POST['sel'] as $sel=>$menu)
+		foreach ($_POST['sel'] as $sel => $menu)
 		{
 			// Delete enty
-			$query = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%d LIMIT 1",
+			$query = 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");
 		break;
 
 	case "status": // Change access levels
-		foreach ($_POST['sel'] as $sel=>$menu)
+		foreach ($_POST['sel'] as $sel => $menu)
 		{
 			// Secure selector
 			$sel = bigintval($sel);
 
 			// Update entry
-			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET visible='%s', locked='%s' WHERE ".$AND." AND id=%d LIMIT 1",
+			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_guest_menu SET visible='%s', locked='%s' WHERE ".$AND." AND id=%s LIMIT 1",
 			 array($_POST['visible'][$sel], $_POST['locked'][$sel], $sel), __FILE__, __LINE__);
 		}
 		LOAD_TEMPLATE("admin_data_saved");
@@ -204,12 +200,12 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 
 	// Load template
 	$SW = 2; $cnt = 0; $OUT = "";
-	foreach ($_POST['sel'] as $sel=>$confirm)
+	foreach ($_POST['sel'] as $sel => $confirm)
 	{
 		if ($confirm == 1)
 		{
 			$cnt++;
-			$result = SQL_QUERY_ESC("SELECT title, visible, locked FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%d LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT title, visible, locked FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s LIMIT 1",
 			 array(bigintval($sel)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1)
 			{
@@ -245,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__);
@@ -262,40 +254,34 @@ 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='' AND sort='%s' LIMIT 1",
+			$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__);
 			list($tid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-			$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_guest_menu WHERE what='' AND sort='%s' LIMIT 1",
+			$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['fid'])), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 			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=%d LIMIT 1",
-			 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=%d LIMIT 1",
-			 array(bigintval($_GET['fid']), bigintval($tid)), __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['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__);
+		} // 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='' ORDER BY sort ASC", __FILE__, __LINE__);
-	}
-	 else
-	{
+		$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 {
 		// 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__);
 	}
 
@@ -363,7 +349,6 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
 	}
 }
-OUTPUT_HTML("</DIV>");
-CLOSE_TABLE();
+
 //
 ?>