FIX php8 compatibility
This commit is contained in:
parent
28bd9812ad
commit
5df51c5615
@ -398,7 +398,7 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
|
|||||||
*/
|
*/
|
||||||
function getListOfGroups($authentication)
|
function getListOfGroups($authentication)
|
||||||
{
|
{
|
||||||
global $db, $conf;
|
global $db, $conf, $user;
|
||||||
|
|
||||||
dol_syslog("Function: getListOfGroups login=".$authentication['login']);
|
dol_syslog("Function: getListOfGroups login=".$authentication['login']);
|
||||||
|
|
||||||
@ -418,7 +418,7 @@ function getListOfGroups($authentication)
|
|||||||
$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
|
$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
|
$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
|
||||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
|
||||||
if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity))) {
|
if (isModEnabled('multicompany') && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity))) {
|
||||||
$sql .= " WHERE g.entity IS NOT NULL";
|
$sql .= " WHERE g.entity IS NOT NULL";
|
||||||
} else {
|
} else {
|
||||||
$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
|
$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user