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

Fix: Loading of boxes from external modules

Browse Source
This commit is contained in:
Laurent Destailleur 2013-06-03 11:33:13 +02:00
parent a1a8fac25c
commit 7dc984fd6f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/class/infobox.class.php
View File

@ -87,7 +87,7 @@ class InfoBox
{ {
if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs)) if (preg_match('/^([^@]+)@([^@]+)$/i',$obj->file,$regs))
{ {
$boxname = $regs[1]; $boxname = preg_replace('/.php$/i','',$regs[1]);
$module = $regs[2]; $module = $regs[2];
$relsourcefile = "/".$module."/core/boxes/".$boxname.".php"; $relsourcefile = "/".$module."/core/boxes/".$boxname.".php";
} }
@ -95,9 +95,9 @@ class InfoBox
{ {
$boxname=preg_replace('/.php$/i','',$obj->file); $boxname=preg_replace('/.php$/i','',$obj->file);
$relsourcefile = "/core/boxes/".$boxname.".php"; $relsourcefile = "/core/boxes/".$boxname.".php";
} }
// TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then // TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
// the "enabled" condition for modules forbidden for external users and the depends condition can be done. // the "enabled" condition for modules forbidden for external users and the depends condition can be done.
// Goal is to avoid making a new instance for each boxes returned by select. // Goal is to avoid making a new instance for each boxes returned by select.
@ -135,14 +135,15 @@ class InfoBox
foreach($box->depends as $module) foreach($box->depends as $module)
{ {
//print $boxname.'-'.$module.'<br>'; //print $boxname.'-'.$module.'<br>';
if (empty($conf->$module->enabled)) $enabled=0; $tmpmodule=preg_replace('/@[^@]+/','',$module);
if (empty($conf->$tmpmodule->enabled)) $enabled=0;
} }
} }
//print 'xx module='.$module.' enabled='.$enabled; //print 'xx module='.$module.' enabled='.$enabled;
if ($enabled) $boxes[]=$box; if ($enabled) $boxes[]=$box;
else unset($box); else unset($box);
} }
} }
$j++; $j++;
} }