Debug v22
This commit is contained in:
parent
2dd6ccd2d9
commit
f0eaae6a1d
14 changed files with 78 additions and 66 deletions
|
|
@ -663,7 +663,7 @@ if ($num == 0) {
|
|||
$colspan++;
|
||||
}
|
||||
}
|
||||
print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
|
||||
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7798,7 +7798,7 @@ abstract class CommonObject
|
|||
}
|
||||
$out .= '</div>';
|
||||
$out .= '<script>
|
||||
jQuery(function($) {
|
||||
jQuery(function($) { /* commonobject.class.php 1 */
|
||||
let container = $("#'.$keyprefix.$key.$keysuffix.'_selection");
|
||||
let selectedStars = parseInt($("#'.$keyprefix.$key.$keysuffix.'").val()) || 0;
|
||||
container.find(".star").each(function() {
|
||||
|
|
@ -8615,7 +8615,7 @@ abstract class CommonObject
|
|||
}
|
||||
$value .= '</div>';
|
||||
$value .= '<script>
|
||||
$(document).ready(function() {
|
||||
$(document).ready(function() { /* commonobject.class.php 2 */
|
||||
let container = $("#'.$keyprefix.$key.$keysuffix.$this->id.'_selection");
|
||||
let selectedStars = parseInt($("#'.$keyprefix.$key.$keysuffix.$this->id.'").val()) || 0;
|
||||
container.find(".star").each(function() {
|
||||
|
|
|
|||
|
|
@ -1973,7 +1973,7 @@ class ExtraFields
|
|||
}
|
||||
$out .= '</div>';
|
||||
$out .= '<script>
|
||||
jQuery(function($) {
|
||||
jQuery(function($) { /* extrafields.class.php 1 */
|
||||
let container = $("#'.$keyprefix.$key.$keysuffix.'_selection");
|
||||
let selectedStars = parseInt($("#'.$keyprefix.$key.$keysuffix.'").val()) || 0;
|
||||
container.find(".star").each(function() {
|
||||
|
|
@ -2434,7 +2434,7 @@ class ExtraFields
|
|||
}
|
||||
$value .= '</div>';
|
||||
$value .= '<script>
|
||||
$(document).ready(function() {
|
||||
$(document).ready(function() { /* extrafields.class.php 2 */
|
||||
let container = $("#'.$key.$objectid.'_selection");
|
||||
let selectedStars = parseInt($("#'.$key.$objectid.'").val() || $("#'.$key.$objectid.'").text()) || 0;
|
||||
';
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
|
|||
* @param DoliDB $db Database handler
|
||||
* @param string $atarget Target (Example: '' or '_top')
|
||||
* @param int $type_user 0=Menu for backoffice, 1=Menu for front office
|
||||
* @param 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,showtopmenuinframe:int,level:int,prefix:string}> $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
|
||||
* @param 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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}> $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
|
||||
* @param Menu $menu Object Menu to return back list of menu entries
|
||||
* @param int<0,1> $noout 1=Disable output (Initialise &$menu only).
|
||||
* @param string $mode 'top', 'topnb', 'left', 'jmobile'
|
||||
|
|
@ -80,7 +80,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
|
|||
$newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);
|
||||
|
||||
// Phan issue #4881 requires that we reforce the type
|
||||
'@phan-var-force 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,showtopmenuinframe:int,level?:int,prefix:string}> $newTabMenu';
|
||||
'@phan-var-force 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,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $newTabMenu';
|
||||
|
||||
// url = url from host, shorturl = relative path into dolibarr sources
|
||||
$url = $shorturl = $newTabMenu[$i]['url'];
|
||||
|
|
@ -109,7 +109,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
|
|||
}
|
||||
|
||||
// Modify URL for the case we are using the option showtopmenuinframe
|
||||
'@phan-var-force 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,showtopmenuinframe:int,level?:int,prefix:string}> $newTabMenu';
|
||||
'@phan-var-force 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,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $newTabMenu';
|
||||
// @phan-suppress-next-line PhanTypeInvalidDimOffset
|
||||
if ($newTabMenu[$i]['showtopmenuinframe']) {
|
||||
if (preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) {
|
||||
|
|
@ -245,7 +245,7 @@ function print_start_menu_entry_auguria($idsel, $classname, $showmode)
|
|||
* @param string $idsel Id sel
|
||||
* @param string $classname Class name
|
||||
* @param string $atarget Target
|
||||
* @param 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,showtopmenuinframe:int,level:int,prefix:string}|array{} $menuval The full $menuval array
|
||||
* @param 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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}|array{} $menuval The full $menuval array
|
||||
* @return void
|
||||
*/
|
||||
function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())
|
||||
|
|
@ -328,9 +328,9 @@ function print_end_menu_array_auguria()
|
|||
* Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param 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,showtopmenuinframe:int,level:int,prefix:string}> $menu_array_before Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
|
||||
* @param 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,showtopmenuinframe:int,level:int,prefix:string}> $menu_array_after Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
|
||||
* @param 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,showtopmenuinframe:int,level:int,prefix:string}> $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
|
||||
* @param 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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}> $menu_array_before Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
|
||||
* @param 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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}> $menu_array_after Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
|
||||
* @param 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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}> $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
|
||||
* @param Menu $menu Object Menu to return back list of menu entries
|
||||
* @param int<0,1> $noout Disable output (Initialise &$menu only).
|
||||
* @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x'
|
||||
|
|
@ -717,7 +717,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
|
|||
* Function to test if an entry is enabled or not
|
||||
*
|
||||
* @param int $type_user 0=We need backoffice menu, 1=We need frontoffice menu
|
||||
* @param 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,showtopmenuinframe:int,level:int,prefix:string,module:string} $menuentry Array for menu entry
|
||||
* @param 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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string,module:string} $menuentry Array for menu entry
|
||||
* @param string[] $listofmodulesforexternal Array with list of modules allowed to external users
|
||||
* @return int<0,2> 0=Hide, 1=Show, 2=Show gray
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -58,16 +58,16 @@ class MenuManager
|
|||
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,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
* @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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
*/
|
||||
public $menu_array;
|
||||
/**
|
||||
* @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,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
* @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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
*/
|
||||
public $menu_array_after;
|
||||
|
||||
/**
|
||||
* @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,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
* @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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
*/
|
||||
public $tabMenu;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
|
|||
* @param DoliDB $db Database handler
|
||||
* @param string $atarget Target (Example: '' or '_top')
|
||||
* @param int $type_user 0=Menu for backoffice, 1=Menu for front office
|
||||
* @param 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,showtopmenuinframe:int,level?:int,prefix:string}> $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty). For eldy menu, it contains menu entries loaded from database.
|
||||
* @param 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,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty). For eldy menu, it contains menu entries loaded from database.
|
||||
* @param Menu $menu Object Menu to return back list of menu entries
|
||||
* @param int $noout 1=Disable output (Initialise &$menu only).
|
||||
* @param string $mode 'top', 'topnb', 'left', 'jmobile'
|
||||
|
|
@ -504,7 +504,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
|
|||
$newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);
|
||||
|
||||
// Phan issue #4881 requires that we reforce the type
|
||||
'@phan-var-force 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,showtopmenuinframe:int,prefix:string}> $newTabMenu';
|
||||
'@phan-var-force 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,positionfull:int|string,showtopmenuinframe:int,prefix:string}> $newTabMenu';
|
||||
|
||||
// url = url from host, shorturl = relative path into dolibarr sources
|
||||
$url = $shorturl = $newTabMenu[$i]['url'];
|
||||
|
|
@ -563,7 +563,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
|
|||
);
|
||||
}
|
||||
|
||||
// Sort on position
|
||||
// Sort the top menu on position
|
||||
$menu->liste = dol_sort_array($menu->liste, 'position');
|
||||
|
||||
// If noout is on (for jmobile div menu for example)
|
||||
|
|
@ -663,7 +663,7 @@ function print_start_menu_entry($idsel, $classname, $showmode)
|
|||
* @param string $idsel Id sel
|
||||
* @param string $classname Class name
|
||||
* @param string $atarget Target
|
||||
* @param 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,showtopmenuinframe:int,level?:int,prefix:string} $menuval All the $menuval array
|
||||
* @param 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,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string} $menuval All the $menuval array
|
||||
* @return void
|
||||
*/
|
||||
function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())
|
||||
|
|
@ -745,9 +745,9 @@ function print_end_menu_array()
|
|||
* Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param array<array{rowid:string,fk_menu:string,module?: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,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array_before Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
|
||||
* @param array<array{rowid:string,fk_menu:string,module?: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,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array_after Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
|
||||
* @param array<array{rowid:string,fk_menu:string,module?: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,showtopmenuinframe:int,level?:int,prefix:string}> $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
|
||||
* @param array<array{rowid:string,fk_menu:string,module?: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,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array_before Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
|
||||
* @param array<array{rowid:string,fk_menu:string,module?: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,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array_after Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
|
||||
* @param array<array{rowid:string,fk_menu:string,module?: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,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
|
||||
* @param Menu $menu Object Menu to return back list of menu entries
|
||||
* @param int<0,1> $noout Disable output (Initialise &$menu only).
|
||||
* @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x'
|
||||
|
|
@ -936,29 +936,37 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
|
|||
} elseif ($reshook == 1) {
|
||||
$menu_array = $hookmanager->resArray; // replace
|
||||
}
|
||||
|
||||
// @todo Sort menu items by 'position' value
|
||||
// $position = array();
|
||||
// foreach ($menu_array as $key => $row) {
|
||||
// $position[$key] = $row['position'];
|
||||
// }
|
||||
// $array1_sort_order = SORT_ASC;
|
||||
// array_multisort($position, $array1_sort_order, $menu_array);
|
||||
}
|
||||
|
||||
// TODO Use the position property in menu_array to reorder the $menu_array
|
||||
//var_dump($menu_array);
|
||||
/*$new_menu_array = array();
|
||||
$level=0; $cusor=0; $position=0;
|
||||
$nbentry = count($menu_array);
|
||||
while (findNextEntryForLevel($menu_array, $cursor, $position, $level))
|
||||
{
|
||||
// Set a field positionfull to allow to sort tree entry without breaking the hierarchy.
|
||||
$counter = 0;
|
||||
$currentpositionlevel = 0;
|
||||
$currentpositionpath = '';
|
||||
foreach ($menu_array as $key => $val) {
|
||||
$counter++;
|
||||
//print 'key='.$key.' level='.$menu_array[$key]['level'].' currentpositionlevel='.$currentpositionlevel.' <br>'."\n";
|
||||
if ($menu_array[$key]['level'] <= $currentpositionlevel) { // We found a break we are now on a lower level
|
||||
$tmparray = explode('_', $currentpositionpath);
|
||||
$currentpositionpath = '';
|
||||
for ($i = 0; $i < $menu_array[$key]['level']; $i++) {
|
||||
$currentpositionpath .= $tmparray[$i].'_';
|
||||
}
|
||||
$currentpositionpath .= $menu_array[$key]['position'].'.'.$counter;
|
||||
$menu_array[$key]['positionfull'] = $currentpositionpath;
|
||||
//print '$currentpositionpath='.$currentpositionpath.'<br>'."\n";
|
||||
} else {
|
||||
$currentpositionpath .= '_'.$menu_array[$key]['position'].'.'.$counter;
|
||||
$menu_array[$key]['positionfull'] = $currentpositionpath;
|
||||
//print '$currentpositionpath='.$currentpositionpath.'<br>'."\n";
|
||||
}
|
||||
$currentpositionlevel = $menu_array[$key]['level'];
|
||||
}
|
||||
|
||||
$cursor++;
|
||||
}*/
|
||||
//var_dump($menu_array);exit;
|
||||
$menu_array = dol_sort_array($menu_array, 'positionfull', 'asc', 1, 0, 1);
|
||||
|
||||
// Force the typing at this point to get useful analysis below:
|
||||
'@phan-var-force 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,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array';
|
||||
'@phan-var-force 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,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array';
|
||||
|
||||
|
||||
// Show menu
|
||||
|
|
@ -1024,7 +1032,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
|
|||
}
|
||||
|
||||
|
||||
print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";
|
||||
print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' positionfull='.$menu_array[$i]['positionfull'].' -->'."\n";
|
||||
|
||||
// Menu level 0
|
||||
if ($menu_array[$i]['level'] == 0) {
|
||||
|
|
@ -1334,11 +1342,11 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
|
|||
if (getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
|
||||
$menutoshow = $langs->trans("ProspectsCategoriesShort");
|
||||
}
|
||||
$newmenu->add("/categories/categorie_list.php?leftmenu=cat&type=2", $menutoshow, 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
|
||||
$newmenu->add("/categories/categorie_list.php?leftmenu=cat&type=2", $menutoshow, 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat', 3);
|
||||
}
|
||||
// Categories suppliers
|
||||
if (isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
|
||||
$newmenu->add("/categories/categorie_list.php?leftmenu=catfournish&type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->hasRight('categorie', 'lire'));
|
||||
$newmenu->add("/categories/categorie_list.php?leftmenu=catfournish&type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'catsupplier', 4);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1501,7 +1509,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
|
|||
if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
|
||||
$newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->hasRight('ficheinter', 'lire'), '', '', '', 203);
|
||||
}
|
||||
$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->hasRight('ficheinter', 'lire'));
|
||||
$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->hasRight('ficheinter', 'lire'), '', '', '', 204);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2085,7 +2093,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
|
|||
*/
|
||||
function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
|
||||
{
|
||||
global $user, $conf, $langs;
|
||||
global $user, $langs;
|
||||
|
||||
if ($mainmenu == 'bank') {
|
||||
// Load translation files required by the page
|
||||
|
|
@ -2534,7 +2542,7 @@ function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu
|
|||
if ($mainmenu == 'tools') {
|
||||
if (empty($user->socid)) { // limit to internal users
|
||||
$langs->load("mails");
|
||||
$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
|
||||
$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates', 10, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
|
||||
}
|
||||
|
||||
if (isModEnabled('mailing')) {
|
||||
|
|
@ -2545,7 +2553,7 @@ function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu
|
|||
$titleindex .= ' | '.$langs->trans("SMSings");
|
||||
$titlenew .= ' | '.$langs->trans("NewSMSing");
|
||||
}
|
||||
$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $titleindex, 0, $user->hasRight('mailing', 'lire'), '', $mainmenu, 'mailing', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
|
||||
$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $titleindex, 0, $user->hasRight('mailing', 'lire'), '', $mainmenu, 'mailing', 15, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
|
||||
$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&action=create", $titlenew, 1, $user->hasRight('mailing', 'creer'));
|
||||
$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $titlelist, 1, $user->hasRight('mailing', 'lire'));
|
||||
}
|
||||
|
|
@ -2559,7 +2567,7 @@ function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu
|
|||
}
|
||||
if (isModEnabled('import') || isModEnabled('export')) {
|
||||
$langs->load("exports");
|
||||
$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans($title), 0, (int) ($user->hasRight('import', 'run') || $user->hasRight('export', 'lire')), '', $mainmenu, 'import', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
|
||||
$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans($title), 0, (int) ($user->hasRight('import', 'run') || $user->hasRight('export', 'lire')), '', $mainmenu, 'import', 20, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
|
||||
$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->hasRight('import', 'run'));
|
||||
$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->hasRight('export', 'lire'));
|
||||
}
|
||||
|
|
@ -2570,7 +2578,7 @@ function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu
|
|||
$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->hasRight('export', 'lire'));
|
||||
} */
|
||||
|
||||
$newmenu->add("/core/customreports.php?leftmenu=customreports", $langs->trans("BICustomReports"), 0, 1, '', $mainmenu, 'customreports', 0, '', '', '', img_picto('', 'graph', 'class="paddingright pictofixedwidth"'));
|
||||
$newmenu->add("/core/customreports.php?leftmenu=customreports", $langs->trans("BICustomReports"), 0, 1, '', $mainmenu, 'customreports', 100, '', '', '', img_picto('', 'graph', 'class="paddingright pictofixedwidth"'));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2586,7 +2594,7 @@ function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu
|
|||
*/
|
||||
function get_left_menu_members($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
|
||||
{
|
||||
global $user, $conf, $langs;
|
||||
global $user, $langs;
|
||||
|
||||
if ($mainmenu == 'members') {
|
||||
if (isModEnabled('member')) {
|
||||
|
|
|
|||
|
|
@ -57,16 +57,16 @@ class MenuManager
|
|||
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,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
* @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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
*/
|
||||
public $menu_array;
|
||||
/**
|
||||
* @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,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
* @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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
*/
|
||||
public $menu_array_after;
|
||||
|
||||
/**
|
||||
* @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,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
* @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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
*/
|
||||
public $tabMenu;
|
||||
|
||||
|
|
|
|||
|
|
@ -54,12 +54,12 @@ class MenuManager
|
|||
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,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
* @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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
*/
|
||||
public $menu_array_after;
|
||||
|
||||
/**
|
||||
* @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,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
* @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,positionfull:int|string,showtopmenuinframe:int,level:int,prefix:string}>
|
||||
*/
|
||||
public $tabMenu;
|
||||
|
||||
|
|
@ -407,7 +407,7 @@ class MenuManager
|
|||
return 0;
|
||||
}
|
||||
|
||||
'@phan-var-force 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,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array';
|
||||
'@phan-var-force 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,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array';
|
||||
|
||||
if (empty($noout)) {
|
||||
$alt = 0;
|
||||
|
|
@ -546,7 +546,7 @@ function print_start_menu_entry_empty($idsel, $classname, $showmode)
|
|||
* @param string $idsel Id sel
|
||||
* @param string $classname Class name
|
||||
* @param string $atarget Target
|
||||
* @param 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,showtopmenuinframe:int,level?:int,prefix:string} $menuval All the $menuval array
|
||||
* @param 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,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string} $menuval All the $menuval array
|
||||
* @return void
|
||||
*/
|
||||
function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $classname, $atarget, $menuval = array())
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
|
|||
const KEY_ENABLED = 7;
|
||||
|
||||
/**
|
||||
* @var array<array{commentgroup?:string,mainmenu:string,leftmenu:string,langs:string,enabled:int|string,target:string,titre:string,user:int,fk_menu:string,fk_parent:string,url:string,position:int,perms:string,type:string}>|int<1,1> Module menu entries (1 means the menu entries are not declared into module descriptor but are hardcoded into menu manager)
|
||||
* @var array<array{commentgroup?:string,mainmenu:string,leftmenu:string,langs:string,enabled:int|string,target:string,titre:string,user:int,fk_menu:string,fk_parent:string,url:string,position:int,positionfull:int|string,perms:string,type:string}>|int<1,1> Module menu entries (1 means the menu entries are not declared into module descriptor but are hardcoded into menu manager)
|
||||
*/
|
||||
public $menu = array();
|
||||
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ class modOpenSurvey extends DolibarrModules
|
|||
'leftmenu' => 'opensurvey',
|
||||
'url' => '/opensurvey/list.php?mainmenu=tools&leftmenu=opensurvey',
|
||||
'langs' => 'opensurvey',
|
||||
'position' => 200,
|
||||
'position' => 30,
|
||||
'enabled' => 'isModEnabled("opensurvey")', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
|
||||
'perms' => '$user->hasRight("opensurvey", "read")',
|
||||
'target' => '',
|
||||
|
|
@ -145,7 +145,7 @@ class modOpenSurvey extends DolibarrModules
|
|||
'leftmenu' => 'opensurvey_new',
|
||||
'url' => '/opensurvey/wizard/index.php',
|
||||
'langs' => 'opensurvey',
|
||||
'position' => 210,
|
||||
'position' => 32,
|
||||
'enabled' => 'isModEnabled("opensurvey")', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
|
||||
'perms' => '$user->hasRight("opensurvey", "write")',
|
||||
'target' => '',
|
||||
|
|
@ -161,7 +161,7 @@ class modOpenSurvey extends DolibarrModules
|
|||
'leftmenu' => 'opensurvey_list',
|
||||
'url' => '/opensurvey/list.php',
|
||||
'langs' => 'opensurvey',
|
||||
'position' => 220,
|
||||
'position' => 34,
|
||||
'enabled' => 'isModEnabled("opensurvey")', // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
|
||||
'perms' => '$user->hasRight("opensurvey", "read")',
|
||||
'target' => '',
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
|
|||
|
||||
print '<td'.($cssclasstd ? ' class="'.$cssclasstd.'"' : '');
|
||||
print ' data-key="'.$extrafieldsobjectkey.'.'.$key.'"';
|
||||
print($title ? ' title="'.dol_escape_htmltag($title).'"' : '');
|
||||
print ($title && !in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('stars')) ? ' title="'.dol_escape_htmltag($title).'"' : '');
|
||||
print '>';
|
||||
print $cssclassview ? '<span class="'.$cssclassview.'">' : '';
|
||||
print $valuetoshow;
|
||||
|
|
|
|||
|
|
@ -5388,7 +5388,7 @@ img.boxhandle, img.boxclose {
|
|||
font-size: 1rem;
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
white-spacing: nowrap;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.star {
|
||||
color: #ccc;
|
||||
|
|
|
|||
|
|
@ -5373,7 +5373,7 @@ img.boxhandle, img.boxclose {
|
|||
font-size: 1rem;
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
white-spacing: nowrap;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.star {
|
||||
color: #ccc;
|
||||
|
|
|
|||
|
|
@ -1120,18 +1120,21 @@ while ($i < $imaxinloop) {
|
|||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
// Lastname
|
||||
if (!empty($arrayfields['u.lastname']['checked'])) {
|
||||
print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">'.dol_escape_htmltag($obj->lastname).'</td>';
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
// Fistname
|
||||
if (!empty($arrayfields['u.firstname']['checked'])) {
|
||||
print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">'.dol_escape_htmltag($obj->firstname).'</td>';
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
}
|
||||
// Gender
|
||||
if (!empty($arrayfields['u.gender']['checked'])) {
|
||||
print '<td class="center">';
|
||||
if ($obj->gender) {
|
||||
|
|
@ -1194,6 +1197,7 @@ while ($i < $imaxinloop) {
|
|||
}
|
||||
}
|
||||
|
||||
// Accountancy code
|
||||
if (!empty($arrayfields['u.accountancy_code']['checked'])) {
|
||||
print '<td>'.$obj->accountancy_code.'</td>';
|
||||
if (!$i) {
|
||||
|
|
@ -1217,7 +1221,7 @@ while ($i < $imaxinloop) {
|
|||
}
|
||||
// Email
|
||||
if (!empty($arrayfields['u.email']['checked'])) {
|
||||
print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 1, 0, 0, 1)."</td>\n";
|
||||
print '<td class="tdoverflowmax150" title="'.dolPrintHTMLForAttribute($obj->email).'">'.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 1, 0, 0, 1)."</td>\n";
|
||||
if (!$i) {
|
||||
$totalarray['nbfield']++;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue