Fix: just view non affected user and group
This commit is contained in:
Regis Houssin
parent
6c232bef62
commit
c5f14cc782
@ -287,148 +287,206 @@ else
|
|||||||
|
|
||||||
if ($message) { print $message."<br>"; }
|
if ($message) { print $message."<br>"; }
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Liste des utilisateurs dans le groupe
|
||||||
|
*/
|
||||||
|
|
||||||
/*
|
print_fiche_titre($langs->trans("ListOfUsersInGroup"),'','');
|
||||||
* Liste des utilisateurs dans le groupe
|
|
||||||
*/
|
|
||||||
|
|
||||||
print_fiche_titre($langs->trans("ListOfUsersInGroup"),'','');
|
// On sélectionne les users qui ne sont pas déjà dans le groupe
|
||||||
|
$userlistid = array();
|
||||||
|
$uss = array();
|
||||||
|
|
||||||
|
$sql = "SELECT ug.fk_user";
|
||||||
|
$sql.= " FROM ".MAIN_DB_PREFIX."usergroup_user as ug";
|
||||||
|
$sql.= ", ".MAIN_DB_PREFIX."user as u";
|
||||||
|
$sql.= " WHERE ug.fk_usergroup = ".$group->id;
|
||||||
|
$sql.= " AND ug.fk_user = u.rowid";
|
||||||
|
$sql.= " AND u.entity IN (0,".$conf->entity.")";
|
||||||
|
|
||||||
|
$result = $db->query($sql);
|
||||||
|
if ($result)
|
||||||
|
{
|
||||||
|
$num = $db->num_rows($result);
|
||||||
|
$i = 0;
|
||||||
|
|
||||||
|
while ($i < $num)
|
||||||
|
{
|
||||||
|
$obj = $db->fetch_object($result);
|
||||||
|
|
||||||
|
$userlistid[]=$obj->fk_user;
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
dol_print_error($db);
|
||||||
|
}
|
||||||
|
|
||||||
|
$idList = implode(",",$userlistid);
|
||||||
|
|
||||||
|
if (!empty($idList))
|
||||||
|
{
|
||||||
|
$sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin";
|
||||||
|
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
|
||||||
|
$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
|
||||||
|
$sql.= " AND u.rowid NOT IN (".$idList.")";
|
||||||
|
$sql.= " ORDER BY u.name";
|
||||||
|
|
||||||
|
$result = $db->query($sql);
|
||||||
|
if ($result)
|
||||||
|
{
|
||||||
|
$num = $db->num_rows($result);
|
||||||
|
$i = 0;
|
||||||
|
|
||||||
// On sélectionne les users qui ne sont pas déjà dans le groupe
|
while ($i < $num)
|
||||||
$uss = array();
|
{
|
||||||
|
$obj = $db->fetch_object($result);
|
||||||
|
|
||||||
$sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin";
|
$uss[$obj->rowid] = ucfirst(stripslashes($obj->name)).' '.ucfirst(stripslashes($obj->firstname));
|
||||||
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
|
if ($obj->login) $uss[$obj->rowid].=' ('.$obj->login.')';
|
||||||
$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
|
$i++;
|
||||||
$sql.= " ORDER BY u.name";
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
dol_print_error($db);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin";
|
||||||
|
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
|
||||||
|
$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
|
||||||
|
$sql.= " ORDER BY u.name";
|
||||||
|
|
||||||
|
$result = $db->query($sql);
|
||||||
|
if ($result)
|
||||||
|
{
|
||||||
|
$num = $db->num_rows($result);
|
||||||
|
$i = 0;
|
||||||
|
|
||||||
$result = $db->query($sql);
|
while ($i < $num)
|
||||||
if ($result)
|
{
|
||||||
{
|
$obj = $db->fetch_object($result);
|
||||||
$num = $db->num_rows($result);
|
|
||||||
$i = 0;
|
|
||||||
|
|
||||||
while ($i < $num)
|
$uss[$obj->rowid] = ucfirst(stripslashes($obj->name)).' '.ucfirst(stripslashes($obj->firstname));
|
||||||
{
|
if ($obj->login) $uss[$obj->rowid].=' ('.$obj->login.')';
|
||||||
$obj = $db->fetch_object($result);
|
$i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
dol_print_error($db);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$uss[$obj->rowid] = ucfirst(stripslashes($obj->name)).' '.ucfirst(stripslashes($obj->firstname));
|
if ($caneditperms)
|
||||||
if ($obj->login) $uss[$obj->rowid].=' ('.$obj->login.')';
|
{
|
||||||
$i++;
|
$form = new Form($db);
|
||||||
}
|
print '<form action="fiche.php?id='.$group->id.'" method="post">'."\n";
|
||||||
}
|
print '<input type="hidden" name="action" value="adduser">';
|
||||||
else {
|
print '<table class="noborder" width="100%">'."\n";
|
||||||
dol_print_error($db);
|
print '<tr class="liste_titre"><td class="liste_titre" width="25%">'.$langs->trans("NonAffectedUsers").'</td>'."\n";
|
||||||
}
|
//print '<tr class="liste_titre"><td class="liste_titre" width="25%">'.$langs->trans("UsersToAdd").'</td>'."\n";
|
||||||
|
print '<td>';
|
||||||
|
print $form->select_array("user",$uss,'',1);
|
||||||
|
print ' ';
|
||||||
|
print '<input type="submit" class=button value="'.$langs->trans("Add").'">';
|
||||||
|
print '</td></tr>'."\n";
|
||||||
|
print '</table></form>'."\n";
|
||||||
|
print '<br>';
|
||||||
|
}
|
||||||
|
|
||||||
if ($caneditperms)
|
/*
|
||||||
{
|
* Membres du groupe
|
||||||
$form = new Form($db);
|
*/
|
||||||
print '<form action="fiche.php?id='.$group->id.'" method="post">'."\n";
|
$sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin, u.entity";
|
||||||
print '<input type="hidden" name="action" value="adduser">';
|
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
|
||||||
print '<table class="noborder" width="100%">'."\n";
|
$sql.= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
|
||||||
// print '<tr class="liste_titre"><td width="25%">'.$langs->trans("NonAffectedUsers").'</td>'."\n";
|
$sql.= " WHERE ug.fk_user = u.rowid";
|
||||||
print '<tr class="liste_titre"><td class="liste_titre" width="25%">'.$langs->trans("UsersToAdd").'</td>'."\n";
|
$sql.= " AND ug.fk_usergroup = ".$group->id;
|
||||||
print '<td>';
|
$sql.= " ORDER BY u.name";
|
||||||
print $form->select_array("user",$uss,'',1);
|
|
||||||
print ' ';
|
|
||||||
print '<input type="submit" class=button value="'.$langs->trans("Add").'">';
|
|
||||||
print '</td></tr>'."\n";
|
|
||||||
print '</table></form>'."\n";
|
|
||||||
print '<br>';
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
$result = $db->query($sql);
|
||||||
* Membres du groupe
|
if ($result)
|
||||||
*/
|
{
|
||||||
$sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin, u.entity";
|
$num = $db->num_rows($result);
|
||||||
$sql.= " FROM ".MAIN_DB_PREFIX."user as u,";
|
$i = 0;
|
||||||
$sql.= " ".MAIN_DB_PREFIX."usergroup_user as ug";
|
|
||||||
$sql.= " WHERE ug.fk_user = u.rowid";
|
|
||||||
$sql.= " AND ug.fk_usergroup = ".$group->id;
|
|
||||||
$sql.= " ORDER BY u.name";
|
|
||||||
|
|
||||||
$result = $db->query($sql);
|
print '<table class="noborder" width="100%">';
|
||||||
if ($result)
|
print '<tr class="liste_titre">';
|
||||||
{
|
print '<td class="liste_titre" width="25%">'.$langs->trans("Login").'</td>';
|
||||||
$num = $db->num_rows($result);
|
print '<td class="liste_titre" width="25%">'.$langs->trans("Lastname").'</td>';
|
||||||
$i = 0;
|
print '<td class="liste_titre" width="25%">'.$langs->trans("Firstname").'</td>';
|
||||||
|
print '<td> </td>';
|
||||||
|
print "<td> </td></tr>\n";
|
||||||
|
if ($num) {
|
||||||
|
$var=True;
|
||||||
|
while ($i < $num)
|
||||||
|
{
|
||||||
|
$obj = $db->fetch_object($result);
|
||||||
|
$var=!$var;
|
||||||
|
|
||||||
print '<table class="noborder" width="100%">';
|
print "<tr $bc[$var]>";
|
||||||
print '<tr class="liste_titre">';
|
print '<td>';
|
||||||
print '<td class="liste_titre" width="25%">'.$langs->trans("Login").'</td>';
|
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>';
|
||||||
print '<td class="liste_titre" width="25%">'.$langs->trans("Lastname").'</td>';
|
if ($obj->admin && !$obj->entity)
|
||||||
print '<td class="liste_titre" width="25%">'.$langs->trans("Firstname").'</td>';
|
{
|
||||||
print '<td> </td>';
|
print img_redstar($langs->trans("SuperAdministrator"));
|
||||||
print "<td> </td></tr>\n";
|
}
|
||||||
if ($num) {
|
else if ($obj->admin)
|
||||||
$var=True;
|
{
|
||||||
while ($i < $num)
|
print img_picto($langs->trans("Administrator"),'star');
|
||||||
{
|
}
|
||||||
$obj = $db->fetch_object($result);
|
print '</td>';
|
||||||
$var=!$var;
|
print '<td>'.ucfirst(stripslashes($obj->name)).'</td>';
|
||||||
|
print '<td>'.ucfirst(stripslashes($obj->firstname)).'</td>';
|
||||||
|
print '<td> </td><td>';
|
||||||
|
|
||||||
print "<tr $bc[$var]>";
|
if ($user->admin)
|
||||||
print '<td>';
|
{
|
||||||
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>';
|
|
||||||
if ($obj->admin && !$obj->entity)
|
|
||||||
{
|
|
||||||
print img_redstar($langs->trans("SuperAdministrator"));
|
|
||||||
}
|
|
||||||
else if ($obj->admin)
|
|
||||||
{
|
|
||||||
print img_picto($langs->trans("Administrator"),'star');
|
|
||||||
}
|
|
||||||
print '</td>';
|
|
||||||
print '<td>'.ucfirst(stripslashes($obj->name)).'</td>';
|
|
||||||
print '<td>'.ucfirst(stripslashes($obj->firstname)).'</td>';
|
|
||||||
print '<td> </td><td>';
|
|
||||||
|
|
||||||
if ($user->admin)
|
print '<a href="fiche.php?id='.$group->id.'&action=removeuser&user='.$obj->rowid.'">';
|
||||||
{
|
print img_delete($langs->trans("RemoveFromGroup"));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print "-";
|
||||||
|
}
|
||||||
|
print "</td></tr>\n";
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print '<tr><td colspan=2>'.$langs->trans("None").'</td></tr>';
|
||||||
|
}
|
||||||
|
print "</table>";
|
||||||
|
print "<br>";
|
||||||
|
$db->free($result);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
dol_print_error($db);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
print '<a href="fiche.php?id='.$group->id.'&action=removeuser&user='.$obj->rowid.'">';
|
/*
|
||||||
print img_delete($langs->trans("RemoveFromGroup"));
|
* Fiche en mode edition
|
||||||
}
|
*/
|
||||||
else
|
if ($_GET["action"] == 'edit' && $caneditperms)
|
||||||
{
|
{
|
||||||
print "-";
|
print '<form action="fiche.php?id='.$group->id.'" method="post" name="updategroup" enctype="multipart/form-data">';
|
||||||
}
|
print '<input type="hidden" name="action" value="update">';
|
||||||
print "</td></tr>\n";
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print '<tr><td colspan=2>'.$langs->trans("None").'</td></tr>';
|
|
||||||
}
|
|
||||||
print "</table>";
|
|
||||||
print "<br>";
|
|
||||||
$db->free($result);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
dol_print_error($db);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
print '<table class="border" width="100%">';
|
||||||
* Fiche en mode edition
|
print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
|
||||||
*/
|
print '<td width="75%" class="valeur"><input size="15" type="text" name="group" value="'.$group->nom.'">';
|
||||||
if ($_GET["action"] == 'edit' && $caneditperms)
|
if (!$group->entity)
|
||||||
{
|
{
|
||||||
print '<form action="fiche.php?id='.$group->id.'" method="post" name="updategroup" enctype="multipart/form-data">';
|
print img_redstar($langs->trans("GlobalGroup"));
|
||||||
print '<input type="hidden" name="action" value="update">';
|
}
|
||||||
|
print "</td></tr>\n";
|
||||||
|
print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
|
||||||
|
print '<td class="valeur">';
|
||||||
|
|
||||||
print '<table class="border" width="100%">';
|
|
||||||
print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
|
|
||||||
print '<td width="75%" class="valeur"><input size="15" type="text" name="group" value="'.$group->nom.'">';
|
|
||||||
if (!$group->entity)
|
|
||||||
{
|
|
||||||
print img_redstar($langs->trans("GlobalGroup"));
|
|
||||||
}
|
|
||||||
print "</td></tr>\n";
|
|
||||||
print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
|
|
||||||
print '<td class="valeur">';
|
|
||||||
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER)
|
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER)
|
||||||
{
|
{
|
||||||
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user