A modifier test nouvelles permissions
This commit is contained in:
parent
3ac43f87bb
commit
6fe028b3c9
@ -194,6 +194,7 @@ else
|
|||||||
{
|
{
|
||||||
$fuser = new User($db, $_GET["id"]);
|
$fuser = new User($db, $_GET["id"]);
|
||||||
$fuser->fetch();
|
$fuser->fetch();
|
||||||
|
$fuser->getrights();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Affichage onglets
|
* Affichage onglets
|
||||||
@ -234,91 +235,91 @@ else
|
|||||||
|
|
||||||
if ($_GET["action"] == 'perms')
|
if ($_GET["action"] == 'perms')
|
||||||
{
|
{
|
||||||
if ($message) { print "$message<br>"; }
|
if ($message) { print "$message<br>"; }
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Ecran ajout/suppression permission
|
* Ecran ajout/suppression permission
|
||||||
*/
|
*/
|
||||||
|
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
|
|
||||||
|
|
||||||
// Droits existant
|
// Droits existant
|
||||||
print "<tr>".'<td valign="top" colspan="2">';
|
print "<tr>".'<td valign="top" colspan="2">';
|
||||||
print '<table width="100%" class="noborder">';
|
print '<table width="100%" class="noborder">';
|
||||||
print '<tr class="liste_titre"><td>'.$langs->trans("AvailableRights").'</td><td>'.$langs->trans("Module").'</td><td> </td></tr>';
|
print '<tr class="liste_titre"><td>'.$langs->trans("AvailableRights").'</td><td>'.$langs->trans("Module").'</td><td> </td></tr>';
|
||||||
$sql = "SELECT r.id, r.libelle, r.module FROM ".MAIN_DB_PREFIX."rights_def as r ORDER BY r.module, r.id ASC";
|
$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 ($db->query($sql))
|
||||||
{
|
{
|
||||||
$num = $db->num_rows();
|
$num = $db->num_rows();
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$var = True;
|
$var = True;
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object($i);
|
$obj = $db->fetch_object($i);
|
||||||
if ($oldmod <> $obj->module)
|
if ($oldmod <> $obj->module)
|
||||||
{
|
{
|
||||||
$oldmod = $obj->module;
|
$oldmod = $obj->module;
|
||||||
$var = !$var;
|
$var = !$var;
|
||||||
}
|
}
|
||||||
print '<tr '. $bc[$var].'>';
|
print '<tr '. $bc[$var].'>';
|
||||||
print '<td>'.$obj->libelle . '</td><td>'.$obj->module . '</td>';
|
print '<td>'.$obj->libelle . '</td><td>'.$obj->module . '</td>';
|
||||||
print '<td><a href="fiche.php?id='.$fuser->id.'&action=perms&subaction=addrights&rights='.$obj->id.'">'.img_edit_add().'</a></td>';
|
print '<td><a href="fiche.php?id='.$fuser->id.'&action=perms&subaction=addrights&rights='.$obj->id.'">'.img_edit_add().'</a></td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
print '</td><td colspan="2" valign="top">';
|
print '</td><td colspan="2" valign="top">';
|
||||||
|
|
||||||
// Droits possédés
|
// Droits possédés
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
print '<tr class="liste_titre"><td> </td><td>'.$langs->trans("OwnedRights").'</td><td>'.$langs->trans("Module").'</td></tr>';
|
print '<tr class="liste_titre"><td> </td><td>'.$langs->trans("OwnedRights").'</td><td>'.$langs->trans("Module").'</td></tr>';
|
||||||
$sql = "SELECT r.id, r.libelle, r.module FROM ".MAIN_DB_PREFIX."rights_def as r, ".MAIN_DB_PREFIX."user_rights as ur";
|
$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";
|
$sql .= " WHERE ur.fk_id = r.id AND ur.fk_user = ".$fuser->id. " ORDER BY r.module, r.id ASC";
|
||||||
$var = True;
|
$var = True;
|
||||||
if ($db->query($sql))
|
if ($db->query($sql))
|
||||||
{
|
{
|
||||||
$num = $db->num_rows();
|
$num = $db->num_rows();
|
||||||
$i = 0;
|
$i = 0;
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object($i);
|
$obj = $db->fetch_object($i);
|
||||||
if ($oldmod <> $obj->module)
|
if ($oldmod <> $obj->module)
|
||||||
{
|
{
|
||||||
$oldmod = $obj->module;
|
$oldmod = $obj->module;
|
||||||
$var = !$var;
|
$var = !$var;
|
||||||
}
|
}
|
||||||
|
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print '<td align="right"><a href="fiche.php?id='.$fuser->id.'&action=perms&subaction=delrights&rights='.$obj->id.'">'.img_edit_remove().'</a></td>';
|
print '<td align="right"><a href="fiche.php?id='.$fuser->id.'&action=perms&subaction=delrights&rights='.$obj->id.'">'.img_edit_remove().'</a></td>';
|
||||||
print "<td>".$obj->libelle . '</td><td>'.$obj->module . '</td>';
|
print "<td>".$obj->libelle . '</td><td>'.$obj->module . '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print '</table>';
|
print '</table>';
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($_GET["action"] != 'perms' && $_GET["action"] != 'edit')
|
if ($_GET["action"] != 'perms' && $_GET["action"] != 'edit')
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Fiche en mode visu
|
* Fiche en mode visu
|
||||||
*/
|
*/
|
||||||
|
|
||||||
print '<table class="border" width="100%">';
|
print '<table class="border" width="100%">';
|
||||||
|
|
||||||
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("LastName").'</td>';
|
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("LastName").'</td>';
|
||||||
print '<td width="25%" class="valeur">'.$fuser->nom.'</td>';
|
print '<td width="25%" class="valeur">'.$fuser->nom.'</td>';
|
||||||
print '<td width="25%" valign="top">'.$langs->trans("FirstName").'</td>';
|
print '<td width="25%" valign="top">'.$langs->trans("FirstName").'</td>';
|
||||||
print '<td width="25%" class="valeur">'.$fuser->prenom.'</td>';
|
print '<td width="25%" class="valeur">'.$fuser->prenom.'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Login").'</td>';
|
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Login").'</td>';
|
||||||
print '<td width="25%" class="valeur">'.$fuser->login.'</td>';
|
print '<td width="25%" class="valeur">'.$fuser->login.'</td>';
|
||||||
print '<td width="25%" valign="top">'.$langs->trans("EMail").'</td>';
|
print '<td width="25%" valign="top">'.$langs->trans("EMail").'</td>';
|
||||||
@ -400,7 +401,7 @@ else
|
|||||||
*/
|
*/
|
||||||
print '<table width="100%" class="noborder">';
|
print '<table width="100%" class="noborder">';
|
||||||
print '<tr class="liste_titre"><td>'.$langs->trans("Permissions").'</td><td>'.$langs->trans("Module").'</td></tr>';
|
print '<tr class="liste_titre"><td>'.$langs->trans("Permissions").'</td><td>'.$langs->trans("Module").'</td></tr>';
|
||||||
$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";
|
$sql .= " WHERE ur.fk_id = r.id AND ur.fk_user = ".$fuser->id. " ORDER BY r.module, r.id ASC";
|
||||||
$var = True;
|
$var = True;
|
||||||
if ($db->query($sql))
|
if ($db->query($sql))
|
||||||
@ -408,23 +409,25 @@ else
|
|||||||
$num = $db->num_rows();
|
$num = $db->num_rows();
|
||||||
$i = 0;
|
$i = 0;
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object($i);
|
$obj = $db->fetch_object($i);
|
||||||
if ($oldmod <> $obj->module)
|
if ($oldmod <> $obj->module)
|
||||||
{
|
{
|
||||||
$oldmod = $obj->module;
|
$oldmod = $obj->module;
|
||||||
$var = !$var;
|
$var = !$var;
|
||||||
}
|
}
|
||||||
|
$fac = 'facture';
|
||||||
print "<tr $bc[$var]><td>".$obj->libelle . '</td><td>'.$obj->module."</td></tr>\n";
|
$bac = "lire";
|
||||||
|
$alpha = $fuser->rights->$fac->$bac; //"user->rights->".$obj->perms;
|
||||||
|
print "<tr $bc[$var]><td>".$alpha . '</td><td>'.$$alpha." ".$fuser->rights->facture->lire."</td></tr>\n";
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
print "</table>\n";
|
print "</table>\n";
|
||||||
print "<br>\n";
|
print "<br>\n";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Fiche en mode edition
|
* Fiche en mode edition
|
||||||
*/
|
*/
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user