From 752aabfc86ef7811f725168173028033eb4307cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Dec 2012 23:19:48 +0100
Subject: [PATCH] Fix: dynamic menu does not works with auguria. Add a
 temporary fix.

---
 htdocs/core/class/menubase.class.php       |  8 ++++----
 htdocs/core/menus/standard/auguria.lib.php | 16 ++++++++++++++--
 htdocs/core/menus/standard/eldy.lib.php    |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 92b483a0c20..761bdafb3df 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -412,7 +412,7 @@ class Menubase
     }
 
     /**
-     * 	Load entries found in database in a menu array.
+     * 	Load entries found from database in this->newmenu array.
      *
      * 	@param	array	$newmenu        Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy)
      * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (often $_SESSION["mainmenu"])
@@ -433,7 +433,7 @@ class Menubase
         // We initialize newmenu with first already found menu entries
         $this->newmenu = $newmenu;
 
-        // Load datas from database into $tabMenu, then we will complete this->newmenu with values into $tabMenu
+        // Load datas from database into $tabMenu, later we will complete this->newmenu with values into $tabMenu
         if (count($tabMenu) == 0)
         {
             $this->menuLoad($mainmenu, $leftmenu, $type_user, $menu_handler, $tabMenu);
@@ -526,7 +526,7 @@ class Menubase
         $mainmenu=$mymainmenu;  // To export to dol_eval function
         $leftmenu=$myleftmenu;  // To export to dol_eval function
 
-        $sql = "SELECT m.rowid, m.type, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu";
+        $sql = "SELECT m.rowid, m.type, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
         $sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
         $sql.= " WHERE m.entity IN (0,".(! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)?"1,":"").$conf->entity.")";
         $sql.= " AND m.menu_handler IN ('".$menu_handler."','all')";
@@ -614,7 +614,7 @@ class Menubase
                     //$tabMenu[$b]['langs']       = $menu['langs'];
                     $tabMenu[$b]['fk_mainmenu'] = $menu['fk_mainmenu'];
                     $tabMenu[$b]['fk_leftmenu'] = $menu['fk_leftmenu'];
-                    //$tabMenu[$b]['position']    = $menu['position'];
+                    $tabMenu[$b]['position']    = $menu['position'];
 
                     $b++;
                 }
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 137dbf2818f..3aaa26c3271 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -236,9 +236,21 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after)
         }
     }
 
+	// Modules system tools
+	// TODO Find a way to add parent menu only if child menu exists. For the moment, no ther method than hard coded methods.
+    if (! empty($conf->product->enabled) || ! empty($conf->service->enabled) || ! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS))
+    {
+       	$langs->load("products");
+       	$newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools');
+       	if ($leftmenu=="modulesadmintools")
+       	{
+           	$newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=modulesadmintools",$langs->trans("ProductVatMassChange"),1);
+      	}
+    }
+
     /**
-     * On definit newmenu en fonction de mainmenu et leftmenu
-     * ------------------------------------------------------
+     * We update newmenu with entries found into database
+     * --------------------------------------------------
      */
     if ($mainmenu)
     {
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4ae5dad0731..0c846a4092e 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -710,7 +710,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
                     $newmenu->add("/support/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("HelpCenter"),1,1,'targethelp');
                 }
 				// Modules system tools
-                if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+                if (! empty($conf->product->enabled) || ! empty($conf->service->enabled) || ! empty($conf->global->MAIN_MENU_ENABLE_MODULETOOLS))
 	            {
 	            	$langs->load("products");
 	            	$newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=modulesadmintools", $langs->trans("ModulesSystemTools"), 0, 1, '', $mainmenu, 'modulesadmintools');