X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=738f9d01d078f960f279a713ff004f6259bb6fd9;hp=5f0ec0c4fa340d5fc2a50b5e5ab2625aaf068ea1;hb=f4d7dc336fde4cebc47701026a94d193f77854a1;hpb=7db85bc0c45b62c28ba49e728f489ad4bc1c115f

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 5f0ec0c4fa..738f9d01d0 100644
--- 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 *
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
 $AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
@@ -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--}');
 	}
 }