Countless fixes, ext-grade started:

[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 736507c4fdf21b299323291db09678958359acfd..738f9d01d078f960f279a713ff004f6259bb6fd9 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -166,7 +166,7 @@ LIMIT 1",
                        }
 
                        // Load template
-                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+                       displayMessage('{--SETTINGS_SAVED--}');
                        break;
 
                case 'delete': // Delete menu
@@ -176,20 +176,20 @@ LIMIT 1",
                        } // END - foreach
 
                        // Load template
-                       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+                       displayMessage('{--SETTINGS_SAVED--}');
                        break;
 
                default: // Unexpected action
                        logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+                       displayMessage(getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
                        break;
        }
 } else {
        // Handle weightning
-       doAdminProcessMenuWeightning('guest');
+       doAdminProcessMenuWeightning('admin', $AND);
 
        // Run SQL
-       $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." ORDER BY `sort` ASC", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." ORDER BY `sort` ASC", __FILE__, __LINE__);
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -214,7 +214,7 @@ LIMIT 1",
                                $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>';
                        }
 
                        // Add more data to $data
@@ -234,7 +234,7 @@ LIMIT 1",
                loadTemplate('admin_edit_admin_menu', false, $content);
        } else {
                // Menu entries are missing... (???)
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
+               displayMessage('{--ADMIN_NO_MENUS_FOUND--}');
        }
 }