X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=b1fb3347d8fc18f37a7c3077bd8566dece690311;hb=ea6cf3578750b2697b45cab74725396962b56ceb;hp=3bd588daa4c5c0f007481d984c6fb8545bf0bef0;hpb=2e715eb7f3f8ca8d259aacb4cbbddde7d9d18e01;p=mailer.git

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 3bd588daa4..b1fb3347d8 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -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('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
 			break;
-	}
+	} // END - switch
 } 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)) {
@@ -197,7 +197,8 @@ LIMIT 1",
 		$content['sub'] = $SUB;
 
 		// Init variables
-		$OUT = ''; $count = '0';
+		$OUT = '';
+		$count = '0';
 
 		// Process all entries
 		while ($data = SQL_FETCHARRAY($result)) {
@@ -214,7 +215,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 +235,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--}');
 	}
 }