X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=bda8f3adac3164845cbdf5f985cb11fa579fc493;hp=9416731ffdaa1fd3efb591fe549e57a99d38a5f2;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hpb=6c763653e88b9d10627e651ca59c7201d4b7d62b

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 9416731ffd..bda8f3adac 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -41,29 +41,29 @@ 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 = "";
-if (!empty($_GET['sub']))
+$AND = "(`what` = '' OR `what` IS NULL)"; $SUB = "";
+if (REQUEST_ISSET_GET(('sub')))
 {
-	$AND = sprintf("action='%s' AND what IS NOT NULL", SQL_ESCAPE($_GET['sub']));
-	$SUB = SQL_ESCAPE($_GET['sub']);
+	$AND = sprintf("action='%s' AND `what` IS NOT NULL", REQUEST_GET(('sub')));
+	$SUB = REQUEST_GET(('sub'));
 }
 
 // Get count of (maybe) selected menu points
 $chk = 0;
-if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
+if (REQUEST_ISSET_POST('sel')) $chk = SELECTION_COUNT(REQUEST_POST('sel'));
 
 // List all menu points and make them editable
-if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
+if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
 	// Edit menu entries
 	define('__SUB_VALUE', $SUB);
 	define('__CHK_VALUE', $chk);
 	$cnt = 0; $SW = 2;
-	foreach ($_POST['sel'] as $sel => $confirm)
+	foreach (REQUEST_POST('sel') as $sel => $confirm)
 	{
 		if ($confirm == 1)
 		{
 			$cnt++;
-			$result = SQL_QUERY_ESC("SELECT title, action, what, descr FROM `"._MYSQL_PREFIX."_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT title, action, what, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
 			 array(bigintval($sel)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1)
 			{
@@ -101,18 +101,18 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
 	// Load template
 	LOAD_TEMPLATE("admin_amenu_edit_form");
 }
- elseif ((isset($_POST['del'])) && (!IS_DEMO()))
+ elseif ((REQUEST_ISSET_POST('del')) && (!IS_DEMO()))
 {
 	define('__SUB_VALUE', $SUB);
 	define('__CHK_VALUE', $chk);
 	// Del menu entries with or without confirmation
 	$SW = 2; $cnt = 0; $OUT = "";
-	foreach ($_POST['sel'] as $sel => $confirm)
+	foreach (REQUEST_POST('sel') as $sel => $confirm)
 	{
 		if ($confirm == 1)
 		{
 			$cnt++;
-			$result = SQL_QUERY_ESC("SELECT title FROM `"._MYSQL_PREFIX."_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
 			 array(bigintval($sel)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1)
 			{
@@ -146,17 +146,17 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
 
 	// Load template
 	LOAD_TEMPLATE("admin_amenu_delete");
-} elseif ((isset($_POST['ok'])) && (!IS_DEMO())) {
+} elseif ((IS_FORM_SENT()) && (!IS_DEMO())) {
 	// An action is done...
-	switch ($_POST['ok'])
+	switch (REQUEST_POST('ok'))
 	{
 	case "edit": // Edit menu
-		foreach ($_POST['sel'] as $sel => $menu) {
+		foreach (REQUEST_POST('sel') as $sel => $menu) {
 			// Secure ID
 			$sel = bigintval($sel);
 
 			// Update entry
-			$result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_admin_menu` SET
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET
 title='%s',
 action='%s',
 what='%s',
@@ -164,139 +164,133 @@ descr='%s'
 WHERE ".$AND." AND id=%s LIMIT 1",
  array(
 	$menu,
-	$_POST['sel_action'][$sel],
-	$_POST['sel_what'][$sel],
-	$_POST['sel_desc'][$sel],
+	REQUEST_POST('sel_action', $sel),
+	REQUEST_POST('sel_what', $sel),
+	REQUEST_POST('sel_desc', $sel),
 	$sel,
 ), __FILE__, __LINE__);
 		}
 
 		// Purge admin menu cache
-		CACHE_PURGE_ADMIN_MENU(0, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel]);
+		CACHE_PURGE_ADMIN_MENU(0, REQUEST_POST('sel_action', $sel), REQUEST_POST('sel_what', $sel));
 
 		// Load template
-		LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
 		break;
 
 	case "del": // Delete menu
-		foreach ($_POST['sel'] as $sel => $menu) {
-			$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-			 array(bigintval($sel)), __FILE__, __LINE__);
+		foreach (REQUEST_POST('sel') as $sel => $menu) {
+			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+				array(bigintval($sel)), __FILE__, __LINE__);
 			CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
 		} // END - foreach
 
 		// Load template
-		LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
 		break;
 
 	default: // Unexpected action
-		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", $_POST['ok']));
-		define('__OK_VALUE', $_POST['ok']);
+		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", REQUEST_POST('ok')));
+		define('__OK_VALUE', REQUEST_POST('ok'));
 		LOAD_TEMPLATE("admin_menu_unknown_okay");
 		break;
 	}
 } else {
-	if ((!empty($_GET['act'])) && (!empty($_GET['tid'])) && (!empty($_GET['fid']))) {
+	if ((REQUEST_ISSET_GET(('act'))) && (REQUEST_ISSET_GET(('tid'))) && (REQUEST_ISSET_GET(('fid')))) {
 		// Get IDs
-		if (!empty($_GET['w'])) {
+		if (REQUEST_ISSET_GET(('w'))) {
 			// Sub menus selected
-			$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_admin_menu` WHERE action='%s' AND sort='%s' LIMIT 1",
-			 array($_GET['act'], bigintval($_GET['tid'])), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+				array(REQUEST_GET('act'), bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
 			list($tid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-			$result = SQL_QUERY("SELECT id FROM `"._MYSQL_PREFIX."_admin_menu` WHERE action='%s' AND sort='%s' LIMIT 1",
-			 array($_GET['act'], bigintval($_GET['fid'])), __FILE__, __LINE__);
+			$result = SQL_QUERY("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+				array(REQUEST_GET('act'), bigintval(REQUEST_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."_admin_menu` WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
-			 array(bigintval($_GET['tid'])), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+				array(bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
 			list($tid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-			$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_admin_menu` WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
-			 array(bigintval($_GET['fid'])), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+				array(bigintval(REQUEST_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."_admin_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."_admin_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!}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+				array(bigintval(REQUEST_GET('tid')), bigintval($fid)), __FILE__, __LINE__);
+			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+				array(bigintval(REQUEST_GET('fid')), bigintval($tid)), __FILE__, __LINE__);
 			CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
 		}
 	}
 
 	// By default list menus
-	if (!empty($SUB))
-	{
+	if (!empty($SUB)) {
 		// Sub menus of a main menu
-		$result = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM `"._MYSQL_PREFIX."_admin_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!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
 		 array($SUB), __FILE__, __LINE__);
-	}
-	 else
-	{
+	} else {
 		// Main menus
-		$result = SQL_QUERY("SELECT id, action, what, title, sort FROM `"._MYSQL_PREFIX."_admin_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!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
 	}
+
 	$max = SQL_NUMROWS($result);
-	if ($max > 0)
-	{
+	if ($max > 0) {
+		// @TODO Rewrite this constant
 		define('__SUB_VALUE', $SUB);
-		$SW = 2; $cnt = 0; $OUT = "";
-		while (list($id, $act, $wht, $title, $sort) = SQL_FETCHROW($result))
-		{
+
+		// Init variables
+		$OUT = ""; $SW  = 2; $cnt = 0;
+
+		// Process all entries
+		while ($content = SQL_FETCHARRAY($result)) {
+			// Count this entry
 			$cnt++;
-			if (($sort == 0) || (($sort == 1) && (!empty($SUB))))
-			{
+
+			// Init navigation variable
+			$content['navi'] = "";
+			if (($content['sort'] == 0) || (($content['sort'] == 1) && (!empty($SUB)))) {
 				// Is highest position
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
-			}
-			 elseif ($cnt == $max)
-			{
+				$content['navi'] = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub={!__SUB_VALUE!}&amp;act=".$content['action']."&amp;w=".$content['what']."&amp;tid=".($content['sort']+1)."&amp;fid=".$content['sort']."\">{--LOWER--}</a>";
+			} elseif ($cnt == $max) {
 				// Is lowest position
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort-1)."&amp;fid=".$sort."\">".HIGHER."</A>";
-			}
-			 elseif ($sort > 0)
-			{
+				$content['navi'] = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub={!__SUB_VALUE!}&amp;act=".$content['action']."&amp;w=".$content['what']."&amp;tid=".($content['sort']-1)."&amp;fid=".$content['sort']."\">{--HIGHER--}</a>";
+			} elseif ($content['sort'] > 0) {
 				// Anything else between highest and lowest
-				$NAVI = "<A href=\"".URL."/modules.php?module=admin&amp;what=adminedit&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=adminedit&amp;sub=".$SUB."&amp;act=".$act."&amp;w=".$wht."&amp;tid=".($sort+1)."&amp;fid=".$sort."\">".LOWER."</A>";
+				$content['navi'] = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub={!__SUB_VALUE!}&amp;act=".$content['action']."&amp;w=".$content['what']."&amp;tid=".($content['sort']-1)."&amp;fid=".$content['sort']."\">{--HIGHER--}</a>/<a href=\"{!URL!}/modules.php?module=admin&amp;what=adminedit&amp;sub={!__SUB_VALUE!}&amp;act=".$content['action']."&amp;w=".$content['what']."&amp;tid=".($content['sort']+1)."&amp;fid=".$content['sort']."\">{--LOWER--}</a>";
 			}
 
-			if (empty($act)) $act = "&nbsp;";
-			if (empty($wht))   $wht   = "&nbsp;";
-			if (empty($title))  $title  = "&nbsp;";
+			// Fix empty elements for constant (fixes display bugs in Firefox)
+			if (empty($content['action'])) $content['action'] = "&nbsp;";
+			if (empty($content['what']))   $content['what']   = "&nbsp;";
+			if (empty($content['title']))  $content['title']  = "&nbsp;";
 
-			$content = array(
-				'sw'     => $SW,
-				'id'     => $id,
-				'action' => $act,
-				'what'   => $wht,
-				'title'  => $title,
-				'navi'   => $NAVI,
-				'mode'   => "admin",
-			);
+			// Add more data to $content
+			$content['sw']   = $SW;
+			$content['mode'] = "admin";
+
+			// Load row template and switch colors
 			$OUT .= LOAD_TEMPLATE("admin_menu_overview_row", true, $content);
 			$SW = 3 - $SW;
-		}
+		} // END - switch
 
 		// Free memory
 		SQL_FREERESULT($result);
+
+		// Rewrite this constant
 		define('__MENU_ROWS', $OUT);
 
 		// Load template
 		LOAD_TEMPLATE("admin_amenu_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'));
 	}
 }