Fix warning
This commit is contained in:
parent
a71d50db9e
commit
95c35b2dc3
@ -435,9 +435,11 @@ class UserGroup extends CommonObject
|
|||||||
$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);
|
||||||
@ -446,14 +448,14 @@ class UserGroup extends CommonObject
|
|||||||
// Where pour la liste des droits a supprimer
|
// Where pour la liste des droits a supprimer
|
||||||
$wherefordel = "id=".$this->db->escape($rid);
|
$wherefordel = "id=".$this->db->escape($rid);
|
||||||
// Suppression des droits induits
|
// Suppression des droits induits
|
||||||
if ($subperms == 'lire' || $subperms == 'read') $wherefordel .= " OR (module='$module' AND perms='$perms' AND subperms IS NOT NULL)";
|
if ($subperms == 'lire' || $subperms == 'read') $wherefordel .= " OR (module='".$this->db->escape($module)."' AND perms='".$this->db->escape($perms)."' AND subperms IS NOT NULL)";
|
||||||
if ($perms == 'lire' || $perms == 'read') $wherefordel .= " OR (module='$module')";
|
if ($perms == 'lire' || $perms == 'read') $wherefordel .= " OR (module='".$this->db->escape($module)."')";
|
||||||
|
|
||||||
// Pour compatibilite, si lowid = 0, on est en mode suppression de tout
|
// Pour compatibilite, si lowid = 0, on est en mode suppression de tout
|
||||||
// TODO A virer quand sera gere par l'appelant
|
// TODO A virer quand sera gere par l'appelant
|
||||||
//if (substr($rid,-1,1) == 0) $wherefordel="module='$module'";
|
//if (substr($rid,-1,1) == 0) $wherefordel="module='$module'";
|
||||||
} else {
|
} else {
|
||||||
// Where pour la liste des droits a supprimer
|
// Add permission of the list $wherefordel
|
||||||
if (!empty($allmodule))
|
if (!empty($allmodule))
|
||||||
{
|
{
|
||||||
if ($allmodule == 'allmodules')
|
if ($allmodule == 'allmodules')
|
||||||
@ -461,7 +463,7 @@ class UserGroup extends CommonObject
|
|||||||
$wherefordel = 'allmodules';
|
$wherefordel = 'allmodules';
|
||||||
} else {
|
} else {
|
||||||
$wherefordel = "module='".$this->db->escape($allmodule)."'";
|
$wherefordel = "module='".$this->db->escape($allmodule)."'";
|
||||||
if (!empty($allperms)) $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
|
if (!empty($allperms)) $wherefordel .= " AND perms='".$this->db->escape($allperms)."'";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user