diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index bd723844956..27da2c30ba2 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -390,7 +390,7 @@ else if ($user->id <> $_GET["id"] && $user->admin) { - print ''.$langs->trans("DisableUser").''; + print ''.$langs->trans("DisableUser").''; } print "\n"; @@ -401,8 +401,8 @@ else * Droits */ print ''; - print ''; - $sql = "SELECT r.libelle, r.module, r.perms FROM ".MAIN_DB_PREFIX."rights_def as r, ".MAIN_DB_PREFIX."user_rights as ur"; + print ''; + $sql = "SELECT r.libelle, r.module, r.perms, r.subperms FROM ".MAIN_DB_PREFIX."rights_def as r, ".MAIN_DB_PREFIX."user_rights as ur"; $sql .= " WHERE ur.fk_id = r.id AND ur.fk_user = ".$fuser->id. " ORDER BY r.module, r.id ASC"; $var = True; if ($db->query($sql)) @@ -410,18 +410,27 @@ else $num = $db->num_rows(); $i = 0; while ($i < $num) - { + { $obj = $db->fetch_object($i); if ($oldmod <> $obj->module) - { + { $oldmod = $obj->module; $var = !$var; - } - print ''; - print ''; - print ''; + } + if (! $obj->perms) { + // Si droit selon modèle simple + print "\n"; + } else { + // Si droit selon nouveau modèle (avec sous niveaux de droits) + //$alpha = "user->rights->".$obj->perms."->".$obj->subperms; + //print "$alpha ".$$alpha; + //if ($$alpha) + //{ + print "\n"; + //} + } $i++; - } + } } print "
'.$langs->trans("Permissions").''.$langs->trans("Module").'
'.$langs->trans("Module").''.$langs->trans("Permissions").'
'.$obj->libelle . ''.$obj->module . '
".$obj->module."".$obj->libelle . "
".$obj->module."".$obj->perms." - ".$obj->subperms."
\n"; print "
\n";