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

Doc

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-19 15:05:17 +00:00
parent f344029184
commit 04a047076b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,6 +431,7 @@ class Menubase
* @param type_user 0=Internal,1=External,2=All * @param type_user 0=Internal,1=External,2=All
* @param mainmenu Value for mainmenu that defined top menu * @param mainmenu Value for mainmenu that defined top menu
* @param menu_handler Name of menu_handler used (auguria, eldy...) * @param menu_handler Name of menu_handler used (auguria, eldy...)
* @param tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @return array Return array with menu entries for top menu * @return array Return array with menu entries for top menu
*/ */
function menuTopCharger($mainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu=null) function menuTopCharger($mainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu=null)
@ -439,9 +440,12 @@ class Menubase
global $leftmenu,$rights; // To export to dol_eval function global $leftmenu,$rights; // To export to dol_eval function
$leftmenu=$myleftmenu; // To export to dol_eval function $leftmenu=$myleftmenu; // To export to dol_eval function
// Load datas into tabMenu // Load datas into tabMenu
$this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu); if (sizeof($tabMenu) == 0)
{
$this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu);
}
$newTabMenu=array(); $newTabMenu=array();
$i=0; $i=0;
@ -449,7 +453,7 @@ class Menubase
{ {
if ($val[9]=='top') if ($val[9]=='top')
{ {
$newTabMenu[$i]['rowid']=$val[0]; $newTabMenu[$i]['rowid']=$val[0];
$newTabMenu[$i]['fk_menu']=$val[1]; $newTabMenu[$i]['fk_menu']=$val[1];
$newTabMenu[$i]['url']=$val[2]; $newTabMenu[$i]['url']=$val[2];
@ -489,14 +493,10 @@ class Menubase
// Load datas into tabMenu // Load datas into tabMenu
if (sizeof($tabMenu) == 0) if (sizeof($tabMenu) == 0)
{
$this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu);
//var_dump($tabMenu);
}
else
{ {
$this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu); $this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu);
} }
//var_dump($tabMenu);
// Define menutopid // Define menutopid
$menutopid=''; $menutopid='';
@ -509,7 +509,7 @@ class Menubase
} }
} }
// Now edit this->newmenu to add entries found into tabMenu that are in childs of mainmenu claimed // Now edit this->newmenu->list to add entries found into tabMenu that are in childs of mainmenu claimed
$this->recur($tabMenu, $menutopid, 1, $leftmenu); $this->recur($tabMenu, $menutopid, 1, $leftmenu);
return $this->newmenu; return $this->newmenu;
@ -616,7 +616,7 @@ class Menubase
$tabMenu[$b][8] = $menu['mainmenu']; $tabMenu[$b][8] = $menu['mainmenu'];
$tabMenu[$b][9] = $menu['type']; $tabMenu[$b][9] = $menu['type'];
$tabMenu[$b][10] = $menu['langs']; $tabMenu[$b][10] = $menu['langs'];
$b++; $b++;
$a++; $a++;
} }