diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 58b14616df8..23dc54262ed 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -35,6 +35,7 @@ $langs->load("companies"); $langs->load("products"); $langs->load("admin"); $langs->load("users"); +$langs->load("other"); // Security check if (!$user->admin) accessforbidden(); @@ -120,6 +121,11 @@ $head[$h][1] = $langs->trans("MenuAdmin"); $head[$h][2] = 'editor'; $h++; +$head[$h][0] = DOL_URL_ROOT."/admin/menus/other.php"; +$head[$h][1] = $langs->trans("Miscellanous"); +$head[$h][2] = 'misc'; +$h++; + dol_fiche_head($head, 'handler', $langs->trans("Menus")); diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php index bbfe2bc1216..e44b1c1aea1 100644 --- a/htdocs/admin/menus/index.php +++ b/htdocs/admin/menus/index.php @@ -247,6 +247,11 @@ $head[$h][1] = $langs->trans("MenuAdmin"); $head[$h][2] = 'editor'; $h++; +$head[$h][0] = DOL_URL_ROOT."/admin/menus/other.php"; +$head[$h][1] = $langs->trans("Miscellanous"); +$head[$h][2] = 'misc'; +$h++; + dol_fiche_head($head, 'editor', $langs->trans("Menus")); // Confirmation for remove menu entry diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index 9c66122e596..f9b772558c6 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -25,7 +25,6 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("users"); $langs->load("admin"); @@ -56,7 +55,6 @@ else if ($_GET["action"] == 'disable_hidemenu') * View */ -$form = new Form($db); llxHeader('',$langs->trans("Setup")); diff --git a/htdocs/includes/menus/standard/auguria.lib.php b/htdocs/includes/menus/standard/auguria.lib.php index e833ae2e880..7120ce7d3b4 100644 --- a/htdocs/includes/menus/standard/auguria.lib.php +++ b/htdocs/includes/menus/standard/auguria.lib.php @@ -84,7 +84,7 @@ function print_auguria_menu($db,$atarget,$type_user) print ''; print_end_menu_entry_auguria(); } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { if (! $type_user) { @@ -282,7 +282,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after) print '
'; } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { print ''; } @@ -295,7 +295,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after) { print ''; } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { print ''; } diff --git a/htdocs/includes/menus/standard/eldy.lib.php b/htdocs/includes/menus/standard/eldy.lib.php index 6436b6580e2..4b94132e662 100644 --- a/htdocs/includes/menus/standard/eldy.lib.php +++ b/htdocs/includes/menus/standard/eldy.lib.php @@ -94,7 +94,7 @@ function print_eldy_menu($db,$atarget,$type_user) print ''; print_end_menu_entry(); } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { if (! $type_user) { @@ -140,7 +140,7 @@ function print_eldy_menu($db,$atarget,$type_user) print ''; print_end_menu_entry(); } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { if (! $type_user) { @@ -181,7 +181,7 @@ function print_eldy_menu($db,$atarget,$type_user) print ''; print_end_menu_entry(); } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { if (! $type_user) { @@ -224,7 +224,7 @@ function print_eldy_menu($db,$atarget,$type_user) print ''; print_end_menu_entry(); } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { if (! $type_user) { @@ -266,7 +266,7 @@ function print_eldy_menu($db,$atarget,$type_user) print ''; print_end_menu_entry(); } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { if (! $type_user) { @@ -307,7 +307,7 @@ function print_eldy_menu($db,$atarget,$type_user) print ''; print_end_menu_entry(); } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { if (! $type_user) { @@ -348,7 +348,7 @@ function print_eldy_menu($db,$atarget,$type_user) print ''; print_end_menu_entry(); } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { if (! $type_user) { @@ -415,7 +415,7 @@ function print_eldy_menu($db,$atarget,$type_user) print ''; print_end_menu_entry(); } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { if (! $type_user) { @@ -476,7 +476,7 @@ function print_eldy_menu($db,$atarget,$type_user) print ''; print_end_menu_entry(); } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { if (! $type_user) { @@ -1415,7 +1415,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) { print ''."\n"; } - else + else if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { print ''."\n"; } @@ -1424,21 +1424,20 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) // Menu niveau > 0 if ($menu_array[$i]['level'] > 0) { - print '