X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffix_menu.php;h=62515a9601d59ffc30c07a971e2d54fcd65c65de;hb=3360f076d2251f554b2dfb420c18367af363ce2a;hp=31d3f96ff73363aabc217aadc84827305b96dbdf;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/fix_menu.php b/inc/fix_menu.php
index 31d3f96ff7..62515a9601 100644
--- a/inc/fix_menu.php
+++ b/inc/fix_menu.php
@@ -14,12 +14,10 @@
  * $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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -45,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Get all menus
 foreach (array('guest','member','admin') as $menu) {
 	// Query it
-	$result = SQL_QUERY_ESC("SELECT `action`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` ORDER BY `action` ASC, `what` ASC",
+	$result = SQL_QUERY_ESC("SELECT `action`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` ORDER BY `action` ASC,`what` ASC",
 		array($menu), __FILE__, __LINE__);
 
 	// Init array
@@ -61,12 +59,12 @@ foreach (array('guest','member','admin') as $menu) {
 			// Double entry, so get count
 			if (is_null($entry['what'])) {
 				// Main menu
-				$entries = countSumTotalData($entry['action'], $menu . '_menu', 'action', 'action', true, " AND `what` IS NULL");
+				$entries = countSumTotalData($entry['action'], $menu . '_menu', 'action', 'action', TRUE, " AND `what` IS NULL");
 			} else {
 				// Sub menu
-				$entries = countSumTotalData($entry['action'], $menu . '_menu', 'action', 'action', true, sprintf(" AND `what`='%s'", $entry['what']));
+				$entries = countSumTotalData($entry['action'], $menu . '_menu', 'action', 'action', TRUE, sprintf(" AND `what`='%s'", $entry['what']));
 			}
-			//* DEBUG: */ print 'menu='.$menu.',action='.$entry['action'].',what='.$entry['what'].',entries='.$entries.'<br />';
+			//* DEBUG: */ debugOutput('menu='.$menu.',action='.$entry['action'].',what='.$entry['what'].',entries='.$entries);
 
 			// Only remove if we have at least 2 entries from same menu
 			if ($entries > 1) {
@@ -74,11 +72,20 @@ foreach (array('guest','member','admin') as $menu) {
 				if (is_null($entry['what'])) {
 					// Main menu is double
 					SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what` IS NULL LIMIT %s",
-						array($menu, $entry['action'], ($entries - 1)), __FILE__, __LINE__);
+						array(
+							$menu,
+							$entry['action'],
+							($entries - 1)
+						), __FILE__, __LINE__);
 				} else {
 					// Sub menu is double
 					SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what`='%s' LIMIT %s",
-						array($menu, $entry['action'], $entry['what'], ($entries - 1)), __FILE__, __LINE__);
+						array(
+							$menu,
+							$entry['action'],
+							$entry['what'],
+							($entries - 1)
+						), __FILE__, __LINE__);
 				}
 			} // END - if
 		}
@@ -91,12 +98,12 @@ foreach (array('guest','member','admin') as $menu) {
 	initSqls();
 
 	// Now insert our unqiue key for action-what combination
-	addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` DROP KEY `action_what`", $menu));
-	addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` ADD UNIQUE `action_what` (`action` , `what`)", $menu));
+	addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` DROP INDEX `action_what`", $menu));
+	addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` ADD UNIQUE INDEX `action_what` (`action`, `what`)", $menu));
 
 	// Now insert our unqiue key for what
-	addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` DROP KEY `what`", $menu));
-	addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` ADD UNIQUE `what` (`what`)", $menu));
+	addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` DROP INDEX `what`", $menu));
+	addSql(sprintf("ALTER TABLE `{?_MYSQL_PREFIX?}_%s_menu` ADD UNIQUE INDEX `what` (`what`)", $menu));
 
 	// And run all
 	runFilterChain('run_sqls');