X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-repair_amnu.php;h=d0e58e66d49a2d5799c3cbbb653d2a1a1657521b;hb=29157685184b9aa2ddbf42e9d2e49141af95f7e2;hp=639ddf2676cb73d578cb1378c0d4dd791c304fba;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git

diff --git a/inc/modules/admin/what-repair_amnu.php b/inc/modules/admin/what-repair_amnu.php
index 639ddf2676..d0e58e66d4 100644
--- a/inc/modules/admin/what-repair_amnu.php
+++ b/inc/modules/admin/what-repair_amnu.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/25/2004 *
- * ================                             Last change: 02/25/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 02/25/2004 *
+ * ===================                          Last change: 02/25/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-repair_amenu.php                            *
@@ -10,9 +10,15 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Menuegewichtigung reparieren                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                           *
+ * 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 *
@@ -32,62 +38,59 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!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", basename(__FILE__));
+addMenuDescription('admin', __FILE__);
 
-global $link;
-$ACTIONs = array();
-// First fix all main menus (what='')...
-$result_fix = SQL_QUERY("SELECT id, action FROM "._MYSQL_PREFIX."_admin_menu WHERE what='' AND action != 'logout' ORDER BY sort ASC", __FILE__, __LINE__);
-$cnt = 0; $REP = 0;
-while(list($id, $act) = SQL_FETCHROW($result_fix))
-{
-	// Store action value for later usage in sorting sub menus
-	$ACTIONs[] = $act;
+$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__);
+$cnt = '0'; $repairedWeights = '0';
+while ($content = SQL_FETCHARRAY($result_fix)) {
+	// Store act value for later usage in sorting sub menus
+	$actions[] = $content['action'];
 
 	// Fix weight
-	$result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='%s' WHERE id=%d LIMIT 1",
-	 array($cnt, bigintval($id)), __FILE__, __LINE__);
-	$REP += SQL_AFFECTEDROWS();
+	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
+		array($cnt, $content['id']), __FILE__, __LINE__);
+	$repairedWeights += SQL_AFFECTEDROWS();
 
 	// Count one up
 	$cnt++;
-}
-
-// Free memory
-SQL_FREERESULT($result_fix);
+} // END - while
 
 // Set logout weight to 999
-$result_sort = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='999' WHERE action='logout' AND what='' 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 != '' 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` ASC",
+		array($action), __FILE__, __LINE__);
 	$cnt = 1;
-	while (list($id) = SQL_FETCHROW($result_fix))
-	{
+	while ($content = SQL_FETCHARRAY($result_fix)) {
 		// Fix weight
-		$result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='%s' WHERE id=%d LIMIT 1",
-		 array($cnt, bigintval($id)), __FILE__, __LINE__);
-		$REP += SQL_AFFECTEDROWS();
+		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`=%s WHERE `id`=%s LIMIT 1",
+			array($cnt, $content['id']), __FILE__, __LINE__);
+		$repairedWeights += SQL_AFFECTEDROWS();
 
 		// Count one up
 		$cnt++;
-	}
+	} // END - while
+} // END - foreach
 
-	// Free memory
-	SQL_FREERESULT($result_fix);
+// Repair finished
+if ($repairedWeights > 0) {
+	$message = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $repairedWeights);
+} else {
+	$message = '{--ADMIN_REPAIR_NOTHING_FIXED--}';
 }
 
-// Repair finished
-LOAD_TEMPLATE("admin_settings_saved", false, "<FONT class=\"admin_done\">".ADMIN_REPAIR_ENTRIES_FIXED_1.$REP.ADMIN_REPAIR_ENTRIES_FIXED_2."</FONT>");
+// Output message
+loadTemplate('admin_settings_saved', false, $message);
 
-//
+// [EOF]
 ?>