X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guest_add.php;h=d92f15d10c8028b261a22a3b7927e811e4dfc329;hp=f4c75d15abee9ec5d875c6f6e247dec381f0fcac;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hpb=89c00e43d2ce1dd1afe11c2c8485307342805f97

diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php
index f4c75d15ab..d92f15d10c 100644
--- a/inc/modules/admin/what-guest_add.php
+++ b/inc/modules/admin/what-guest_add.php
@@ -41,111 +41,108 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if (((empty($_POST['title'])) || (empty($_POST['menu']))) && (isset($_POST['ok'])))
-{
-	unset($_POST['ok']);
+if (((!REQUEST_ISSET_POST(('title'))) || (!REQUEST_ISSET_POST(('menu')))) && (IS_FORM_SENT())) {
+	// Abort adding the menu entry
+	REQUEST_UNSET_POST('ok');
 }
 
-if (!isset($_POST['ok']))
-{
+if (!IS_FORM_SENT()) {
 	// Create arrays
 	$menus = array(); $titles = array(); $below = array();
 
 	// Get all available main menus
-	$result = SQL_QUERY("SELECT action, title, sort FROM `"._MYSQL_PREFIX."_guest_menu` WHERE (what='' OR what IS NULL) ORDER BY sort", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0)
-	{
+	$result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`", __FILE__, __LINE__);
+	if (SQL_NUMROWS($result) > 0) {
 		// Read menu structure
-		while (list($act, $title, $sort) = SQL_FETCHROW($result))
-		{
+		while ($content = SQL_FETCHARRAY($result)) {
 			// Menu actions
-			$menus[] = $act;
+			$menus[] = $content['action'];
 
 			// Menu titles
-			$titles[] = $title;
+			$titles[] = $content['title'];
 
 			// Below this menu point should the new be added so we simply increase the sort value by 1 :-)
-			$below[] = $sort + 1;
+			$below[] = $content['sort'] + 1;
 		}
 
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Remove double eintries
+		// @TODO This can be somehow rewritten to a function
 		$prev = ""; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
-		foreach ($menus as $key => $value)
-		{
-			if ($value == $prev)
-			{
+		foreach ($menus as $key => $value) {
+			if ($value == $prev) {
 				unset($dmy[$key]);
 				unset($dmy2[$key]);
 				unset($dmy3[$key]);
-			}
-			 else
-			{
+			} else {
 				$prev = $value;
 			}
 		}
-		$menus = $dmy; $titles = $dmy2; $below = $dmy3;
+
+		// Init variables
+		$menus  = $dmy;
+		$titles = $dmy2;
+		$below  = $dmy3;
+
 		// Load sub menus :)
-		foreach ($menus as $key_main => $value_main)
-		{
+		foreach ($menus as $key_main => $value_main) {
 			$result = SQL_QUERY_ESC("SELECT what, title, sort
-FROM "._MYSQL_PREFIX."_guest_menu
-WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
- array(bigintval($value_main)), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) > 0)
-			{
+FROM `{!_MYSQL_PREFIX!}_guest_menu`
+WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
+				array($value_main), __FILE__, __LINE__);
+			if (SQL_NUMROWS($result) > 0) {
 				// Initialize arrays
 				$menus[$value_main] = array();
 				$titles[$value_main] = array();
 				$below[$value_main] = array();
 
 				// Read menu structure
-				while (list($act, $title, $sort) = SQL_FETCHROW($result))
-				{
+				while ($content = SQL_FETCHARRAY($result)) {
 					// Menu actions
-					$menus[$value_main][] = $act;
+					$menus[$value_main][] = $content['action'];
 
 					// Menu titles
-					$titles[$value_main][] = $title;
+					$titles[$value_main][] = $content['title'];
 
 					// Below this menu point should the new be added so we simply increase the sort value by 1 :-)
-					$below[$value_main][] = $sort + 1;
+					$below[$value_main][] = $content['sort'] + 1;
 				}
 
 				// Free memory
 				SQL_FREERESULT($result);
 
 				// Remove double eintries
+				// @TODO This can be somehow rewritten to a function
 				$prev = ""; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];
-				foreach ($menus[$value_main] as $key => $value)
-				{
-					if ($value == $prev)
-					{
+				foreach ($menus[$value_main] as $key => $value) {
+					if ($value == $prev) {
 						unset($dmy[$key]);
 						unset($dmy2[$key]);
 						unset($dmy3[$key]);
-					}
-					 else
-					{
+					} else {
 						$prev = $value;
 					}
 				}
-				$menus[$value_main] = $dmy; $titles[$value_main] = $dmy2; $below[$value_main] = $dmy3;
+
+				// Transfer dummy array
+				$menus[$value_main] = $dmy;
+				$titles[$value_main] = $dmy2;
+				$below[$value_main] = $dmy3;
 			}
 		}
 	}
 
-	$OUT = "    <SELECT class=\"admin_select\" name=\"sort\" size=\"1\">
-      <OPTION value=\"0\">".IS_FIRST_MENU."</OPTION>";
+	$OUT = "    <select class=\"admin_select\" name=\"sort\" size=\"1\">
+      <option value=\"0\">".IS_FIRST_MENU."</option>";
   	foreach ($below as $key => $m)
 	{
 		if (is_array($m))
 		{
 			foreach ($m as $key2 => $m2)
 			{
-				$OUT .= "      <OPTION value=\"".$m2."\">".$titles[$key][$key2];
+				$OUT .= "      <option value=\"".$m2."\">".$titles[$key][$key2];
 				foreach ($menus as $k => $v)
 				{
 					if (($v == $key) && (!is_array($v)))
@@ -153,15 +150,13 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
 						$OUT .= " (".$titles[$k].")";
 					}
 				}
-				$OUT .= "</OPTION>\n";
+				$OUT .= "</option>\n";
 			}
-		}
-		 else
-		{
-			$OUT .= "      <OPTION value=\"".$m."\">".$titles[$key]."</OPTION>\n";
+		} else {
+			$OUT .= "      <option value=\"".$m."\">".$titles[$key]."</option>\n";
 		}
 	}
-	$OUT .= "</SELECT>";
+	$OUT .= "</select>";
 
 	define('__BELOW_SELECTION' , $OUT);
 	define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION("guest", "what", "name"));
@@ -169,39 +164,32 @@ WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort",
 
 	// Display form
 	LOAD_TEMPLATE("admin_guest_add");
-}
- elseif (!IS_DEMO())
-{
+} elseif (!IS_DEMO()) {
 	// Insert new menu entry
-	if (!empty($_POST['menu']))
-	{
-		SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
+	if (REQUEST_ISSET_POST(('menu'))) {
+		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('%s','%s','%s','%s','%s','%s')",
  array(
-	$_POST['menu'],
-	$_POST['name'],
-	$_POST['title'],
-	bigintval($_POST['sort']),
-	$_POST['visible'],
-	$_POST['active'],
+	REQUEST_POST('menu'),
+	REQUEST_POST('name'),
+	REQUEST_POST('title'),
+	bigintval(REQUEST_POST('sort')),
+	REQUEST_POST('visible'),
+	REQUEST_POST('active'),
 ), __FILE__, __LINE__);
-	}
-	 else
-	{
-		SQL_QUERY_ESC("INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
+	} else {
+		SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_guest_menu` (action, title, sort, visible, locked) VALUES ('%s','%s','%s','%s','%s')",
  array(
-	$_POST['name'],
-	$_POST['title'],
-	bigintval($_POST['sort']),
-	$_POST['visible'],
-	$_POST['active'],
+	REQUEST_POST('name'),
+	REQUEST_POST('title'),
+	bigintval(REQUEST_POST('sort')),
+	REQUEST_POST('visible'),
+	REQUEST_POST('active'),
 ), __FILE__, __LINE__);
 	}
-	LOAD_TEMPLATE("admin_settings_saved", false, SAVING_DONE);
-}
- else
-{
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
+} else {
 	// Demo mode!
-	LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_NOT_SAVED);
+	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));
 }
 
 //