From 435b348d731efc4690d88d8a66d0da668975ece7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 4 May 2009 22:08:20 +0000
Subject: [PATCH] Fix: Bad management of menu with external users.
---
.../menus/barre_top/eldy_backoffice.php | 679 +++++++++---------
.../menus/barre_top/eldy_frontoffice.php | 16 +-
2 files changed, 347 insertions(+), 348 deletions(-)
diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php
index fc4af571dc6..cd854fb3561 100644
--- a/htdocs/includes/menus/barre_top/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php
@@ -18,15 +18,15 @@
*/
/**
- \file htdocs/includes/menus/barre_top/eldy_backoffice.php
- \brief Gestionnaire nomme eldy du menu du haut
- \version $Id$
-
- \remarks La construction d'un gestionnaire pour le menu du haut est simple:
- \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut
- \remarks doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
- \remarks ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
-*/
+ * \file htdocs/includes/menus/barre_top/eldy_backoffice.php
+ * \brief Gestionnaire nomme eldy du menu du haut
+ * \version $Id$
+ *
+ * \remarks La construction d'un gestionnaire pour le menu du haut est simple:
+ * \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut
+ * \remarks doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
+ * \remarks ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
+ */
/**
@@ -35,134 +35,134 @@
*/
class MenuTop {
- var $require_left=array("eldy_backoffice"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier
- var $hideifnotallowed=false; // Put 0 for back office menu, 1 for front office menu
+ var $require_left=array("eldy_backoffice"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier
+ var $hideifnotallowed=false; // Put 0 for back office menu, 1 for front office menu
- var $atarget=""; // Valeur du target a utiliser dans les liens
+ var $atarget=""; // Valeur du target a utiliser dans les liens
- /**
- * \brief Constructeur
- * \param db Handler d'acces base de donnee
- */
- function MenuTop($db)
- {
- $this->db=$db;
- }
+ /**
+ * \brief Constructeur
+ * \param db Handler d'acces base de donnee
+ */
+ function MenuTop($db)
+ {
+ $this->db=$db;
+ }
- /**
- * \brief Affiche le menu
- */
- function showmenu()
- {
- global $user,$conf,$langs,$dolibarr_main_db_name;;
+ /**
+ * \brief Affiche le menu
+ */
+ function showmenu()
+ {
+ global $user,$conf,$langs,$dolibarr_main_db_name;;
- // On sauve en session le menu principal choisi
+ // On sauve en session le menu principal choisi
if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"];
if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"];
- $_SESSION["leftmenuopened"]="";
-
-
- print '<table class="tmenu"><tr class="tmenu">';
-
- // Home
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
- $idsel='id="home" ';
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a></td>';
-
-
- // Third parties
- if ($conf->societe->enabled || $conf->fournisseur->enabled)
- {
- $langs->load("companies");
- $langs->load("suppliers");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- $idsel='id="companies" ';
- if (($conf->societe->enabled && $user->rights->societe->lire)
- || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
- {
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=companies&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("ThirdParties").'</a></td>';
+ $_SESSION["leftmenuopened"]="";
+
+
+ print '<table class="tmenu"><tr class="tmenu">';
+
+ // Home
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+ $idsel='id="home" ';
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a></td>';
+
+
+ // Third parties
+ if ($conf->societe->enabled || $conf->fournisseur->enabled)
+ {
+ $langs->load("companies");
+ $langs->load("suppliers");
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="companies" ';
+ if (($conf->societe->enabled && $user->rights->societe->lire)
+ || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
+ {
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=companies&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("ThirdParties").'</a></td>';
}
else
{
- if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("ThirdParties").'</a></td>';
+ if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("ThirdParties").'</a></td>';
}
}
- // Products-Services
- if ($conf->produit->enabled || $conf->service->enabled)
- {
- $langs->load("products");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products")
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
- $chaine="";
- if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); }
- if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
- if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
-
- $idsel='id="products" ';
- if ($user->rights->produit->lire)
- {
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$chaine.'</a></td>';
- }
- else
- {
- if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$chaine.'</a></td>';
- }
- }
-
- // Commercial
- /*$showcommercial=0;
- if ($conf->societe->enabled) $showcommercial=1;
- if ($conf->propal->enabled) $showcommercial=1;
- if ($conf->commande->enabled) $showcommercial=1;
- if ($conf->contrat->enabled) $showcommercial=1;
- if ($conf->ficheinter->enabled) $showcommercial=1;
- if ($showcommercial)*/
+ // Products-Services
+ if ($conf->produit->enabled || $conf->service->enabled)
+ {
+ $langs->load("products");
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+ $chaine="";
+ if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); }
+ if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
+ if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
+
+ $idsel='id="products" ';
+ if ($user->rights->produit->lire)
+ {
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$chaine.'</a></td>';
+ }
+ else
+ {
+ if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$chaine.'</a></td>';
+ }
+ }
+
+ // Commercial
+ /*$showcommercial=0;
+ if ($conf->societe->enabled) $showcommercial=1;
+ if ($conf->propal->enabled) $showcommercial=1;
+ if ($conf->commande->enabled) $showcommercial=1;
+ if ($conf->contrat->enabled) $showcommercial=1;
+ if ($conf->ficheinter->enabled) $showcommercial=1;
+ if ($showcommercial)*/
if ($conf->commercial->enabled)
- {
- $langs->load("commercial");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- $idsel='id="commercial" ';
- if($user->rights->societe->lire)
+ {
+ $langs->load("commercial");
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="commercial" ';
+ if($user->rights->societe->lire)
{
print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'</a></td>';
}
@@ -172,227 +172,226 @@ class MenuTop {
}
}
- // Financial
- if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled
- || $conf->facture->enabled)
- {
- $langs->load("compta");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy")
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- $idsel='id="accountancy" ';
- if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire
- || $user->rights->facture->lire || $user->rights->banque->lire)
- {
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'</a></td>';
- }
- else
- {
- if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuFinancial").'</a></td>';
- }
- }
-
- // Projects
- if ($conf->projet->enabled)
- {
- $langs->load("projects");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project")
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- $idsel='id="project" ';
- if ($user->rights->projet->lire)
- {
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Projects").'</a></td>';
- }
- else
- {
- if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Projects").'</a></td>';
- }
- }
-
- // Tools
- if ($conf->mailing->enabled || $conf->export->enabled || $conf->global->MAIN_MODULE_IMPORT || $conf->global->MAIN_MODULE_DOMAIN)
- {
- $langs->load("other");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools")
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- $idsel='id="tools" ';
- if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire)
- {
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=tools&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a></td>';
- }
- else
- {
- if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Tools").'</a></td>';
- }
- }
-
- // Telephonie
- if (! empty($conf->telephonie->enabled) && $user->rights->telephonie->lire)
- {
- $class="";
- if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"]))
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- $idsel='id="telephonie" ';
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/telephonie/index.php?mainmenu=telephonie"'.($this->atarget?" target=$this->atarget":"").'>Telephonie</a></td>';
- }
-
- // Energie
- if (! empty($conf->energie->enabled))
- {
- $langs->load("energy");
- $class="";
- if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"]))
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- $idsel='id="energie" ';
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/energie/index.php?mainmenu=energie"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'</a></td>';
- }
+ // Financial
+ if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled
+ || $conf->facture->enabled)
+ {
+ $langs->load("compta");
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="accountancy" ';
+ if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire
+ || $user->rights->facture->lire || $user->rights->banque->lire)
+ {
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'</a></td>';
+ }
+ else
+ {
+ if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuFinancial").'</a></td>';
+ }
+ }
+
+ // Projects
+ if ($conf->projet->enabled)
+ {
+ $langs->load("projects");
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="project" ';
+ if ($user->rights->projet->lire)
+ {
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Projects").'</a></td>';
+ }
+ else
+ {
+ if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Projects").'</a></td>';
+ }
+ }
+
+ // Tools
+ if ($conf->mailing->enabled || $conf->export->enabled || $conf->global->MAIN_MODULE_IMPORT || $conf->global->MAIN_MODULE_DOMAIN)
+ {
+ $langs->load("other");
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="tools" ';
+ if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire)
+ {
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/index.php?mainmenu=tools&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a></td>';
+ }
+ else
+ {
+ if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("Tools").'</a></td>';
+ }
+ }
+
+ // Telephonie
+ if (! empty($conf->telephonie->enabled) && $user->rights->telephonie->lire)
+ {
+ $class="";
+ if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"]))
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="telephonie" ';
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/telephonie/index.php?mainmenu=telephonie"'.($this->atarget?" target=$this->atarget":"").'>Telephonie</a></td>';
+ }
+
+ // Energie
+ if (! empty($conf->energie->enabled))
+ {
+ $langs->load("energy");
+ $class="";
+ if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"]))
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="energie" ';
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/energie/index.php?mainmenu=energie"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'</a></td>';
+ }
// OSCommerce 1
- if (! empty($conf->boutique->enabled))
- {
- $langs->load("shop");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- $idsel='id="shop" ';
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a></td>';
- }
-
- // OSCommerce WS
- if (! empty($conf->oscommercews->enabled))
- {
- $langs->load("shop");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- $idsel='id="shop" ';
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/oscommerce_ws/index.php?mainmenu=shop&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a></td>';
- }
-
- // Members
- if ($conf->adherent->enabled)
- {
- // $langs->load("members"); Added in main file
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
- {
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- $idsel='id="members" ';
- if ($user->rights->adherent->lire)
- {
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuMembers").'</a></td>';
- }
- else
- {
- if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuMembers").'</a></td>';
- }
- }
-
- // Affichage des menus personnalises
- require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
-
- $menuArbo = new Menubase($this->db,'eldy','top');
- $tabMenu = $menuArbo->menuTopCharger(0,$_SESSION['mainmenu'],'eldy');
-
- for($i=0; $i<count($tabMenu); $i++)
- {
- if ($tabMenu[$i]['enabled'] == true)
- {
- $idsel=(empty($tabMenu[$i]['mainmenu'])?'id="none" ':'id="'.$tabMenu[$i]['mainmenu'].'" ');
- if ($tabMenu[$i]['right'] == true)
- {
- if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
- {
- $url = $tabMenu[$i]['url'];
- }
- else
- {
- $url=DOL_URL_ROOT.$tabMenu[$i]['url'];
- if (! eregi('\?',DOL_URL_ROOT.$tabMenu[$i]['url'])) $url.='?';
- else $url.='&';
- $url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu=';
- $url.="&idmenu=".$tabMenu[$i]['rowid'];
- }
- if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
- else $class='class="tmenu"';
- print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
- print $tabMenu[$i]['titre'];
- print '</a></td>';
- }
- else
- {
- if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$tabMenu[$i]['titre'].'</a></td>';
- }
- }
- }
-
-
- print '</tr></table>';
- }
+ if (! empty($conf->boutique->enabled))
+ {
+ $langs->load("shop");
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="shop" ';
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a></td>';
+ }
+
+ // OSCommerce WS
+ if (! empty($conf->oscommercews->enabled))
+ {
+ $langs->load("shop");
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="shop" ';
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/oscommerce_ws/index.php?mainmenu=shop&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'</a></td>';
+ }
+
+ // Members
+ if ($conf->adherent->enabled)
+ {
+ // $langs->load("members"); Added in main file
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="members" ';
+ if ($user->rights->adherent->lire)
+ {
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuMembers").'</a></td>';
+ }
+ else
+ {
+ if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$langs->trans("MenuMembers").'</a></td>';
+ }
+ }
+
+ // Affichage des menus personnalises
+ require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
+
+ $menuArbo = new Menubase($this->db,'eldy','top');
+ $tabMenu = $menuArbo->menuTopCharger(0,$_SESSION['mainmenu'],'eldy');
+
+ for($i=0; $i<count($tabMenu); $i++)
+ {
+ if ($tabMenu[$i]['enabled'] == true)
+ {
+ $idsel=(empty($tabMenu[$i]['mainmenu'])?'id="none" ':'id="'.$tabMenu[$i]['mainmenu'].'" ');
+ if ($tabMenu[$i]['right'] == true)
+ {
+ if (eregi($tabMenu[$i]['url'],"^(http:\/\/|https:\/\/)"))
+ {
+ $url = $tabMenu[$i]['url'];
+ }
+ else
+ {
+ $url=DOL_URL_ROOT.$tabMenu[$i]['url'];
+ if (! eregi('\?',DOL_URL_ROOT.$tabMenu[$i]['url'])) $url.='?';
+ else $url.='&';
+ $url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu=';
+ $url.="&idmenu=".$tabMenu[$i]['rowid'];
+ }
+ if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
+ else $class='class="tmenu"';
+ print '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
+ print $tabMenu[$i]['titre'];
+ print '</a></td>';
+ }
+ else
+ {
+ if (! $this->hideifnotallowed) print '<td class="tmenu"><a class="tmenudisabled" '.$idsel.'href="#">'.$tabMenu[$i]['titre'].'</a></td>';
+ }
+ }
+ }
+
+ print '</tr></table>';
+ }
}
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
index 9aa1c44a25f..4dbd1ba9a75 100644
--- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
@@ -18,14 +18,14 @@
*/
/**
- \file htdocs/includes/menus/barre_top/eldy_frontoffice.php
- \brief Gestionnaire nomme eldy du menu du haut
- \version $Id$
-
- \remarks La construction d'un gestionnaire pour le menu du haut est simple:
- \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut
- \remarks doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
- \remarks ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
+ * \file htdocs/includes/menus/barre_top/eldy_frontoffice.php
+ * \brief Gestionnaire nomme eldy du menu du haut
+ * \version $Id$
+ *
+ * \remarks La construction d'un gestionnaire pour le menu du haut est simple:
+ * \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut
+ * \remarks doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
+ * \remarks ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
*/
--
GitLab