X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guestedit.php;h=4bfdc91a1d4fa1823faeac529cee9b8772907504;hb=8ce32e702f3caa76b8d446902948e83e1e6854c8;hp=3e92946f101d4e26e48b6a9ac5bcf5afd24652c4;hpb=af7e2ca186ae88d343f90bcb753645ab4847f227;p=mailer.git

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 3e92946f10..4bfdc91a1d 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -46,9 +46,9 @@ addYouAreHereLink('admin', __FILE__);
 // Do we edit/delete/change main menus or sub menus?
 $AND = "(`what` = '' OR `what` IS NULL)"; $subMenu = '';
 
-if (isGetRequestParameterSet('sub')) {
-	$AND = sprintf("`action`='%s' AND `what` IS NOT NULL", getRequestParameter('sub'));
-	$subMenu = getRequestParameter('sub');
+if (isGetRequestElementSet('sub')) {
+	$AND = sprintf("`action`='%s' AND `what` IS NOT NULL", getRequestElement('sub'));
+	$subMenu = getRequestElement('sub');
 } // END - if
 
 // List all menu points and make them editable
@@ -58,10 +58,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 	$content['chk'] = countPostSelection();
 
 	$count = '0'; $OUT = '';
-	foreach (postRequestParameter('sel') as $sel => $confirm) {
+	foreach (postRequestElement('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
 			$count++;
-			$result = 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($result) == 1) {
 				// Entry found so we load the stuff...
@@ -74,6 +74,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 					'action' => adminAddMenuSelectionBox('guest', 'action', 'sel_action[' . $sel . ']', $content['action']),
 					'what'   => adminAddMenuSelectionBox('guest', 'what'  , 'sel_what['   . $sel . ']', $content['what']),
 					'menu'   => $content['title'],
+					'sub'    => $subMenu
 				);
 
 				// Load row template
@@ -91,7 +92,9 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 		} // END - if
 	} // END - foreach
 
-	$content['rows'] = $OUT;
+	$content['rows']  = $OUT;
+	$content['chk']   = countPostSelection();
+	$content['sub']   = $subMenu;
 	$content['count'] = $count;
 
 	// Load template
@@ -104,7 +107,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 	$count = '0';
 	$OUT = '';
 
-	foreach (postRequestParameter('sel') as $sel => $confirm) {
+	foreach (postRequestElement('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
 			$count++;
 			$result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
@@ -128,22 +131,25 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 			SQL_FREERESULT($result);
 		} // END - if
 	} // END - foreach
-	$content['rows'] = $OUT;
+
+	$content['rows']  = $OUT;
+	$content['chk']   = countPostSelection();
+	$content['sub']   = $subMenu;
 	$content['count'] = $count;
 
 	// Load template
 	loadTemplate('admin_delete_guest_menu', false, $content);
-} elseif ((isPostRequestParameterSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
+} elseif ((isPostRequestElementSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Change status (visible / locked)
 	$content['sub'] = $subMenu;
 	$content['chk'] = countPostSelection();
 
 	// Load template
 	$count = '0'; $OUT = '';
-	foreach (postRequestParameter('sel') as $sel => $confirm) {
+	foreach (postRequestElement('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
 			$count++;
-			$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) {
 				// Entry found so we load the stuff...
@@ -169,8 +175,11 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 			SQL_FREERESULT($result);
 		} // END - if
 	} // END - foreach
+
+	$content['rows']  = $OUT;
+	$content['chk']   = countPostSelection();
+	$content['sub']   = $subMenu;
 	$content['count'] = $count;
-	$content['rows'] = $OUT;
 
 	// Load template
 	loadTemplate('admin_guest_menu_status', false, $content);
@@ -184,24 +193,24 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 	// By default list menus
 	if (empty($subMenu)) {
 		// List only main menus
-		$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__);
+		$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
-		$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",
+		$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($subMenu), __FILE__, __LINE__);
 	}
 
 	// Do we have entries?
 	if (!SQL_HASZERONUMS($result)) {
-		// Set sub value
-		$content['sub'] = $subMenu;
-
 		// Init variables
 		$count = '0';
 		$OUT = '';
 
 		// Process all menu entries
 		while ($content = SQL_FETCHARRAY($result)) {
+			// Set sub value
+			$content['sub'] = $subMenu;
+
 			$count++;
 			if (($content['sort'] == '0') || (($content['sort'] == 1) && (!empty($subMenu)))) {
 				// Is highest position
@@ -221,15 +230,16 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 				'what'   => $content['what'],
 				'title'  => $content['title'],
 				'navi'   => $NAVI,
-				'mode'   => 'guest'
+				'do'     => 'guest'
 			);
 
 			// Load row template
 			$OUT .= loadTemplate('admin_menu_overview_row', true, $content);
 		} // END - while
 
-		// Add rows
+		// Add rows/sub
 		$content['rows'] = $OUT;
+		$content['sub']  = $subMenu;
 
 		// Free memory
 		SQL_FREERESULT($result);