X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=f8b06dfb28bc974565f5042e8286be76a08266c5;hp=de04b2d671ef3fb6ff4d376f34f6df33afff93cd;hb=4b7f401f2a4680ae46ca41c57f749cfe35163660;hpb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index de04b2d671..f8b06dfb28 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,19 +47,19 @@ addMenuDescription('admin', __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
 $AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
-if (isGetRequestElementSet('sub')) {
-	$AND = sprintf("`action`='%s' AND `what` IS NOT NULL", getRequestElement('sub'));
-	$SUB = getRequestElement('sub');
+if (isGetRequestParameterSet('sub')) {
+	$AND = sprintf("`action`='%s' AND `what` IS NOT NULL", getRequestParameter('sub'));
+	$SUB = getRequestParameter('sub');
 } // END - if
 
 // List all menu points and make them editable
-if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')l) && (countPostSelection() > 0) && (!isDemoModeActive())) {
 	// Edit menu entries
 	// @TODO Kill all constants in this file
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
 	$cnt = '0'; $SW = 2;
-	foreach (postRequestElement('sel') as $sel => $confirm) {
+	foreach (postRequestParameter('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",
@@ -102,14 +103,14 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM
 
 	// Load template
 	loadTemplate('admin_amenu_edit_form', false, $content);
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isFormSent('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
 	// Prepare misc content
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
 
 	// Del menu entries with or without confirmation
 	$SW = 2; $cnt = '0'; $OUT = '';
-	foreach (postRequestElement('sel') as $sel => $confirm) {
+	foreach (postRequestParameter('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",
@@ -145,9 +146,9 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM
 	loadTemplate('admin_amenu_delete', false, $content);
 } elseif ((isFormSent()) && (!isDemoModeActive())) {
 	// An action is done...
-	switch (postRequestElement('ok')) {
+	switch (postRequestParameter('ok')) {
 		case 'edit': // Edit menu
-			foreach (postRequestElement('sel') as $sel => $menu) {
+			foreach (postRequestParameter('sel') as $sel => $menu) {
 				// Secure id
 				$sel = bigintval($sel);
 
@@ -160,9 +161,9 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM
 WHERE ".$AND." AND `id`=%s LIMIT 1",
 				array(
 				$menu,
-				postRequestElement('sel_action', $sel),
-				postRequestElement('sel_what', $sel),
-				postRequestElement('sel_desc', $sel),
+				postRequestParameter('sel_action', $sel),
+				postRequestParameter('sel_what', $sel),
+				postRequestParameter('sel_desc', $sel),
 				$sel,
 				), __FILE__, __LINE__);
 			}
@@ -172,7 +173,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
 			break;
 
 		case 'del': // Delete menu
-			foreach (postRequestElement('sel') as $sel => $menu) {
+			foreach (postRequestParameter('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__);
 			} // END - foreach
@@ -182,31 +183,31 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
 			break;
 
 		default: // Unexpected action
-			logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
-			loadTemplate('admin_menu_unknown_okay', false, postRequestElement('ok'));
+			logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
+			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
 			break;
 	}
 } else {
-	if ((isGetRequestElementSet(('act'))) && (isGetRequestElementSet(('tid'))) && (isGetRequestElementSet(('fid')))) {
+	if ((isGetRequestParameterSet(('act'))) && (isGetRequestParameterSet(('tid'))) && (isGetRequestParameterSet(('fid')))) {
 		// Get ids
-		if (isGetRequestElementSet(('w'))) {
+		if (isGetRequestParameterSet(('w'))) {
 			// Sub menus selected
 			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-			array(getRequestElement('act'), bigintval(getRequestElement('tid'))), __FILE__, __LINE__);
+			array(getRequestParameter('act'), bigintval(getRequestParameter('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(getRequestElement('act'), bigintval(getRequestElement('fid'))), __FILE__, __LINE__);
+			array(getRequestParameter('act'), bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 		} 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(getRequestElement('tid'))), __FILE__, __LINE__);
+			array(bigintval(getRequestParameter('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(getRequestElement('fid'))), __FILE__, __LINE__);
+			array(bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 		}
@@ -214,9 +215,9 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
 		if ((!empty($tid)) && (!empty($fid))) {
 			// Sort menu
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
-				array(bigintval(getRequestElement('tid')), bigintval($fid)), __FILE__, __LINE__);
+				array(bigintval(getRequestParameter('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(getRequestElement('fid')), bigintval($tid)), __FILE__, __LINE__);
+				array(bigintval(getRequestParameter('fid')), bigintval($tid)), __FILE__, __LINE__);
 		}
 	}