lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX php8 compatibility

Browse Source
This commit is contained in:
Philippe GRAND 2022-08-28 14:38:13 +02:00
parent 4ee4edae4c
commit 736432b751
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/user/list.php
View File

@ -121,7 +121,7 @@ $arrayfields = array(
'u.login'=>array('label'=>"Login", 'checked'=>1, 'position'=>10),
'u.lastname'=>array('label'=>"Lastname", 'checked'=>1, 'position'=>15),
'u.firstname'=>array('label'=>"Firstname", 'checked'=>1, 'position'=>20),
'u.entity'=>array('label'=>"Entity", 'checked'=>1, 'position'=>50, 'enabled'=>(!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
'u.entity'=>array('label'=>"Entity", 'checked'=>1, 'position'=>50, 'enabled'=>(isModEnabled('multicompany') && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
'u.gender'=>array('label'=>"Gender", 'checked'=>0, 'position'=>22),
'u.employee'=>array('label'=>"Employee", 'checked'=>($mode == 'employee' ? 1 : 0), 'position'=>25),
'u.fk_user'=>array('label'=>"HierarchicalResponsible", 'checked'=>1, 'position'=>27),
@ -981,7 +981,7 @@ while ($i < $imaxinloop) {
if (!empty($arrayfields['u.login']['checked'])) {
print '<td class="nowraponall tdoverflowmax150">';
print $li;
if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity) {
if (isModEnabled('multicompany') && $obj->admin && !$obj->entity) {
print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
} elseif ($obj->admin) {
print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
@ -1054,7 +1054,7 @@ while ($i < $imaxinloop) {
$user2->statut = $obj->status2;
$user2->status = $obj->status2;
print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2) {
if (isModEnabled('multicompany') && $obj->admin2 && !$obj->entity2) {
print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
} elseif ($obj->admin2) {
print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
@ -1123,7 +1123,7 @@ while ($i < $imaxinloop) {
}
}
// Multicompany enabled
if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
if (isModEnabled('multicompany') && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
if (!empty($arrayfields['u.entity']['checked'])) {
print '<td>';
if (!$obj->entity) {