diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 8553bbe57bc..11d7e3becb3 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -194,6 +194,7 @@ else { $fuser = new User($db, $_GET["id"]); $fuser->fetch(); + $fuser->getrights(); /* * Affichage onglets @@ -234,91 +235,91 @@ else if ($_GET["action"] == 'perms') { - if ($message) { print "$message
"; } - - /* - * Ecran ajout/suppression permission - */ - - print ''; - - - // Droits existant - print "".''; } - - + + if ($_GET["action"] != 'perms' && $_GET["action"] != 'edit') - { + { /* * Fiche en mode visu */ - + print '
'; - print ''; - print ''; - $sql = "SELECT r.id, r.libelle, r.module FROM ".MAIN_DB_PREFIX."rights_def as r ORDER BY r.module, r.id ASC"; - - if ($db->query($sql)) + if ($message) { print "$message
"; } + + /* + * Ecran ajout/suppression permission + */ + + print '
'.$langs->trans("AvailableRights").''.$langs->trans("Module").' 
'; + + + // Droits existant + print "".''; + print '
'; + print ''; + print ''; + $sql = "SELECT r.id, r.libelle, r.module FROM ".MAIN_DB_PREFIX."rights_def as r ORDER BY r.module, r.id ASC"; + + if ($db->query($sql)) { - $num = $db->num_rows(); - $i = 0; - $var = True; - while ($i < $num) + $num = $db->num_rows(); + $i = 0; + $var = True; + while ($i < $num) { - $obj = $db->fetch_object($i); - if ($oldmod <> $obj->module) + $obj = $db->fetch_object($i); + if ($oldmod <> $obj->module) { - $oldmod = $obj->module; - $var = !$var; + $oldmod = $obj->module; + $var = !$var; } - print ''; - print ''; - print ''; - print ''; - - $i++; + print ''; + print ''; + print ''; + print ''; + + $i++; } } - print '
'.$langs->trans("AvailableRights").''.$langs->trans("Module").' 
'.$obj->libelle . ''.$obj->module . ''.img_edit_add().'
'.$obj->libelle . ''.$obj->module . ''.img_edit_add().'
'; - - print '
'; - - // Droits possédés - print ''; - print ''; - $sql = "SELECT r.id, r.libelle, r.module 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)) + print '
 '.$langs->trans("OwnedRights").''.$langs->trans("Module").'
'; + + print '
'; + + // Droits possédés + print ''; + print ''; + $sql = "SELECT r.id, r.libelle, r.module 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)) { - $num = $db->num_rows(); - $i = 0; - while ($i < $num) + $num = $db->num_rows(); + $i = 0; + while ($i < $num) { - $obj = $db->fetch_object($i); - if ($oldmod <> $obj->module) + $obj = $db->fetch_object($i); + if ($oldmod <> $obj->module) { - $oldmod = $obj->module; - $var = !$var; + $oldmod = $obj->module; + $var = !$var; } - - print ""; - print ''; - print "'; - print ''; - $i++; + + print ""; + print ''; + print "'; + print ''; + $i++; } } - print '
 '.$langs->trans("OwnedRights").''.$langs->trans("Module").'
'.img_edit_remove().'".$obj->libelle . ''.$obj->module . '
'.img_edit_remove().'".$obj->libelle . ''.$obj->module . '
'; - print '
'; + print '
'; - + print "".''; print ''; print ''; print ''; print "\n"; - + print "".''; print ''; print ''; @@ -400,7 +401,7 @@ else */ print '
'.$langs->trans("LastName").''.$fuser->nom.''.$langs->trans("FirstName").''.$fuser->prenom.'
'.$langs->trans("Login").''.$fuser->login.''.$langs->trans("EMail").'
'; print ''; - $sql = "SELECT r.libelle, r.module FROM ".MAIN_DB_PREFIX."rights_def as r, ".MAIN_DB_PREFIX."user_rights as ur"; + $sql = "SELECT r.libelle, r.module, r.perms 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)) @@ -408,23 +409,25 @@ 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 "\n"; + } + $fac = 'facture'; + $bac = "lire"; + $alpha = $fuser->rights->$fac->$bac; //"user->rights->".$obj->perms; + print "\n"; $i++; - } + } } print "
'.$langs->trans("Permissions").''.$langs->trans("Module").'
".$obj->libelle . ''.$obj->module."
".$alpha . ''.$$alpha." ".$fuser->rights->facture->lire."
\n"; print "
\n"; - - } - + + } + /* * Fiche en mode edition */