X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-repair_mmenu.php;h=566b219bee366c90e45cb3bb58f57cef3f34719f;hb=d016e24dd4686f613a17733b96bc28fac936a4ac;hp=a7320f76e70033e44e29f75f04723e68c1ebf4d7;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git

diff --git a/inc/modules/admin/what-repair_mmenu.php b/inc/modules/admin/what-repair_mmenu.php
index a7320f76e7..566b219bee 100644
--- a/inc/modules/admin/what-repair_mmenu.php
+++ b/inc/modules/admin/what-repair_mmenu.php
@@ -32,42 +32,42 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
+
 // 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."_member_menu WHERE what='' AND action != 'logout' ORDER BY sort ASC", __FILE__, __LINE__);
+// First fix all main menus (what="")...
+$result_fix = SQL_QUERY("SELECT id, action FROM `{!_MYSQL_PREFIX!}_member_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 action value for later usage in sorting sub menus
 	$ACTIONS[] = $act;
 
 	// Fix weight
-	$result_sort = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_member_menu SET sort='".$cnt."' WHERE id='".$id."' LIMIT 1", __FILE__, __LINE__);
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET sort=%s WHERE id=%s LIMIT 1",
+		array($cnt, $id), __FILE__, __LINE__);
 	$REP += SQL_AFFECTEDROWS();
 
 	// Count one up
 	$cnt++;
 }
 // Set logout weight to 999
-$result_sort = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_member_menu SET sort='999' WHERE action='logout' AND what='' LIMIT 1", __FILE__, __LINE__);
+SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_member_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."_member_menu WHERE action='".$act."' AND what != '' ORDER BY sort", __FILE__, __LINE__);
+foreach ($ACTIONS as $act) {
+	$result_fix = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_member_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."_member_menu SET sort='".$cnt."' WHERE id='".$id."' LIMIT 1", __FILE__, __LINE__);
+		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET sort=%s WHERE id=%s LIMIT 1",
+			array($cnt, $id), __FILE__, __LINE__);
 		$REP += SQL_AFFECTEDROWS();
 
 		// Count one up
@@ -76,7 +76,14 @@ foreach ($ACTIONS as $act)
 }
 
 // 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);
 
 //
 ?>