fooRequestElementBar() functions renamed, adding of request parameters added:

[mailer.git] / inc / modules / admin / what-adminedit.php

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index de04b2d671ef3fb6ff4d376f34f6df33afff93cd..f2db40320b1b3f5f88d09b9b1576472cd160505c 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -46,19 +46,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 ((isPostRequestParameterSet('edit')) && (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 +102,14 @@ if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoM
 
        // Load template
        loadTemplate('admin_amenu_edit_form', false, $content);
-} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestParameterSet('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 +145,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 +160,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 +172,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 +182,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_menu_unknown_okay', false, 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 +214,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__);
                }
        }