A lot has been rewritten, ext-teams added, ext-forced continued:

[mailer.git] / inc / fix_menu.php

diff --git a/inc/fix_menu.php b/inc/fix_menu.php
index 31d3f96ff73363aabc217aadc84827305b96dbdf..8c1193861403f2303f031f7fca3ddd5d9d846e78 100644 (file)
--- a/inc/fix_menu.php
+++ b/inc/fix_menu.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -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
@@ -66,7 +64,7 @@ foreach (array('guest','member','admin') as $menu) {
                                // Sub menu
                                $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
                }