From 5228dbb3e6ac90004a4b113f9932d6a0cd66b59d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 6 Jul 2009 13:19:52 +0000
Subject: [PATCH] Fix: Target was wrong on url build with dynamic menu

---
 htdocs/includes/menus/barre_top/auguria_backoffice.php  | 2 +-
 htdocs/includes/menus/barre_top/auguria_frontoffice.php | 2 +-
 htdocs/includes/menus/barre_top/eldy_backoffice.php     | 2 +-
 htdocs/includes/menus/barre_top/eldy_frontoffice.php    | 2 +-
 htdocs/includes/menus/barre_top/empty.php               | 6 +++---
 htdocs/includes/menus/barre_top/rodolphe.php            | 2 +-
 htdocs/rapport/pre.inc.php                              | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/includes/menus/barre_top/auguria_backoffice.php b/htdocs/includes/menus/barre_top/auguria_backoffice.php
index 6b30852c5ea..9a79722f5d1 100644
--- a/htdocs/includes/menus/barre_top/auguria_backoffice.php
+++ b/htdocs/includes/menus/barre_top/auguria_backoffice.php
@@ -101,7 +101,7 @@ class MenuTop {
 					if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<li class="tmenu" id="li_'.$idsel.'">';
 					else print '<td class="tmenu" id="td_'.$idsel.'">';
 
-					print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
+					print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
 					print $tabMenu[$i]['titre'];
 					print '</a>';
 
diff --git a/htdocs/includes/menus/barre_top/auguria_frontoffice.php b/htdocs/includes/menus/barre_top/auguria_frontoffice.php
index 29472c0d75b..cb7372bfe6b 100644
--- a/htdocs/includes/menus/barre_top/auguria_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/auguria_frontoffice.php
@@ -101,7 +101,7 @@ class MenuTop {
 					if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<li class="tmenu" id="li_'.$idsel.'">';
 					else print '<td class="tmenu" id="td_'.$idsel.'">';
 
-					print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
+					print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
 					print $tabMenu[$i]['titre'];
 					print '</a>';
 
diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php
index 7a1a7ece1c3..c310f6c7377 100644
--- a/htdocs/includes/menus/barre_top/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php
@@ -433,7 +433,7 @@ class MenuTop {
 					if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
 					else $class='class="tmenu"';
 					print '<td class="tmenu" id="td_'.$idsel.'">';
-					print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
+					print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
 					print $tabMenu[$i]['titre'];
 					print '</a>';
 					print '</td>';
diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
index 83970b08bb2..95ab2038d90 100644
--- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
@@ -433,7 +433,7 @@ class MenuTop {
 					if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
 					else $class='class="tmenu"';
 					print '<td class="tmenu" id="td_'.$idsel.'">';
-					print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":"").'>';
+					print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
 					print $tabMenu[$i]['titre'];
 					print '</a>';
 					print '</td>';
diff --git a/htdocs/includes/menus/barre_top/empty.php b/htdocs/includes/menus/barre_top/empty.php
index 672d8b9d4a0..6462935c5e5 100644
--- a/htdocs/includes/menus/barre_top/empty.php
+++ b/htdocs/includes/menus/barre_top/empty.php
@@ -55,7 +55,7 @@ class MenuTop {
 
 		// Menu Home
 	    print '<td class="tmenu">';
-	    print '<a href="'.DOL_URL_ROOT.'/index.php?mainmenu=home">'.$langs->trans("Home").'</a>';
+	    print '<a href="'.DOL_URL_ROOT.'/index.php?mainmenu=home"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'</a>';
 	    print '</td>';
 
 	    // Put here top menu entries
@@ -93,14 +93,14 @@ class MenuTop {
 					if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
 					else $class='class="tmenu"';
 					print '<td class="tmenu">';
-					print '<a '.$class.' '.$idsel.'href="'.$url.'"'.($this->atarget?" target=$this->atarget":"").'>';
+					print '<a '.$class.' '.$idsel.'href="'.$url.'"'.($this->atarget?" target=$this->atarget":($this->atarget?" target=$this->atarget":"")).'>';
 					print $tabMenu[$i]['titre'];
 					print '</a>';
 					print '</td>';
 	        	}
 	        	else
 	        	{
-	        		if (! $this->hideifnotallowed) 
+	        		if (! $this->hideifnotallowed)
 					{
 						print '<td class="tmenu">';
 						print '<a class="tmenudisabled" '.$idsel.'href="#">'.$tabMenu[$i]['titre'].'</a>';
diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php
index db656cdf5e2..27eecd19af0 100644
--- a/htdocs/includes/menus/barre_top/rodolphe.php
+++ b/htdocs/includes/menus/barre_top/rodolphe.php
@@ -372,7 +372,7 @@ class MenuTop {
 	        		}
 	        		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 '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
 	        		print $tabMenu[$i]['titre'];
 	        		print '</a></td>';
 	        	}
diff --git a/htdocs/rapport/pre.inc.php b/htdocs/rapport/pre.inc.php
index 80b700f8898..e1397651f7a 100644
--- a/htdocs/rapport/pre.inc.php
+++ b/htdocs/rapport/pre.inc.php
@@ -30,7 +30,7 @@ function llxHeader($head = '', $title='', $help_url='')
 	 *
 	 *
 	 */
-	top_menu($head);
+	top_menu($head, $title);
 
 	$menu = new Menu();