X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffix_menu.php;h=50be57d018cba98d0703be82218e8a49528bd838;hb=082398d5872064d3911c62b085e8a134569f626b;hp=1fb3d21da5556be767ecd2a2966a4f7f15ce687f;hpb=76fd13e5938a334f08e43893eb9a4ff49f72bf07;p=mailer.git

diff --git a/inc/fix_menu.php b/inc/fix_menu.php
index 1fb3d21da5..50be57d018 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 - 2013 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,14 +43,14 @@ 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 = sqlQueryEscaped("SELECT `action`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` ORDER BY `action` ASC,`what` ASC",
 		array($menu), __FILE__, __LINE__);
 
 	// Init array
 	$menus = array();
 
 	// Load all entries
-	while ($entry = SQL_FETCHARRAY($result)) {
+	while ($entry = sqlFetchArray($result)) {
 		// Is the menu entry set?
 		if (!isset($menus['menu'][$entry['action']][$entry['what']])) {
 			// Not found
@@ -61,19 +59,19 @@ 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) {
 				// Remove all except one
 				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",
+					sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what` IS NULL LIMIT %s",
 						array(
 							$menu,
 							$entry['action'],
@@ -81,7 +79,7 @@ foreach (array('guest','member','admin') as $menu) {
 						), __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",
+					sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `what`='%s' LIMIT %s",
 						array(
 							$menu,
 							$entry['action'],
@@ -94,18 +92,18 @@ foreach (array('guest','member','admin') as $menu) {
 	} // END - while
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Init sqls
 	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');