lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try a better fix to avoid duplicate idmenu into url

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-18 20:19:41 +00:00
parent efbf6e18da
commit 23cce85877
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/menubase.class.php
View File

@ -20,7 +20,7 @@
/**
* \file htdocs/core/class/menubase.class.php
* \ingroup core
* \version $Id: menubase.class.php,v 1.26 2011/07/17 19:56:51 hregis Exp $
* \version $Id: menubase.class.php,v 1.27 2011/07/18 20:19:48 eldy Exp $
* \brief File of class to manage dynamic menu entries
* \remarks Initialy built by build_class_from_table on 2008-01-12 14:19
*/
@ -577,12 +577,11 @@ class Menubase
$tabMenu[$b][0] = $menu['rowid'];
$tabMenu[$b][1] = $menu['fk_menu'];
$tabMenu[$b][2] = $menu['url'];
// FIXME idmenu is already added in auguria.lib.php
/*if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b][2]))
if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b][2]))
{
if (preg_match('/\?/',$tabMenu[$b][2])) $tabMenu[$b][2].='&idmenu='.$menu['rowid'];
else $tabMenu[$b][2].='?idmenu='.$menu['rowid'];
}*/
}
$tabMenu[$b][3] = $chaine;
$tabMenu[$b][5] = $menu['target'];
$tabMenu[$b][6] = $menu['leftmenu'];

11
htdocs/includes/menus/standard/auguria.lib.php
View File

@ -21,7 +21,7 @@
/**
* \file htdocs/includes/menus/standard/auguria.lib.php
* \brief Library for file auguria menus
* \version $Id: auguria.lib.php,v 1.19 2011/07/18 00:58:35 eldy Exp $
* \version $Id: auguria.lib.php,v 1.20 2011/07/18 20:19:41 eldy Exp $
*/
@ -64,14 +64,15 @@ function print_auguria_menu($db,$atarget,$type_user)
else
{
$url=dol_buildpath($newTabMenu[$i]['url'],1);
if (! preg_match('/\?/',$url)) $url.='?';
else $url.='&';
if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url))
{
$url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&';
if (! preg_match('/\?/',$url)) $url.='?';
else $url.='&';
$url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
}
$url.="idmenu=".$newTabMenu[$i]['rowid'];
//$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad
}
$url=preg_replace('/__LOGIN__/',$user->login,$url);
// Define the class (top menu selected or not)
if (! empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname='class="tmenusel"';

10
htdocs/includes/menus/standard/eldy.lib.php
View File

@ -21,7 +21,7 @@
/**
* \file htdocs/includes/menus/standard/eldy.lib.php
* \brief Library for file eldy menus
* \version $Id: eldy.lib.php,v 1.59 2011/07/18 18:08:35 eldy Exp $
* \version $Id: eldy.lib.php,v 1.60 2011/07/18 20:19:41 eldy Exp $
*/
@ -460,13 +460,13 @@ function print_eldy_menu($db,$atarget,$type_user)
else
{
$url=dol_buildpath($newTabMenu[$i]['url'],1);
if (! preg_match('/\?/',$url)) $url.='?';
else $url.='&';
if (! preg_match('/mainmenu/i',$url) || ! preg_match('/leftmenu/i',$url))
{
$url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=&';
if (! preg_match('/\?/',$url)) $url.='?';
else $url.='&';
$url.='mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
}
$url.="idmenu=".$newTabMenu[$i]['rowid'];
//$url.="idmenu=".$newTabMenu[$i]['rowid']; // Already done by menuLoad
}
$url=preg_replace('/__LOGIN__/',$user->login,$url);