X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guestedit.php;h=3f67c4ca9c2612ccf4403e7d662bf9fdf7cb7718;hb=d016e24dd4686f613a17733b96bc28fac936a4ac;hp=60241a0712e1b7671bdf797ab847052633e99fcd;hpb=89edd713e330fd16e8da1edeadfd5046296ff0d2;p=mailer.git

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 60241a0712..3f67c4ca9c 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -32,22 +32,21 @@
  ************************************************************************/
 
 // 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']))
-{
-	$AND = sprintf("action='%s'", SQL_ESCAPE($_GET['sub']));
+if (!empty($_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;
@@ -66,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,
@@ -113,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,
@@ -158,20 +157,20 @@ 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",
-			 array($menu, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel], $sel),__FILE__, __LINE__);
+			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");
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
 		break;
 
 	case "del": // Delete 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=%s LIMIT 1",
-			 array(bigintval($sel)), __FILE__, __LINE__);
+			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");
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
 		break;
 
 	case "status": // Change access levels
@@ -181,14 +180,15 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 			$sel = bigintval($sel);
 
 			// Update entry
-			$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__);
+			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");
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
 		break;
 
 	default: // Unexpected action
 		define('__OK_VALUE', $_POST['ok']);
+		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", $_POST['ok']));
 		LOAD_TEMPLATE("admin_menu_unknown_okay");
 		break;
 	}
@@ -206,7 +206,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 		if ($confirm == 1)
 		{
 			$cnt++;
-			$result = SQL_QUERY_ESC("SELECT title, visible, locked FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s 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)
 			{
@@ -242,98 +242,77 @@ 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",
+			$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__);
 			list($tid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-			$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_guest_menu WHERE action='%s' AND sort='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
 			 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",
+			$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='' OR what IS NULL) 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=%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__);
-		}
-	}
+			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__);
+			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='' OR what IS NULL) ORDER BY sort ASC", __FILE__, __LINE__);
-	}
-	 else
-	{
+		$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);
-	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', "");
-		}
+	$max = SQL_NUMROWS($result);
+	if ($max > 0) {
+		// Set sub value
+		define('__SUB_VALUE', $SUB);
 
-		$SW = 2; $cnt = 0; $OUT = "";
-		while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($query))
-		{
+		// Init variables
+		$SW = 2;
+		$cnt = 0;
+		$OUT = "";
+
+		while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($result)) {
 			$cnt++;
-			if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
-			{
+			if (($sort == 0) || (($sort == 1) && (!empty($SUB)))) {
 				// Is highest position
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
-			}
-			 elseif ($cnt == $max)
-			{
+				$NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub={!__SUB_VALUE!}&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">{--LOWER--}</a>";
+			} elseif ($cnt == $max) {
 				// Is lowest position
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>";
-			}
-			 elseif ($sort > 0)
-			{
+				$NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub={!__SUB_VALUE!}&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">{--HIGHER--}</a>";
+			} elseif ($sort > 0) {
 				// Anything else between highest and lowest
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>/<A href=\"".URL."/modules.php?module=admin&amp;what=guestedit&amp;sub=".__SUB_VALUE."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
+				$NAVI = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub={!__SUB_VALUE!}&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">{--HIGHER--}</a>/<a href=\"{!URL!}/modules.php?module=admin&amp;what=guestedit&amp;sub={!__SUB_VALUE!}&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">{--LOWER--}</a>";
 			}
-			if (empty($act)) $act = "&nbsp;";
+
+			if (empty($act))   $act   = "&nbsp;";
 			if (empty($wht))   $wht   = "&nbsp;";
-			if (empty($title))  $title  = "&nbsp;";
+			if (empty($title)) $title = "&nbsp;";
 			$content = array(
 				'sw'     => $SW,
 				'id'     => $id,
@@ -348,16 +327,14 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 		}
 
 		// Free memory
-		SQL_FREERESULT($query);
+		SQL_FREERESULT($result);
 		define('__MENU_ROWS', $OUT);
 
 		// Load template
 		LOAD_TEMPLATE("admin_gmenu_edit");
-	}
-	 else
-	{
+	} else {
 		// Menu entries are missing... (???)
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NO_MENUS_FOUND'));
 	}
 }