'.$langs->trans('DetailEnabled');
if (! empty($menu->enabled)) print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->enabled,1)).')';
print '
';
// Perms
- print '
'.$langs->trans('Rights').'
'.$langs->trans('DetailRight');
+ print '
'.$langs->trans('Rights').'
'.$langs->trans('DetailRight');
if (! empty($menu->perms)) print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->perms,1)).')';
print '
';
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 7f4ab7c6d4a..86b27948389 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -589,7 +589,6 @@ class Menubase
$a = 0;
$b = 0;
- $oldrowid=0;
while ($a < $numa)
{
//$objm = $this->db->fetch_object($resql);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 2bf4671504f..ce2145d3986 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -468,6 +468,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{
global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
+ //var_dump($tabMenu);
+
$newmenu = $menu;
$mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
@@ -523,7 +525,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
* We update newmenu with entries found into database
* --------------------------------------------------
*/
- if ($mainmenu)
+ if ($mainmenu) // If this is empty, loading hard coded menu and loading personalised menu will fail
{
/*
* Menu HOME
@@ -1628,6 +1630,9 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
}
}
+ //var_dump($tabMenu); //
+ //var_dump($newmenu->liste);
+
// Build final $menu_array = $menu_array_before +$newmenu->liste + $menu_array_after
//var_dump($menu_array_before);exit;
//var_dump($menu_array_after);exit;
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 049956e82e2..4992fc6d11c 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -31,7 +31,7 @@ class MenuManager
* @var DoliDB Database handler.
*/
public $db;
-
+
var $type_user; // Put 0 for internal users, 1 for external users
var $atarget=""; // To store default target to use onto links
var $name="eldy";
@@ -109,6 +109,7 @@ class MenuManager
$menuArbo = new Menubase($this->db,'eldy');
$menuArbo->menuLoad($mainmenu, $leftmenu, $this->type_user, 'eldy', $tabMenu);
$this->tabMenu=$tabMenu;
+ //var_dump($tabMenu);
//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
}
@@ -116,7 +117,7 @@ class MenuManager
/**
* Show menu.
- * Module defined in sql tables are stored into this->tabMenu BEFORE this is called.
+ * Module defined in sql tables were stored into $this->tabMenu BEFORE this is called.
*
* @param string $mode 'top', 'topnb', 'left', 'jmobile' (used to get full xml ul/li menu)
* @param array $moredata An array with more data to output
@@ -126,6 +127,8 @@ class MenuManager
{
global $conf, $langs, $user;
+ //var_dump($this->tabMenu);
+
require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
if ($this->type_user == 1)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8d6e8e39b04..d580fa90809 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1844,6 +1844,7 @@ LoadThirdPartyFromNameOrCreate=Load thirdparty from name (create if not found)
WithDolTrackingID=Dolibarr Tracking ID found
WithoutDolTrackingID=Dolibarr Tracking ID not found
FormatZip=Zip
+MainMenuCode=Menu entry code (mainmenu)
##### Resource ####
ResourceSetup=Configuration du module Resource
UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 438fff1eb15..0f2f8af452e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -510,7 +510,7 @@ if (! defined('NOLOGIN'))
$error++;
}
// End Call of triggers
-
+
// Hooks on failed login
$action='';
$hookmanager->initHooks(array('login'));
@@ -626,13 +626,13 @@ if (! defined('NOLOGIN'))
$langs->loadLangs(array('main', 'errors'));
$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
-
+
$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
}
if ($resultFetchUser < 0)
{
$_SESSION["dol_loginmesg"]=$user->error;
-
+
$user->trigger_mesg=$user->error;
}
@@ -644,7 +644,7 @@ if (! defined('NOLOGIN'))
$error++;
}
// End call triggers
-
+
// Hooks on failed login
$action='';
$hookmanager->initHooks(array('login'));
@@ -689,7 +689,7 @@ if (! defined('NOLOGIN'))
if ($resultFetchUser < 0)
{
$_SESSION["dol_loginmesg"]=$user->error;
-
+
$user->trigger_mesg=$user->error;
}
@@ -701,7 +701,7 @@ if (! defined('NOLOGIN'))
$error++;
}
// End call triggers
-
+
// Hooks on failed login
$action='';
$hookmanager->initHooks(array('login'));
@@ -799,7 +799,7 @@ if (! defined('NOLOGIN'))
$error++;
}
// End call triggers
-
+
// Hooks on successfull login
$action='';
$hookmanager->initHooks(array('login'));
@@ -1074,7 +1074,7 @@ if (! function_exists("llxHeader"))
if (empty($conf->dol_hide_leftmenu))
{
- left_menu('', $help_url, '', '', 1, $title, 1);
+ left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retreived with a global $menumanager inside this function
}
// main area