From 1d9993dcae6ecddbef85d5bd23de1ca601647f4b Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Tue, 2 Jul 2024 16:11:45 +0200 Subject: [PATCH] better code --- htdocs/core/menus/standard/eldy.lib.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index d4c627eb66b..697de73d879 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -75,7 +75,12 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = $menu_arr = array(); // Home - $landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (!getDolGlobalString('MAIN_LANDING_PAGE') ? '/index.php?mainmenu=home&leftmenu=home' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE); + $landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (!getDolGlobalString('MAIN_LANDING_PAGE') ? '' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE); + if (! empty($landingpage)) { + $landingpage = str_replace(DOL_URL_ROOT, '', dol_buildpath($landingpage, 1)); + } else { + $landingpage = '/index.php?mainmenu=home&leftmenu=home'; + } $menu_arr[] = array( 'name' => 'Home', 'link' => $landingpage, @@ -1121,7 +1126,13 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = $langs->load("users"); // Home - dashboard - $newmenu->add("/index.php?mainmenu=home&leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', ''); + $landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (!getDolGlobalString('MAIN_LANDING_PAGE') ? '' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE); + if (! empty($landingpage)) { + $landingpage = str_replace(DOL_URL_ROOT, '', dol_buildpath($landingpage, 1)); + } else { + $landingpage = '/index.php?mainmenu=home&leftmenu=home'; + } + $newmenu->add($landingpage, $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', ''); // Setup $newmenu->add("/admin/index.php?mainmenu=home&leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '');