X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-repair_amenu.php;h=721aea9c1f0d5ae9d24eb320a0db14f7464cc0d6;hp=b9479f4e21ce8485e2bfead3d3b2053a67652bf6;hb=c78089215285d52d483760699d07a96dfbbe0671;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5

diff --git a/inc/modules/admin/what-repair_amenu.php b/inc/modules/admin/what-repair_amenu.php
index b9479f4e21..721aea9c1f 100644
--- a/inc/modules/admin/what-repair_amenu.php
+++ b/inc/modules/admin/what-repair_amenu.php
@@ -38,18 +38,19 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("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(list($id, $act) = SQL_FETCHROW($result_fix)) {
+while (list($id, $act) = SQL_FETCHROW($result_fix)) {
 	// Store act value for later usage in sorting sub menus
 	$ACTIONS[] = $act;
 
 	// Fix weight
-	$result_sort = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='".$cnt."' WHERE id='".$id."' LIMIT 1", __FILE__, __LINE__);
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE id=%s LIMIT 1",
+		array($cnt, $id), __FILE__, __LINE__);
 	$REP += SQL_AFFECTEDROWS();
 
 	// Count one up
@@ -57,17 +58,17 @@ while(list($id, $act) = SQL_FETCHROW($result_fix)) {
 }
 
 // Set logout weight to 999
-$result_sort = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='999' WHERE act='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("SELECT id FROM "._MYSQL_PREFIX."_admin_menu WHERE act='".$act."' AND what != '' AND what IS NOT NULL ORDER BY sort", __FILE__, __LINE__);
+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__);
 	$cnt = 1;
-	while (list($id) = SQL_FETCHROW($result_fix))
-	{
+	while (list($id) = SQL_FETCHROW($result_fix)) {
 		// Fix weight
-		$result_sort = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='".$cnt."' WHERE id='".$id."' LIMIT 1", __FILE__, __LINE__);
+		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE id=%s LIMIT 1",
+			array($cnt, $id), __FILE__, __LINE__);
 		$REP += SQL_AFFECTEDROWS();
 
 		// Count one up
@@ -79,7 +80,14 @@ foreach ($ACTIONS as $act)
 CACHE_PURGE_ADMIN_MENU();
 
 // Repair finished
-LOAD_TEMPLATE("admin_settings_saved", false, "<FONT class=\"admin_done\">".ADMIN_REPAIR_ENTRIES_FIXED_1.$REP.ADMIN_REPAIR_ENTRIES_FIXED_2."</FONT>");
+if ($REP > 0) {
+	$MSG = sprintf(getMessage('ADMIN_REPAIR_ENTRIES_FIXED'), $REP);
+} else {
+	$MSG = getMessage('ADMIN_REPAIR_NOTHING_FIXED');
+}
+
+// Output message
+LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
 
 //
 ?>