Filters for configurable userid exclusion added:

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

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index 64e8edaa99d4582df0885f54abdf9d191497f919..29c2c9b1eb2327ba8f1a2d1ebd0a8498c90cca8c 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * 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
@@ -57,10 +57,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['sub'] = $subMenu;
        $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?}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `title`, `action`, `what` FROM `{?_MYSQL_PREFIX?}_member_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,7 +74,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_edit_member_menu_row', true, $content);
+                               $OUT .= loadTemplate('admin_edit_member_menu_row', TRUE, $content);
                        } else {
                                // Entry not found?
                                $content = array(
@@ -82,24 +82,26 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);
                        }
                        SQL_FREERESULT($result);
                } // END - if
        } // END - foreach
 
        // Add row content and current counter
-       $content['rows'] = $OUT;
+       $content['rows']  = $OUT;
+       $content['chk']   = countPostSelection();
+       $content['sub']   = $subMenu;
        $content['count'] = $count;
 
        // Load template
-       loadTemplate('admin_edit_member_menu', false, $content);
+       loadTemplate('admin_edit_member_menu', FALSE, $content);
 } elseif ((isFormSent('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $subMenu;
        $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` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
@@ -114,7 +116,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_delete_member_menu_row', true, $content);
+                               $OUT .= loadTemplate('admin_delete_member_menu_row', TRUE, $content);
                        } else {
                                // Entry not found?
                                $content = array(
@@ -122,7 +124,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);
                        }
                        SQL_FREERESULT($result);
                } // END - if
@@ -134,16 +136,16 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
-       loadTemplate('admin_delete_member_menu', false, $content);
-} elseif ((isPostRequestParameterSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
+       loadTemplate('admin_delete_member_menu', FALSE, $content);
+} elseif ((isPostRequestElementSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Change status (visible / locked)
        $content['sub'] = $subMenu;
        $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`,`visible`,`locked` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `title`, `visible`, `locked` FROM `{?_MYSQL_PREFIX?}_member_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...
@@ -157,7 +159,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_menu_status_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_status_row', TRUE, $content);
                        } else {
                                // Entry not found?
                                $content = array(
@@ -165,7 +167,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
+                               $OUT .= loadTemplate('admin_menu_404_row', TRUE, $content);
                        }
                        SQL_FREERESULT($result);
                } // END - if
@@ -177,7 +179,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
-       loadTemplate('admin_member_menu_status', false, $content);
+       loadTemplate('admin_member_menu_status', FALSE, $content);
 } elseif ((isFormSent()) && (!isDemoModeActive())) {
        // Process menu editing form
        adminProcessMenuEditForm('member', $subMenu);
@@ -187,10 +189,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 
        if (!empty($subMenu)) {
                // Edit sub menus
-               $result = SQL_QUERY("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC", __FILE__, __LINE__);
        } else {
                // Edit main menus
-               $result = SQL_QUERY("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_member_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?}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
        }
 
        // Some are there?
@@ -215,10 +217,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                        }
 
                        // Add more entries
-                       $content['mode'] = 'mem';
+                       $content['do'] = 'mem';
 
                        // Load row template and switch color
-                       $OUT .= loadTemplate('admin_menu_overview_row', true, $content);
+                       $OUT .= loadTemplate('admin_menu_overview_row', TRUE, $content);
                } // END - while
 
                // Free memory
@@ -229,7 +231,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                $content['sub']  = $subMenu;
 
                // Load main template
-               loadTemplate('admin_member_menu_overview', false, $content);
+               loadTemplate('admin_member_menu_overview', FALSE, $content);
        } else {
                // Menu entries are missing... (???)
                displayMessage('{--ADMIN_NO_MENUS_FOUND--}');