X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-repair_gmnu.php;h=e7afcd83e637232c57d688cabda753c6134bfd1c;hb=98b92ea5ba992a63304091fa1b57f477befffc22;hp=ba12064c5ad7228f9f8aad027917eb4502f3ba60;hpb=e2148142f8b1a8f40fd6e7ca32185569c5a9083e;p=mailer.git

diff --git a/inc/modules/admin/what-repair_gmnu.php b/inc/modules/admin/what-repair_gmnu.php
index ba12064c5a..e7afcd83e6 100644
--- a/inc/modules/admin/what-repair_gmnu.php
+++ b/inc/modules/admin/what-repair_gmnu.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,17 +45,21 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-$ACTIONS = array();
+$actions = array();
+
 // First fix all main menus (what = '')...
-$result_fix = SQL_QUERY("SELECT id, action FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND action != 'logout' ORDER BY `sort` ASC", __FILE__, __LINE__);
-$cnt = '0'; $REP = '0';
+$result_fix = SQL_QUERY("SELECT `id`, `action` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND `action` != 'logout' ORDER BY `sort` ASC", __FILE__, __LINE__);
+$cnt = '0'; $repairedWeights = '0';
 while ($content = SQL_FETCHARRAY($result_fix)) {
 	// Store act value for later usage in sorting sub menus
-	$ACTIONS[] = $content['action'];
+	$actions[] = $content['action'];
 
 	// Fix weight
-	$result_sort = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET sort='".$cnt."' WHERE `id`='".$content['id']."' LIMIT 1", __FILE__, __LINE__);
-	$REP += SQL_AFFECTEDROWS();
+	$result_sort = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `sort`=%s WHERE `id`=%s LIMIT 1",
+		array($cnt, $content['id']), __FILE__, __LINE__);
+
+	// Get updated rows
+	$repairedWeights += SQL_AFFECTEDROWS();
 
 	// Count one up
 	$cnt++;
@@ -64,26 +69,26 @@ while ($content = SQL_FETCHARRAY($result_fix)) {
 $result_sort = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_guest_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 $action) {
-	$result_fix = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
-	array($action), __FILE__, __LINE__);
+foreach ($actions as $action) {
+	$result_fix = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
+		array($action), __FILE__, __LINE__);
 	$cnt = 1;
 	while ($content = SQL_FETCHARRAY($result_fix)) {
 		// Fix weight
-		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
+		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `sort`=%s WHERE `id`=%s LIMIT 1",
 		array($cnt, $content['id']), __FILE__, __LINE__);
-		$REP += SQL_AFFECTEDROWS();
+		$repairedWeights += SQL_AFFECTEDROWS();
 
 		// Count one up
 		$cnt++;
-	}
-}
+	} // END - while
+} // END - foreach
 
 // Repair finished
-if ($REP > 0) {
-	$message = sprintf(getMessage('ADMIN_REPAIR_ENTRIES_FIXED'), $REP);
+if ($repairedWeights > 0) {
+	$message = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $repairedWeights);
 } else {
-	$message = getMessage('ADMIN_REPAIR_NOTHING_FIXED');
+	$message = '{--ADMIN_REPAIR_NOTHING_FIXED--}';
 }
 
 // Output message