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

Prepare code to allow left menu add by modules

Browse Source
This commit is contained in:
Laurent Destailleur 2011-12-30 23:07:27 +01:00
parent 9036071265
commit 4ea77e6d55
4 changed files with 64 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev/skeletons/modMyModule.class.php
View File

@ -37,13 +37,13 @@ class modMyModule extends DolibarrModules
/** /**
* Constructor. Define names, constants, directories, boxes, permissions * Constructor. Define names, constants, directories, boxes, permissions
* *
* @param DoliDB $DB Database handler * @param DoliDB $db Database handler
*/ */
function modMyModule($DB) function modMyModule($db)
{ {
global $langs,$conf; global $langs,$conf;
$this->db = $DB; $this->db = $db;
// Id for module (must be unique). // Id for module (must be unique).
// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id). // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
@ -184,7 +184,7 @@ class modMyModule extends DolibarrModules
// $r++; // $r++;
// //
// Example to declare a Left Menu entry: // Example to declare a Left Menu entry:
// $this->menu[$r]=array( 'fk_menu'=>'r=0', // Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry) // $this->menu[$r]=array( 'fk_menu'=>'r=0', // Use r=value where r is index key used for the parent menu entry (higher parent must be a top menu entry) or use 'fk_mainmenu=xxx,fk_leftmenu=yyy'
// 'type'=>'left', // This is a Left menu entry // 'type'=>'left', // This is a Left menu entry
// 'titre'=>'MyModule left menu 1', // 'titre'=>'MyModule left menu 1',
// 'mainmenu'=>'mymodule', // 'mainmenu'=>'mymodule',

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

@ -85,9 +85,9 @@ class Menubase
$this->menu_handler=trim($this->menu_handler); $this->menu_handler=trim($this->menu_handler);
$this->module=trim($this->module); $this->module=trim($this->module);
$this->type=trim($this->type); $this->type=trim($this->type);
$this->mainmenu=trim($this->mainmenu); $this->mainmenu=trim($this->mainmenu); // If type='top'
$this->leftmenu=trim($this->leftmenu); $this->leftmenu=trim($this->leftmenu);
$this->fk_menu=trim($this->fk_menu); $this->fk_menu=trim($this->fk_menu); // If -1, fk_mainmenu and fk_leftmenu must be defined
$this->fk_mainmenu=trim($this->fk_mainmenu); $this->fk_mainmenu=trim($this->fk_mainmenu);
$this->fk_leftmenu=trim($this->fk_leftmenu); $this->fk_leftmenu=trim($this->fk_leftmenu);
$this->position=trim($this->position); $this->position=trim($this->position);
@ -146,8 +146,8 @@ class Menubase
$sql.= " '".$conf->entity."',"; $sql.= " '".$conf->entity."',";
$sql.= " '".$this->module."',"; $sql.= " '".$this->module."',";
$sql.= " '".$this->type."',"; $sql.= " '".$this->type."',";
$sql.= " '".$this->mainmenu."',"; $sql.= " ".($this->mainmenu?"'".$this->mainmenu."'":"''").","; // Can't be null
$sql.= " '".$this->leftmenu."',"; $sql.= " ".($this->leftmenu?"'".$this->leftmenu."'":"null").",";
$sql.= " '".$this->fk_menu."',"; $sql.= " '".$this->fk_menu."',";
$sql.= " ".($this->fk_mainmenu?"'".$this->fk_mainmenu."'":"null").","; $sql.= " ".($this->fk_mainmenu?"'".$this->fk_mainmenu."'":"null").",";
$sql.= " ".($this->fk_leftmenu?"'".$this->fk_leftmenu."'":"null").","; $sql.= " ".($this->fk_leftmenu?"'".$this->fk_leftmenu."'":"null").",";
@ -392,22 +392,22 @@ class Menubase
for ($x = 0; $x < $num; $x++) for ($x = 0; $x < $num; $x++)
{ {
//si un element a pour pere : $pere //si un element a pour pere : $pere
if ($tab[$x][1] == $pere) if ($tab[$x]['fk_menu'] == $pere)
{ {
if ($tab[$x][7]) if ($tab[$x]['enabled'])
{ {
$leftmenuConstraint = true; $leftmenuConstraint = true;
if ($tab[$x][6]) if ($tab[$x]['leftmenu'])
{ {
$leftmenuConstraint = verifCond($tab[$x][6]); $leftmenuConstraint = verifCond($tab[$x]['leftmenu']);
} }
if ($leftmenuConstraint) if ($leftmenuConstraint)
{ {
//print 'name='.$tab[$x][3].' pere='.$pere." ".$tab[$x][6]; //print 'name='.$tab[$x][3].' pere='.$pere." ".$tab[$x][6];
$this->newmenu->add((! preg_match("/^(http:\/\/|https:\/\/)/i",$tab[$x][2])) ? $tab[$x][2] : $tab[$x][2], $tab[$x][3], $rang -1, $tab[$x][4], $tab[$x][5], $tab[$x][8]); $this->newmenu->add((! preg_match("/^(http:\/\/|https:\/\/)/i",$tab[$x]['url'])) ? $tab[$x]['url'] : $tab[$x]['url'], $tab[$x]['titre'], $rang -1, $tab[$x]['perms'], $tab[$x]['atarget'], $tab[$x]['mainmenu']);
$this->recur($tab, $tab[$x][0], $rang +1, $leftmenu); $this->recur($tab, $tab[$x]['rowid'], $rang +1, $leftmenu);
} }
} }
} }
@ -443,20 +443,20 @@ class Menubase
{ {
foreach($tabMenu as $val) foreach($tabMenu as $val)
{ {
if ($val[9]=='top') if ($val['type']=='top')
{ {
$newTabMenu[$i]['rowid']=$val['rowid'];
$newTabMenu[$i]['fk_menu']=$val['fk_menu'];
$newTabMenu[$i]['url']=$val['url'];
$newTabMenu[$i]['titre']=$val['titre'];
$newTabMenu[$i]['right']=$val['perms'];
$newTabMenu[$i]['atarget']=$val['atarget'];
$newTabMenu[$i]['leftmenu']=$val['leftmenu'];
$newTabMenu[$i]['enabled']=$val['enabled'];
$newTabMenu[$i]['mainmenu']=$val['mainmenu'];
$newTabMenu[$i]['type']=$val['type'];
$newTabMenu[$i]['lang']=$val['langs'];
$newTabMenu[$i]['rowid']=$val[0];
$newTabMenu[$i]['fk_menu']=$val[1];
$newTabMenu[$i]['url']=$val[2];
$newTabMenu[$i]['titre']=$val[3];
$newTabMenu[$i]['right']=$val[4];
$newTabMenu[$i]['atarget']=$val[5];
$newTabMenu[$i]['leftmenu']=$val[6];
$newTabMenu[$i]['enabled']=$val[7];
$newTabMenu[$i]['mainmenu']=$val[8];
$newTabMenu[$i]['type']=$val[9];
$newTabMenu[$i]['lang']=$val[10];
$i++; $i++;
} }
} }
@ -469,7 +469,7 @@ class Menubase
* Load entries found in database in a menu array. * Load entries found in database in a menu array.
* *
* @param array $newmenu Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy) * @param array $newmenu Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy)
* @param string $mainmenu Value for mainmenu that defines top menu of left menu * @param string $mainmenu Value for mainmenu that defines top menu of left menu to load
* @param string $myleftmenu Value that defines leftmenu * @param string $myleftmenu Value that defines leftmenu
* @param int $type_user 0=Internal,1=External,2=All * @param int $type_user 0=Internal,1=External,2=All
* @param string $menu_handler Name of menu_handler used (auguria, eldy...) * @param string $menu_handler Name of menu_handler used (auguria, eldy...)
@ -483,9 +483,10 @@ class Menubase
$leftmenu=$myleftmenu; // To export to dol_eval function $leftmenu=$myleftmenu; // To export to dol_eval function
// We initialize newmenu to return with first already found menu entries
$this->newmenu = $newmenu; $this->newmenu = $newmenu;
// Load datas into tabMenu // Load datas from database into $tabMenu
if (count($tabMenu) == 0) if (count($tabMenu) == 0)
{ {
$this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu); $this->menuLoad($leftmenu, $type_user, $menu_handler, $tabMenu);
@ -498,9 +499,9 @@ class Menubase
{ {
foreach($tabMenu as $val) foreach($tabMenu as $val)
{ {
if ($val[9] == 'top' && $val[8] == $mainmenu) if ($val['type'] == 'top' && $val['mainmenu'] == $mainmenu) // 9 is type, 8 is mainmenu
{ {
$menutopid=$val[0]; $menutopid=$val['rowid'];
break; break;
} }
} }
@ -514,12 +515,12 @@ class Menubase
/** /**
* Load entries found in database in a menu array. * Load entries found in database to $tabMenu.
* *
* @param string $myleftmenu Value for left that defined leftmenu * @param string $myleftmenu Value for left that defined leftmenu
* @param int $type_user 0=Internal,1=External,2=All * @param int $type_user 0=Internal,1=External,2=All
* @param string $menu_handler Name of menu_handler used (auguria, eldy...) * @param string $menu_handler Name of menu_handler used (auguria, eldy...)
* @param array &$tabMenu If array with menu entries already load, we put this array here (in most cases, it's empty) * @param array &$tabMenu Array to store new entries found (in most cases, it's empty, but may be alreay filled)
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
*/ */
function menuLoad($myleftmenu, $type_user, $menu_handler, &$tabMenu) function menuLoad($myleftmenu, $type_user, $menu_handler, &$tabMenu)
@ -530,7 +531,7 @@ class Menubase
$menutopid=0; $menutopid=0;
$leftmenu=$myleftmenu; // To export to dol_eval function $leftmenu=$myleftmenu; // To export to dol_eval function
$sql = "SELECT m.rowid, m.type, m.fk_menu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu"; $sql = "SELECT m.rowid, m.type, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu";
$sql.= " FROM ".MAIN_DB_PREFIX."menu as m"; $sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
$sql.= " WHERE m.entity = ".$conf->entity; $sql.= " WHERE m.entity = ".$conf->entity;
$sql.= " AND m.menu_handler in('".$menu_handler."','all')"; $sql.= " AND m.menu_handler in('".$menu_handler."','all')";
@ -539,7 +540,7 @@ class Menubase
// If type_user == 2, no test required // If type_user == 2, no test required
$sql.= " ORDER BY m.position, m.rowid"; $sql.= " ORDER BY m.position, m.rowid";
dol_syslog("Menubase::menuLeftCharger sql=".$sql); dol_syslog(get_class($this)."::menuLeftCharger sql=".$sql);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -615,6 +616,28 @@ class Menubase
$tabMenu[$b][9] = $menu['type']; $tabMenu[$b][9] = $menu['type'];
$tabMenu[$b][10] = $menu['langs']; $tabMenu[$b][10] = $menu['langs'];
// We complete tabMenu
$tabMenu[$b]['rowid'] = $menu['rowid'];
$tabMenu[$b]['fk_menu'] = $menu['fk_menu'];
$tabMenu[$b]['url'] = $menu['url'];
if (! preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$b]['url']))
{
if (preg_match('/\?/',$tabMenu[$b]['url'])) $tabMenu[$b]['url'].='&amp;idmenu='.$menu['rowid'];
else $tabMenu[$b]['url'].='?idmenu='.$menu['rowid'];
}
$tabMenu[$b]['titre'] = $chaine;
$tabMenu[$b]['target'] = $menu['target'];
$tabMenu[$b]['leftmenu'] = $menu['leftmenu'];
if (! isset($tabMenu[$b]['perms'])) $tabMenu[$b]['perms'] = $perms;
else $tabMenu[$b]['perms'] = ($tabMenu[$b]['perms'] && $perms);
if (! isset($tabMenu[$b]['enabled'])) $tabMenu[$b]['enabled'] = $enabled;
else $tabMenu[$b]['enabled'] = ($tabMenu[$b]['enabled'] && $enabled);
$tabMenu[$b]['mainmenu'] = $menu['mainmenu'];
$tabMenu[$b]['type'] = $menu['type'];
$tabMenu[$b]['langs'] = $menu['langs'];
$tabMenu[$b]['fk_mainmenu'] = $menu['fk_mainmenu'];
$tabMenu[$b]['fk_leftmenu'] = $menu['fk_leftmenu'];
$b++; $b++;
$a++; $a++;
} }

12
htdocs/core/menus/standard/eldy.lib.php
View File

@ -1257,22 +1257,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
$newmenu->add("/imports/import.php?leftmenu=import",$langs->trans("NewImport"),1, $user->rights->import->run); $newmenu->add("/imports/import.php?leftmenu=import",$langs->trans("NewImport"),1, $user->rights->import->run);
} }
if (! empty($conf->domain->enabled)) /*if (! empty($conf->submiteverywhere->enabled))
{
$langs->load("domains");
$newmenu->add("/domain/index.php?leftmenu=export",$langs->trans("DomainNames"),0, $user->rights->domain->read);
$newmenu->add("/domain/fiche.php?action=create&leftmenu=export",$langs->trans("NewDomain"),1, $user->rights->domain->create);
$newmenu->add("/domain/index.php?leftmenu=export",$langs->trans("List"),1, $user->rights->domain->read);
}
if (! empty($conf->submiteverywhere->enabled))
{ {
$langs->load("submiteverywhere@submiteverywhere"); $langs->load("submiteverywhere@submiteverywhere");
$newmenu->add("/submiteverywhere/index.php?leftmenu=submiteverywhere", $langs->trans("News"), 0, $user->rights->submiteverywhere->read); $newmenu->add("/submiteverywhere/index.php?leftmenu=submiteverywhere", $langs->trans("News"), 0, $user->rights->submiteverywhere->read);
$newmenu->add("/submiteverywhere/fiche.php?leftmenu=submiteverywhere&amp;action=create", $langs->trans("NewNews"), 1, $user->rights->submiteverywhere->create); $newmenu->add("/submiteverywhere/fiche.php?leftmenu=submiteverywhere&amp;action=create", $langs->trans("NewNews"), 1, $user->rights->submiteverywhere->create);
$newmenu->add("/submiteverywhere/liste.php?leftmenu=submiteverywhere", $langs->trans("List"), 1, $user->rights->submiteverywhere->read); $newmenu->add("/submiteverywhere/liste.php?leftmenu=submiteverywhere", $langs->trans("List"), 1, $user->rights->submiteverywhere->read);
} }*/
} }
/* /*

11
htdocs/core/modules/DolibarrModules.class.php
View File

@ -92,7 +92,7 @@ abstract class DolibarrModules
// Insert permission definitions of module into llx_rights_def. If user is admin, grant this permission to user. // Insert permission definitions of module into llx_rights_def. If user is admin, grant this permission to user.
if (! $err) $err+=$this->insert_permissions(1); if (! $err) $err+=$this->insert_permissions(1);
// Insere les constantes associees au module dans llx_const // Insert specific menus entries into database
if (! $err) $err+=$this->insert_menus(); if (! $err) $err+=$this->insert_menus();
// Create module's directories // Create module's directories
@ -1090,7 +1090,7 @@ abstract class DolibarrModules
function insert_menus() function insert_menus()
{ {
global $user; global $user;
require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/menubase.class.php");
$err=0; $err=0;
@ -1122,7 +1122,7 @@ abstract class DolibarrModules
$foundparent=1; $foundparent=1;
} }
} }
elseif (preg_match('/mainmenu=(.*),leftmenu=(.*)/',$fk_parent,$reg)) elseif (preg_match('/fk_mainmenu=(.*),fk_leftmenu=(.*)/',$fk_parent,$reg))
{ {
$menu->fk_menu=-1; $menu->fk_menu=-1;
$menu->fk_mainmenu=$reg[1]; $menu->fk_mainmenu=$reg[1];
@ -1138,15 +1138,14 @@ abstract class DolibarrModules
} }
$menu->type=$this->menu[$key]['type']; $menu->type=$this->menu[$key]['type'];
$menu->mainmenu=$this->menu[$key]['mainmenu']; $menu->mainmenu=$this->menu[$key]['mainmenu'];
$menu->leftmenu=isset($this->menu[$key]['leftmenu'])?$this->menu[$key]['leftmenu']:'';
$menu->titre=$this->menu[$key]['titre']; $menu->titre=$this->menu[$key]['titre'];
$menu->leftmenu=isset($this->menu[$key]['leftmenu'])?$this->menu[$key]['leftmenu']:0;
$menu->url=$this->menu[$key]['url']; $menu->url=$this->menu[$key]['url'];
$menu->langs=$this->menu[$key]['langs']; $menu->langs=$this->menu[$key]['langs'];
$menu->position=$this->menu[$key]['position']; $menu->position=$this->menu[$key]['position'];
$menu->perms=$this->menu[$key]['perms']; $menu->perms=$this->menu[$key]['perms'];
$menu->target=$this->menu[$key]['target']; $menu->target=$this->menu[$key]['target'];
$menu->user=$this->menu[$key]['user']; $menu->user=$this->menu[$key]['user'];
//$menu->constraint=$this->menu[$key]['constraint'];
$menu->enabled=isset($this->menu[$key]['enabled'])?$this->menu[$key]['enabled']:0; $menu->enabled=isset($this->menu[$key]['enabled'])?$this->menu[$key]['enabled']:0;
if (! $err) if (! $err)
@ -1159,7 +1158,7 @@ abstract class DolibarrModules
else else
{ {
$this->error=$menu->error; $this->error=$menu->error;
dol_syslog('DolibarrModules::insert_menus result='.$result." ".$this->error, LOG_ERR); dol_syslog(get_class($this).'::insert_menus result='.$result." ".$this->error, LOG_ERR);
$err++; $err++;
break; break;
} }