vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean code of menu

Browse source
This commit is contained in:
ldestailleur 2025-03-23 16:18:38 +01:00
parent fd243a00f6
commit f4310e465f
5 changed files with 98 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
htdocs/core/menus/standard/auguria.lib.php
View file

@ -57,10 +57,6 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
if (empty($noout)) {
print_start_menu_array_auguria();
}
global $usemenuhider;
$usemenuhider = 1;
@ -145,9 +141,17 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
// Sort on position
$menu->liste = dol_sort_array($menu->liste, 'position');
// If noout is on (for jmobile div menu for example)
if ($noout) {
return 0;
}
// Output menu entries
print_start_menu_array_auguria();
// Show logo company
if (!getDolGlobalString('MAIN_MENU_INVERT') && empty($noout) && getDolGlobalString('MAIN_SHOW_LOGO') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
if (!getDolGlobalString('MAIN_MENU_INVERT') && getDolGlobalString('MAIN_SHOW_LOGO') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
//$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
$mysoc->logo_squarred_mini = (!getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI') ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
@ -177,16 +181,14 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
print_end_menu_entry_auguria(4);
}
if (empty($noout)) {
foreach ($menu->liste as $menuval) {
print_start_menu_entry_auguria($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget), $menuval);
print_end_menu_entry_auguria($menuval['enabled']);
}
foreach ($menu->liste as $menuval) {
print_start_menu_entry_auguria($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget), $menuval);
print_end_menu_entry_auguria($menuval['enabled']);
}
$showmode = 1;
if (empty($noout) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
$showmode = 1;
print_start_menu_entry_auguria('', 'class="tmenuend"', $showmode);
print_end_menu_entry_auguria($showmode);
print_end_menu_array_auguria();

5
htdocs/core/menus/standard/auguria_menu.php
View file

@ -94,8 +94,6 @@ class MenuManager
*/
public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
{
global $conf, $user, $langs;
// We save into session the main menu selected
if (GETPOSTISSET("mainmenu")) {
$_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
@ -149,7 +147,7 @@ class MenuManager
/**
* Show menu.
* Output menu on screen.
* Menu 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)
@ -335,6 +333,7 @@ class MenuManager
}
}
// Add font-awesome (if $val2['level'] == 0, we are on level2
if ($val2['level'] == 0 && !empty($val2['prefix'])) {
print $val2['prefix'];
} else {

36
htdocs/core/menus/standard/eldy.lib.php
View file

@ -58,10 +58,6 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
if (empty($noout)) {
print_start_menu_array();
}
global $usemenuhider;
$usemenuhider = 1;
@ -467,7 +463,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
'submenus' => array(),
);
// Add menus
// Add menus previously had code declared
foreach ($menu_arr as $key => $smenu) {
$smenu = (object) $smenu;
@ -495,11 +491,11 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
}
}
// Show personalized menus
// Load menu with top entries of non hardcoded core menu enties and external modules
$menuArbo = new Menubase($db, 'eldy');
$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'eldy', $tabMenu); // Set tabMenu with only top entries of non hardcoded core menu enties and external modules
$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'eldy', $tabMenu); // Return tabMenu with only top entries
// Add menu with top entries of non hardcoded core menu enties and external modules
$num = count($newTabMenu);
for ($i = 0; $i < $num; $i++) {
//var_dump($type_user.' '.$newTabMenu[$i]['url'].' '.$showmode.' '.$newTabMenu[$i]['perms']);
@ -561,9 +557,17 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
// Sort on position
$menu->liste = dol_sort_array($menu->liste, 'position');
// If noout is on (for jmobile div menu for example)
if ($noout) {
return 0;
}
// Output menu entries
print_start_menu_array();
// Show logo company
if (!getDolGlobalString('MAIN_MENU_INVERT') && empty($noout) && getDolGlobalString('MAIN_SHOW_LOGO') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
if (!getDolGlobalString('MAIN_MENU_INVERT') && getDolGlobalString('MAIN_SHOW_LOGO') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
//$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
$mysoc->logo_squarred_mini = (!getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI') ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
@ -593,16 +597,14 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
}
//var_dump($menu->liste);
if (empty($noout)) {
foreach ($menu->liste as $menuval) {
print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget), $menuval);
print_end_menu_entry($menuval['enabled']);
}
foreach ($menu->liste as $menuval) {
print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget), $menuval);
print_end_menu_entry($menuval['enabled']);
}
$showmode = 1;
if (empty($noout) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
$showmode = 1;
print_start_menu_entry('', 'class="tmenuend"', $showmode);
print_end_menu_entry($showmode);
print_end_menu_array();

26
htdocs/core/menus/standard/eldy_menu.php
View file

@ -37,17 +37,17 @@ class MenuManager
public $db;
/**
* @var int Put 0 for internal users, 1 for external users
* @var int<0,1> 0 for internal users, 1 for external users
*/
public $type_user;
public $type_user = 0;
/**
* @var string To store default target to use onto links
* @var string To save the default target to use onto links
*/
public $atarget = "";
/**
* @var string Menu name
* @var string Menu name
*/
public $name = "eldy";
@ -93,8 +93,6 @@ class MenuManager
*/
public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
{
global $conf, $user, $langs;
// We save into session the main menu selected
if (GETPOSTISSET("mainmenu")) {
$_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
@ -145,7 +143,7 @@ class MenuManager
/**
* Show menu.
* Output menu on screen.
* Menu defined in sql tables were stored into $this->tabMenu BEFORE this is called.
*
* @param 'top'|'topnb'|'left'|'leftdropdown'|'jmobile' $mode 'top', 'topnb', 'left', 'leftdropdown', 'jmobile' (used to get full xml ul/li menu)
@ -260,7 +258,7 @@ class MenuManager
if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") { // No translation
if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab', 'takepos'))) {
print $langs->trans("Access");
print $langs->trans("aaaAccess");
} else {
print $langs->trans("Dashboard");
}
@ -332,12 +330,12 @@ class MenuManager
}
print $disabled.'">'; // ui-btn to highlight on clic
if ($relurl2) {
if ($val2['enabled']) { // Allowed
print '<a href="'.$relurl2.'"';
//print ' data-ajax="false"';
print '>';
if ($val2['enabled']) {
// Allowed
print '<a href="'.$relurl2.'">';
$lastlevel2[$val2['level']] = 'enabled';
} else { // Not allowed but visible (greyed)
} else {
// Not allowed but visible (greyed)
print '<a href="#" class="vsmenudisabled">';
$lastlevel2[$val2['level']] = 'greyed';
}
@ -352,6 +350,8 @@ class MenuManager
// Add font-awesome (if $val2['level'] == 0, we are on level2
if ($val2['level'] == 0 && !empty($val2['prefix'])) {
print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright"
} else {
print '<i class="fa fa-does-not-exists fa-fw paddingright pictofixedwidth"></i>';
}
print $val2['titre'];

82
htdocs/core/menus/standard/empty.php
View file

@ -22,7 +22,7 @@
*/
/**
* Class to manage empty menu
* Class to manage menu Empty
*
* @phan-suppress PhanRedefineClass
*/
@ -37,12 +37,14 @@ class MenuManager
* @var int<0,1> 0 for internal users, 1 for external users
*/
public $type_user = 0;
/**
* @var string Default target to use in links
* @var string To save the default target to use onto links
*/
public $atarget = "";
/**
* @var string
* @var string Menu name
*/
public $name = "empty";
@ -50,6 +52,7 @@ class MenuManager
* @var Menu
*/
public $menu;
/**
* @var array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,level:int,prefix:string}>
*/
@ -97,7 +100,7 @@ class MenuManager
/**
* Show menu
* Output menu on screen
*
* @param string $mode 'top', 'left', 'jmobile'
* @param ?array<string,mixed> $moredata An array with more data to output
@ -105,15 +108,13 @@ class MenuManager
*/
public function showmenu($mode, $moredata = null)
{
global $user, $conf, $langs, $dolibarr_main_db_name;
global $langs, $dolibarr_main_db_name;
$id = 'mainmenu';
require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
$this->menu = new Menu();
$res = 'ErrorBadParameterForMode';
$noout = 0;
//if ($mode == 'jmobile') $noout=1;
@ -149,33 +150,23 @@ class MenuManager
$this->menu->liste = dol_sort_array($this->menu->liste, 'position');
// Output menu entries
foreach ($this->menu->liste as $menkey => $menuval) {
if (empty($noout)) {
if (empty($noout)) {
foreach ($this->menu->liste as $menkey => $menuval) {
print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
}
if (empty($noout)) {
print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $this->atarget));
}
if (empty($noout)) {
print_end_menu_entry_empty($menuval['enabled']);
}
}
if (empty($noout) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);
}
if (empty($noout)) {
if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
print_start_menu_entry_empty('', 'class="tmenuend"', $showmode);
}
print_end_menu_entry_empty($showmode);
}
if (empty($noout)) {
print_end_menu_array_empty();
}
if ($mode == 'jmobile') {
$this->topmenu = clone $this->menu;
unset($this->menu->liste);
}
}
if ($mode == 'jmobile') { // Used to get menu in xml ul/li
@ -197,10 +188,17 @@ class MenuManager
print '<ul class="ulmenu" data-inset="true">';
print '<li class="lilevel0">';
$val['url'] = make_substitutions($val['url'], $substitarray);
if ($val['enabled'] == 1) {
$relurl = dol_buildpath($val['url'], 1);
$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
$substitarray['__USERID__'] = $user->id; // For backward compatibility
$val['url'] = make_substitutions($val['url'], $substitarray);
if (!preg_match('/^http/', $val['url'])) {
$relurl = dol_buildpath($val['url'], 1);
} else {
$relurl = $val['url'];
}
$canonurl = preg_replace('/\?.*$/', '', $val['url']);
print '<a class="alilevel0" href="#">';
@ -335,7 +333,14 @@ class MenuManager
$lastlevel2[$val2['level']] = 'greyed';
}
}
print $val2['titre'];
// Add font-awesome (if $val2['level'] == 0, we are on level2
if ($val2['level'] == 0 && !empty($val2['prefix'])) {
print $val2['prefix']; // the picto must have class="pictofixedwidth paddingright"
} else {
print '<i class="fa fa-does-not-exists fa-fw paddingright pictofixedwidth"></i>';
}
if ($relurl2) {
print '</a>';
}
@ -345,7 +350,15 @@ class MenuManager
print '</ul>';
}
if ($val['enabled'] == 2) {
print '<span class="vsmenudisabled">'.$val['titre'].'</span>';
print '<span class="spanlilevel0 vsmenudisabled">';
// Add font-awesome
if ($val['level'] == 0 && !empty($val['prefix'])) {
print $val['prefix'];
}
print $val['titre'];
print '</span>';
}
print '</li>';
print '</ul>'."\n";
@ -487,9 +500,10 @@ class MenuManager
unset($menu_array);
}
}
unset($this->menu);
return $res;
return 0;
}
}
@ -537,12 +551,14 @@ function print_start_menu_entry_empty($idsel, $classname, $showmode)
*/
function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())
{
global $conf, $langs;
global $langs;
$classnameimg = str_replace('class="', 'class="tmenuimage ', $classname);
$classnametxt = str_replace('class="', 'class="tmenulabel ', $classname);
if ($showmode == 1) {
$menuval['prefix'] = 'fa-home fa-fw';
print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
print '<div class="'.$id.' '.$idsel.' topmenuimage">';
if (!empty($menuval['prefix']) && strpos($menuval['prefix'], '<span') === 0) {
@ -550,7 +566,7 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
} elseif (!empty($menuval['prefix']) && strpos($menuval['prefix'], 'fa-') === 0) {
print '<span class="'.$id.' '.$menuval['prefix'].'" id="mainmenuspan_'.$idsel.'"></span>';
} else {
print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';
print '<span class="'.$id.' tmenuimageforpngaaaaa" id="mainmenuspan_'.$idsel.'"></span>';
}
print '</div>';
print '</a>';