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 2788c66bf59f075e27bfa447e4e4ddf826407d34..29c2c9b1eb2327ba8f1a2d1ebd0a8498c90cca8c 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -60,7 +60,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        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,7 +82,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
@@ -95,7 +95,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $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;
@@ -116,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(
@@ -124,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
@@ -136,7 +136,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        $content['count'] = $count;
 
        // Load template
-       loadTemplate('admin_delete_member_menu', false, $content);
+       loadTemplate('admin_delete_member_menu', FALSE, $content);
 } elseif ((isPostRequestElementSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Change status (visible / locked)
        $content['sub'] = $subMenu;
@@ -145,7 +145,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        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...
@@ -159,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(
@@ -167,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
@@ -179,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);
@@ -189,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?
@@ -217,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
@@ -231,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--}');