From 43ab96232900329e14a8bff7b83459157a0d2eb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 8 Jul 2005 23:27:07 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Probl=E8me=20de=20menu=20s=E9lectionn=E9?=
 =?UTF-8?q?=20deux=20fois.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/includes/menus/barre_left/eldy.php   |  7 ++++---
 htdocs/includes/menus/barre_top/default.php | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/htdocs/includes/menus/barre_left/eldy.php b/htdocs/includes/menus/barre_left/eldy.php
index d5cd5b36bcf..cd39d25ebac 100644
--- a/htdocs/includes/menus/barre_left/eldy.php
+++ b/htdocs/includes/menus/barre_left/eldy.php
@@ -67,9 +67,6 @@ class MenuLeft {
         
         $user->getrights("");
         
-        $newmenu = new Menu();
-        $overwritemenufor=array('home','members','products','suppliers','commercial','accountancy','tools');
-        
         // On récupère mainmenu et leftmenu qui définissent le menu à afficher
         if (isset($_GET["mainmenu"])) {
             // On sauve en session le menu principal choisi
@@ -80,6 +77,7 @@ class MenuLeft {
             // On va le chercher en session si non défini par le lien    
             $mainmenu=$_SESSION["mainmenu"];
         }
+
         if (isset($_GET["leftmenu"])) {
             // On sauve en session le menu principal choisi
             $leftmenu=$_GET["leftmenu"];
@@ -97,6 +95,9 @@ class MenuLeft {
         }
         
         
+        $newmenu = new Menu();
+        $overwritemenufor=array('home','members','products','suppliers','commercial','accountancy','tools');
+        
         /**
          * On definit newmenu en fonction de mainmenu et leftmenu
          * ------------------------------------------------------
diff --git a/htdocs/includes/menus/barre_top/default.php b/htdocs/includes/menus/barre_top/default.php
index 686967b5f51..378d6b9b8a5 100644
--- a/htdocs/includes/menus/barre_top/default.php
+++ b/htdocs/includes/menus/barre_top/default.php
@@ -60,8 +60,23 @@ class MenuTop {
     function showmenu()
     {
 
-        global $conf,$langs;
+        global $user,$conf,$langs;
         
+        if (! session_id()) session_start();    // En mode authentification PEAR, la session a déjà été ouverte
+
+        $user->getrights("");
+
+        // On récupère mainmenu
+        if (isset($_GET["mainmenu"])) {
+            // On sauve en session le menu principal choisi
+            $mainmenu=$_GET["mainmenu"];
+            $_SESSION["mainmenu"]=$mainmenu;
+            $_SESSION["leftmenuopened"]="";
+        } else {
+            // On va le chercher en session si non défini par le lien    
+            $mainmenu=$_SESSION["mainmenu"];
+        }
+
         // Entrée home
         $id="";
         if ($_GET["mainmenu"] == "home" || ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home"))