X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=d41753b54a28f9dd80acb36d904f4ea646f98267;hb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;hp=cf97dffe96d73f7041fb640dd5287ef580748fdf;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;p=mailer.git

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index cf97dffe96..d41753b54a 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/05/2003 *
- * ===============                              Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/05/2003 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : 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,23 +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
 
-// Get count of (maybe) selected menu points
-$chk = '0';
-if (isPostRequestElementSet('sel')) $chk = countPostSelection();
-
 // List all menu points and make them editable
-if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')l) && (countPostSelection() > 0) && (!isDemoModeActive())) {
 	// Edit menu entries
 	// @TODO Kill all constants in this file
 	$content['sub'] = $SUB;
-	$content['chk'] = $chk;
+	$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",
@@ -106,14 +103,14 @@ if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) {
 
 	// Load template
 	loadTemplate('admin_amenu_edit_form', false, $content);
-} elseif ((isPostRequestElementSet('del')) && (!isDemoModeActive())) {
+} elseif ((isFormSent('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
 	// Prepare misc content
 	$content['sub'] = $SUB;
-	$content['chk'] = $chk;
+	$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",
@@ -149,9 +146,9 @@ if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) {
 	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);
 
@@ -161,66 +158,66 @@ if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) {
 `action`='%s',
 `what`='%s',
 `descr`='%s'
-WHERE ".$AND." AND id=%s LIMIT 1",
+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__);
 			}
 
 			// Load template
-			loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+			loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 			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
 
 			// Load template
-			loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+			loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 			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);
 		}
 
 		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__);
-			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__);
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+				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(getRequestParameter('fid')), bigintval($tid)), __FILE__, __LINE__);
 		}
 	}
 
@@ -251,13 +248,13 @@ WHERE ".$AND." AND id=%s LIMIT 1",
 			$data['navi'] = '';
 			if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
 				// Is highest position
-				$data['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']+1)."&amp;fid=".$data['sort']."\">{--LOWER--}</a>";
+				$data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']+1) . '&amp;fid=' . $data['sort'] . '%}">{--LOWER--}</a>';
 			} elseif ($cnt == $max) {
 				// Is lowest position
-				$data['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']-1)."&amp;fid=".$data['sort']."\">{--HIGHER--}</a>";
+				$data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']-1) . '&amp;fid=' . $data['sort'] . '%}">{--HIGHER--}</a>';
 			} elseif ($data['sort'] > 0) {
 				// Anything else between highest and lowest
-				$data['navi'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']-1)."&amp;fid=".$data['sort']."\">{--HIGHER--}</a>/<a href=\"{?URL?}/modules.php?module=admin&amp;what=adminedit&amp;sub=".$content['sub']."&amp;act=".$data['action']."&amp;w=".$data['what']."&amp;tid=".($data['sort']+1)."&amp;fid=".$data['sort']."\">{--LOWER--}</a>";
+				$data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']-1) . '&amp;fid=' . $data['sort'] . '%}">{--HIGHER--}</a>/<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']+1) . '&amp;fid=' . $data['sort'] . '%}">{--LOWER--}</a>';
 			}
 
 			// Fix empty elements for constant (fixes display bugs in Firefox)
@@ -284,7 +281,7 @@ WHERE ".$AND." AND id=%s LIMIT 1",
 		loadTemplate('admin_amenu_edit', false, $content);
 	} else {
 		// Menu entries are missing... (???)
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
 	}
 }