X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-repair_amnu.php;h=267d0e02121bdfa9e65d221b4f563f883c4ae06a;hb=d7095e5633245b7efc2e271e1bf0c3eb9ecad532;hp=86c4f765b83517366883ba805fe8eb4ca942410f;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git

diff --git a/inc/modules/admin/what-repair_amnu.php b/inc/modules/admin/what-repair_amnu.php
index 86c4f765b8..267d0e0212 100644
--- a/inc/modules/admin/what-repair_amnu.php
+++ b/inc/modules/admin/what-repair_amnu.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,26 +37,25 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
 }
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
 $ACTIONS = array();
 
 // First fix all main menus (what = '')...
-$result_fix = SQL_QUERY("SELECT id, action FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND action != 'logout' ORDER BY `sort` ASC", __FILE__, __LINE__);
+$result_fix = SQL_QUERY("SELECT id, action FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND action != 'logout' ORDER BY `sort` ASC", __FILE__, __LINE__);
 $cnt = 0; $REP = 0;
 while ($content = SQL_FETCHARRAY($result_fix)) {
 	// Store act value for later usage in sorting sub menus
 	$ACTIONS[] = $content['action'];
 
 	// Fix weight
-	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
-		array($cnt, $content['id']), __FILE__, __LINE__);
+	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
+	array($cnt, $content['id']), __FILE__, __LINE__);
 	$REP += SQL_AFFECTEDROWS();
 
 	// Count one up
@@ -64,17 +63,17 @@ while ($content = SQL_FETCHARRAY($result_fix)) {
 }
 
 // Set logout weight to 999
-SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `sort`='999' WHERE `action`='logout' AND (`what`='' OR `what` IS NULL) LIMIT 1", __FILE__, __LINE__);
+SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`='999' WHERE `action`='logout' AND (`what`='' OR `what` IS NULL) LIMIT 1", __FILE__, __LINE__);
 
 // Now sort every each menu
-foreach ($ACTIONS as $act) {
-	$result_fix = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
-		array($act), __FILE__, __LINE__);
+foreach ($ACTIONS as $action) {
+	$result_fix = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
+		array($action), __FILE__, __LINE__);
 	$cnt = 1;
 	while ($content = SQL_FETCHARRAY($result_fix)) {
 		// Fix weight
-		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
-			array($cnt, $content['id']), __FILE__, __LINE__);
+		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
+		array($cnt, $content['id']), __FILE__, __LINE__);
 		$REP += SQL_AFFECTEDROWS();
 
 		// Count one up
@@ -82,9 +81,6 @@ foreach ($ACTIONS as $act) {
 	}
 }
 
-// @TODO This causes the whole (!) menu cache being rebuilded
-cachePurgeAdminMenu();
-
 // Repair finished
 if ($REP > 0) {
 	$message = sprintf(getMessage('ADMIN_REPAIR_ENTRIES_FIXED'), $REP);
@@ -93,7 +89,7 @@ if ($REP > 0) {
 }
 
 // Output message
-LOAD_TEMPLATE('admin_settings_saved', false, $message);
+loadTemplate('admin_settings_saved', false, $message);
 
-//
+// [EOF]
 ?>