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

Fix warning

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-07 15:28:10 +01:00
parent c071dd254b
commit bb2c35ae18
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/user/class/usergroup.class.php
View File

@ -311,25 +311,27 @@ class UserGroup extends CommonObject
// les caracteristiques (module, perms et subperms) de ce droit. // les caracteristiques (module, perms et subperms) de ce droit.
$sql = "SELECT module, perms, subperms"; $sql = "SELECT module, perms, subperms";
$sql .= " FROM ".MAIN_DB_PREFIX."rights_def"; $sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
$sql .= " WHERE id = '".$this->db->escape($rid)."'"; $sql .= " WHERE id = ".((int) $rid);
$sql .= " AND entity = ".$entity; $sql .= " AND entity = ".((int) $entity);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) { if ($result) {
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
$module = $obj->module; if ($obj) {
$perms = $obj->perms; $module = $obj->module;
$subperms = $obj->subperms; $perms = $obj->perms;
$subperms = $obj->subperms;
}
} else { } else {
$error++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
// Where pour la liste des droits a ajouter // Where pour la liste des droits a ajouter
$whereforadd = "id=".$this->db->escape($rid); $whereforadd = "id=".((int) $rid);
// Ajout des droits induits // Ajout des droits induits
if ($subperms) $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))"; if ($subperms) $whereforadd .= " OR (module='".$this->db->escape($module)."' AND perms='".$this->db->escape($perms)."' AND (subperms='lire' OR subperms='read'))";
elseif ($perms) $whereforadd .= " OR (module='$module' AND (perms='lire' OR perms='read') AND subperms IS NULL)"; elseif ($perms) $whereforadd .= " OR (module='".$this->db->escape($module)."' AND (perms='lire' OR perms='read') AND subperms IS NULL)";
// Pour compatibilite, si lowid = 0, on est en mode ajout de tout // Pour compatibilite, si lowid = 0, on est en mode ajout de tout
// TODO A virer quand sera gere par l'appelant // TODO A virer quand sera gere par l'appelant
@ -348,7 +350,7 @@ class UserGroup extends CommonObject
} }
} }
// Ajout des droits de la liste whereforadd // Add permission of the list $whereforadd
if (!empty($whereforadd)) if (!empty($whereforadd))
{ {
//print "$module-$perms-$subperms"; //print "$module-$perms-$subperms";