X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-memedit.php;h=fb80b42047b90a0411285c1d40192394449e2853;hb=d016e24dd4686f613a17733b96bc28fac936a4ac;hp=e560bf92e4c7187db4b990491e2d9df639b156ba;hpb=89c00e43d2ce1dd1afe11c2c8485307342805f97;p=mailer.git

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index e560bf92e4..fb80b42047 100644
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -41,10 +41,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
-$AND = "(what = '' OR what IS NULL)"; $SUB = "";
+$AND = "(`what` = '' OR `what` IS NULL)"; $SUB = "";
 
 if (!empty($_GET['sub'])) {
-	$AND = sprintf("action='%s' AND what IS NOT NULL", SQL_ESCAPE($_GET['sub']));
+	$AND = sprintf("action='%s' AND `what` IS NOT NULL", SQL_ESCAPE($_GET['sub']));
 	$SUB = SQL_ESCAPE($_GET['sub']);
 }
 
@@ -53,21 +53,17 @@ $chk = 0;
 if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
 
 // List all menu points and make them editable
-if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
-{
+if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
 	// Edit menu entries
 	define('__SUB_VALUE', $SUB);
 	define('__CHK_VALUE', $chk);
 	$SW = 2; $cnt = 0; $OUT = "";
-	foreach ($_POST['sel'] as $sel => $confirm)
-	{
-		if ($confirm == 1)
-		{
+	foreach ($_POST['sel'] as $sel => $confirm) {
+		if ($confirm == 1) {
 			$cnt++;
-			$result = SQL_QUERY_ESC("SELECT title, action, what FROM `"._MYSQL_PREFIX."_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-			 array(bigintval($sel)), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 1)
-			{
+			$result = SQL_QUERY_ESC("SELECT title, action, what FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+				array(bigintval($sel)), __FILE__, __LINE__);
+			if (SQL_NUMROWS($result) == 1) {
 				// Entry found so we load the stuff...
 				list($menu, $act, $wht, $descr) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
@@ -81,9 +77,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 				);
 				// Load template
 				$OUT .= LOAD_TEMPLATE("admin_mmenu_edit_row", true, $content);
-			}
-			 else
-			{
+			} else {
 				// Entry not found?
 				$content = array(
 					'sw'  => $SW,
@@ -99,19 +93,15 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 
 	// Load template
 	LOAD_TEMPLATE("admin_mmenu_edit");
-}
- elseif ((isset($_POST['del'])) && ($chk > 0) && (!IS_DEMO()))
-{
+} elseif ((isset($_POST['del'])) && ($chk > 0) && (!IS_DEMO())) {
 	// Del menu entries with or without confirmation
 	define('__SUB_VALUE', $SUB);
 	define('__CHK_VALUE', $chk);
 	$SW = 2; $cnt = 0; $OUT = "";
-	foreach ($_POST['sel'] as $sel => $confirm)
-	{
-		if ($confirm == 1)
-		{
+	foreach ($_POST['sel'] as $sel => $confirm) {
+		if ($confirm == 1) {
 			$cnt++;
-			$result = SQL_QUERY_ESC("SELECT title FROM `"._MYSQL_PREFIX."_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
 			 array(bigintval($sel)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1)
 			{
@@ -141,22 +131,17 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 
 	// Load template
 	LOAD_TEMPLATE("admin_mmenu_delete");
-}
- elseif ((isset($_POST['status'])) && ($chk > 0) && (!IS_DEMO()))
-{
+} elseif ((isset($_POST['status'])) && ($chk > 0) && (!IS_DEMO())) {
 	// Change status (visible / locked)
 	define('__SUB_VALUE', $SUB);
 	define('__CHK_VALUE', $chk);
 	$SW = 2; $cnt = 0; $OUT = "";
-	foreach ($_POST['sel'] as $sel => $confirm)
-	{
-		if ($confirm == 1)
-		{
+	foreach ($_POST['sel'] as $sel => $confirm) {
+		if ($confirm == 1) {
 			$cnt++;
-			$result = SQL_QUERY_ESC("SELECT title, visible, locked FROM `"._MYSQL_PREFIX."_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-			 array(bigintval($sel)), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 1)
-			{
+			$result = SQL_QUERY_ESC("SELECT title, visible, locked FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+				array(bigintval($sel)), __FILE__, __LINE__);
+			if (SQL_NUMROWS($result) == 1) {
 				// Entry found so we load the stuff...
 				list($menu, $vis, $locked) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
@@ -188,29 +173,26 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 	define('__CNT_VALUE', $cnt);
 	//
 	LOAD_TEMPLATE("admin_mmenu_status");
-}
- elseif ((isset($_POST['ok'])) && (!IS_DEMO()))
-{
+} elseif ((isset($_POST['ok'])) && (!IS_DEMO())) {
 	// An act is done...
-	foreach ($_POST['sel'] as $sel => $menu)
-	{
-		$AND = "(what = '' OR what IS NULL)";
+	foreach ($_POST['sel'] as $sel => $menu) {
+		$AND = "(`what` = '' OR `what` IS NULL)";
 		$sel = bigintval($sel);
 		if (!empty($SUB)) $AND = "action='".$SUB."'";
 		switch ($_POST['ok'])
 		{
 		case "edit": // Edit menu
-			SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_member_menu` SET title='%s', action='%s', what='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
 				array($menu, $_POST['sel_act'][$sel], $_POST['sel_what'][$sel], $sel), __FILE__, __LINE__);
 			break;
 
 		case "del": // Delete menu
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
 				array($sel), __FILE__, __LINE__);
 			break;
 
 		case "status": // Change status of menus
-			SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_member_menu` SET visible='%s', locked='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
 				array($_POST['visible'][$sel], $_POST['locked'][$sel], $sel), __FILE__, __LINE__);
 			break;
 		}
@@ -218,7 +200,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 	}
 
 	// Load template
-	LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
 } else {
 	if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid']))) {
 		// Init
@@ -227,71 +209,64 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 		// Get IDs
 		if (!empty($_GET['w'])) {
 			// Sub menus selected
-			$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_member_menu` WHERE action='%s' AND sort='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
 			 array(bigintval($_GET['act']), bigintval($_GET['tid'])), __FILE__, __LINE__);
 			list($tid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-			$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_member_menu` WHERE action='%s' AND sort='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
 			 array(bigintval($_GET['act']), bigintval($_GET['fid'])), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 		} else {
 			// Main menu selected
-			$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_member_menu` WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
 			 array(bigintval($_GET['tid'])), __FILE__, __LINE__);
 			list($tid) = SQL_FETCHROW($result);
-			$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_member_menu` WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
 			 array(bigintval($_GET['fid'])), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 		}
 
 		if ((!empty($tid)) && (!empty($fid))) {
 			// Sort menu
-			SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_member_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_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."_member_menu` SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
 				array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
 		} // END - -fi
 	}
 
-	if (!empty($SUB))
-	{
+	if (!empty($SUB)) {
 		// Edit sub menus
-		$result = SQL_QUERY("SELECT id, action, what, title, sort FROM `"._MYSQL_PREFIX."_member_menu` WHERE ".$AND." AND what != '' AND what IS NOT NULL ORDER BY sort ASC", __FILE__, __LINE__);
-	}
-	 else
-	{
+		$result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC", __FILE__, __LINE__);
+	} else {
 		// Edit main menus
-		$result = SQL_QUERY("SELECT id, action, what, title, sort FROM `"._MYSQL_PREFIX."_member_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!}_member_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
 	}
+
 	$max = SQL_NUMROWS($result);
-	if ($max > 0)
-	{
+	if ($max > 0) {
 		// Set sub value
 		define('__SUB_VALUE', $SUB);
 
 		$SW = 2; $cnt = 0; $OUT = "";
-		while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($result))
-		{
+		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=memedit&amp;sub=".$SUB."&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=memedit&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=memedit&amp;sub=".$SUB."&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=memedit&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=memedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>/<A href=\"".URL."/modules.php?module=admin&amp;what=memedit&amp;sub=".$SUB."&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=memedit&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=memedit&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($wht))   $wht   = "&nbsp;";
 			if (empty($title)) $title = "&nbsp;";
+
 			$content = array(
 				'sw'     => $SW,
 				'id'     => $id,
@@ -309,11 +284,9 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 		SQL_FREERESULT($result);
 		define('__MENU_ROWS', $OUT);
 		LOAD_TEMPLATE("admin_mmenu_overview");
-	}
-	 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'));
 	}
 }