lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor esthetical change and fix

Browse Source
This commit is contained in:
Laurent Destailleur 2009-05-04 17:52:15 +00:00
parent 871a987e7a
commit 4220aa58eb
3 changed files with 338 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

548
htdocs/user/group/fiche.php
View File

@ -47,14 +47,14 @@ $action=isset($_GET["action"])?$_GET["action"]:$_POST["action"];
*/ */
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes") if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes")
{ {
if($caneditperms){ if($caneditperms){
$editgroup = new Usergroup($db, $_GET["id"]); $editgroup = new Usergroup($db, $_GET["id"]);
$editgroup->fetch($_GET["id"]); $editgroup->fetch($_GET["id"]);
$editgroup->delete(); $editgroup->delete();
Header("Location: index.php"); Header("Location: index.php");
}else{ }else{
$message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>'; $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
} }
} }
/** /**
@ -62,97 +62,97 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes")
*/ */
if ($_POST["action"] == 'add') if ($_POST["action"] == 'add')
{ {
if($caneditperms){ if($caneditperms){
$message=""; $message="";
if (! $_POST["nom"]) { if (! $_POST["nom"]) {
$message='<div class="error">'.$langs->trans("NameNotDefined").'</div>'; $message='<div class="error">'.$langs->trans("NameNotDefined").'</div>';
$action="create"; // Go back to create page $action="create"; // Go back to create page
} }
if (! $message) { if (! $message) {
$editgroup = new UserGroup($db,0); $editgroup = new UserGroup($db,0);
$editgroup->nom = trim($_POST["nom"]); $editgroup->nom = trim($_POST["nom"]);
$editgroup->note = trim($_POST["note"]); $editgroup->note = trim($_POST["note"]);
$db->begin(); $db->begin();
$id = $editgroup->create(); $id = $editgroup->create();
if ($id > 0) if ($id > 0)
{ {
$db->commit(); $db->commit();
Header("Location: fiche.php?id=".$editgroup->id); Header("Location: fiche.php?id=".$editgroup->id);
} }
else else
{ {
$langs->load("errors"); $langs->load("errors");
$db->rollback(); $db->rollback();
$message='<div class="error">'.$langs->trans("ErrorGroupAlreadyExists",$editgroup->nom).'</div>'; $message='<div class="error">'.$langs->trans("ErrorGroupAlreadyExists",$editgroup->nom).'</div>';
$action="create"; // Go back to create page $action="create"; // Go back to create page
} }
} }
}else{ }else{
$message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>'; $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
} }
} }
if ($_POST["action"] == 'adduser') if ($_POST["action"] == 'adduser')
{ {
if($caneditperms){ if($caneditperms){
if ($_POST["user"]) if ($_POST["user"])
{ {
$edituser = new User($db, $_POST["user"]); $edituser = new User($db, $_POST["user"]);
$edituser->SetInGroup($_GET["id"]); $edituser->SetInGroup($_GET["id"]);
Header("Location: fiche.php?id=".$_GET["id"]); Header("Location: fiche.php?id=".$_GET["id"]);
} }
}else{ }else{
$message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>'; $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
} }
} }
if ($_GET["action"] == 'removeuser') if ($_GET["action"] == 'removeuser')
{ {
if($caneditperms){ if($caneditperms){
if ($_GET["user"]) if ($_GET["user"])
{ {
$edituser = new User($db, $_GET["user"]); $edituser = new User($db, $_GET["user"]);
$edituser->RemoveFromGroup($_GET["id"]); $edituser->RemoveFromGroup($_GET["id"]);
Header("Location: fiche.php?id=".$_GET["id"]); Header("Location: fiche.php?id=".$_GET["id"]);
} }
}else{ }else{
$message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>'; $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
} }
} }
if ($_POST["action"] == 'update') if ($_POST["action"] == 'update')
{ {
if($caneditperms){ if($caneditperms){
$message=""; $message="";
$db->begin(); $db->begin();
$editgroup = new Usergroup($db, $_GET["id"]); $editgroup = new Usergroup($db, $_GET["id"]);
$editgroup->fetch($_GET["id"]); $editgroup->fetch($_GET["id"]);
$editgroup->nom = $_POST["group"]; $editgroup->nom = $_POST["group"];
$editgroup->note = $_POST["note"]; $editgroup->note = $_POST["note"];
$ret=$editgroup->update(); $ret=$editgroup->update();
if ($ret >= 0) { if ($ret >= 0) {
$message.='<div class="ok">'.$langs->trans("GroupModified").'</div>'; $message.='<div class="ok">'.$langs->trans("GroupModified").'</div>';
$db->commit(); $db->commit();
} else { } else {
$message.='<div class="error">'.$editgroup->error.'</div>'; $message.='<div class="error">'.$editgroup->error.'</div>';
$db->rollback; $db->rollback;
} }
}else{ }else{
$message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>'; $message = '<div class="error">'.$langs->trans('ErrorForbidden').'</div>';
} }
} }
@ -169,20 +169,20 @@ $html = new Form($db);
if ($action == 'create') if ($action == 'create')
{ {
print_fiche_titre($langs->trans("NewGroup")); print_fiche_titre($langs->trans("NewGroup"));
print "<br>"; print "<br>";
if ($message) { print $message."<br>"; } if ($message) { print $message."<br>"; }
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr>".'<td valign="top">'.$langs->trans("Name").'</td>'; print "<tr>".'<td valign="top">'.$langs->trans("Name").'</td>';
print '<td class="valeur"><input size="30" type="text" name="nom" value=""></td></tr>'; print '<td class="valeur"><input size="30" type="text" name="nom" value=""></td></tr>';
print "<tr>".'<td valign="top">'.$langs->trans("Note").'</td><td>'; print "<tr>".'<td valign="top">'.$langs->trans("Note").'</td><td>';
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");
@ -194,11 +194,11 @@ if ($action == 'create')
print '<textarea class="flat" name="note" rows="'.ROWS_8.'" cols="90">'; print '<textarea class="flat" name="note" rows="'.ROWS_8.'" cols="90">';
print '</textarea>'; print '</textarea>';
} }
print "</textarea></td></tr>\n"; print "</textarea></td></tr>\n";
print "<tr>".'<td align="center" colspan="2"><input class="button" value="'.$langs->trans("CreateGroup").'" type="submit"></td></tr>'; print "<tr>".'<td align="center" colspan="2"><input class="button" value="'.$langs->trans("CreateGroup").'" type="submit"></td></tr>';
print "</table>\n"; print "</table>\n";
print "</form>"; print "</form>";
} }
@ -210,225 +210,225 @@ if ($action == 'create')
else else
{ {
if ($_GET["id"] ) if ($_GET["id"] )
{ {
$group = new UserGroup($db); $group = new UserGroup($db);
$group->fetch($_GET["id"]); $group->fetch($_GET["id"]);
/* /*
* Affichage onglets * Affichage onglets
*/ */
$head = group_prepare_head($group); $head = group_prepare_head($group);
$title = $langs->trans("Group"); $title = $langs->trans("Group");
if (!$group->entity) $title = $langs->trans("GlobalGroup"); if (! $group->entity) $title = $langs->trans("GlobalGroup");
dol_fiche_head($head, 'group', $title.": ".$group->nom); dol_fiche_head($head, 'group', $title);
/* /*
* Confirmation suppression * Confirmation suppression
*/ */
if ($action == 'delete') if ($action == 'delete')
{ {
$html = new Form($db); $html = new Form($db);
$html->form_confirm("fiche.php?id=$group->id",$langs->trans("DeleteAGroup"),$langs->trans("ConfirmDeleteGroup",$group->name),"confirm_delete"); $html->form_confirm("fiche.php?id=$group->id",$langs->trans("DeleteAGroup"),$langs->trans("ConfirmDeleteGroup",$group->name),"confirm_delete");
} }
/* /*
* Fiche en mode visu * Fiche en mode visu
*/ */
if ($action != 'edit') if ($action != 'edit')
{ {
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Ref // Ref
print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print $html->showrefnav($group,'id','',$user->rights->user->user->lire || $user->admin); print $html->showrefnav($group,'id','',$user->rights->user->user->lire || $user->admin);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Nom
print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
print '<td width="75%" class="valeur">'.$group->nom;
if (!$group->entity)
{
print img_redstar($langs->trans("GlobalGroup"));
}
print "</td></tr>\n";
// Note // Name
print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
print '<td class="valeur">'.nl2br($group->note).'&nbsp;</td>'; print '<td width="75%" class="valeur">'.$group->nom;
print "</tr>\n"; if (!$group->entity)
print "</table>\n"; {
print img_redstar($langs->trans("GlobalGroup"));
}
print "</td></tr>\n";
print '</div>'; // Note
print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
print '<td class="valeur">'.nl2br($group->note).'&nbsp;</td>';
print "</tr>\n";
print "</table>\n";
/* print '</div>';
* Barre d'actions
*/
print '<div class="tabsAction">';
if ($caneditperms) /*
{ * Barre d'actions
print '<a class="butAction" href="fiche.php?id='.$group->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'; */
} print '<div class="tabsAction">';
if ($candisableperms) if ($caneditperms)
{ {
print '<a class="butActionDelete" href="fiche.php?action=delete&amp;id='.$group->id.'">'.$langs->trans("DeleteGroup").'</a>'; print '<a class="butAction" href="fiche.php?id='.$group->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
} }
print "</div>\n"; if ($candisableperms)
print "<br>\n"; {
print '<a class="butActionDelete" href="fiche.php?action=delete&amp;id='.$group->id.'">'.$langs->trans("DeleteGroup").'</a>';
}
print "</div>\n";
print "<br>\n";
if ($message) { print $message."<br>"; } if ($message) { print $message."<br>"; }
/* /*
* Liste des utilisateurs dans le groupe * Liste des utilisateurs dans le groupe
*/ */
print_fiche_titre($langs->trans("ListOfUsersInGroup"),'',''); print_fiche_titre($langs->trans("ListOfUsersInGroup"),'','');
// On sélectionne les users qui ne sont pas déjà dans le groupe // On sélectionne les users qui ne sont pas déjà dans le groupe
$uss = array(); $uss = array();
$sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin"; $sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE u.entity IN (0,".$conf->entity.")"; $sql.= " WHERE u.entity IN (0,".$conf->entity.")";
$sql.= " ORDER BY u.name"; $sql.= " ORDER BY u.name";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$uss[$obj->rowid] = ucfirst(stripslashes($obj->name)).' '.ucfirst(stripslashes($obj->firstname)); $uss[$obj->rowid] = ucfirst(stripslashes($obj->name)).' '.ucfirst(stripslashes($obj->firstname));
if ($obj->login) $uss[$obj->rowid].=' ('.$obj->login.')'; if ($obj->login) $uss[$obj->rowid].=' ('.$obj->login.')';
$i++; $i++;
} }
} }
else { else {
dol_print_error($db); dol_print_error($db);
} }
if ($caneditperms) if ($caneditperms)
{ {
$form = new Form($db); $form = new Form($db);
print '<form action="fiche.php?id='.$group->id.'" method="post">'."\n"; print '<form action="fiche.php?id='.$group->id.'" method="post">'."\n";
print '<input type="hidden" name="action" value="adduser">'; print '<input type="hidden" name="action" value="adduser">';
print '<table class="noborder" width="100%">'."\n"; print '<table class="noborder" width="100%">'."\n";
// print '<tr class="liste_titre"><td width="25%">'.$langs->trans("NonAffectedUsers").'</td>'."\n"; // print '<tr class="liste_titre"><td width="25%">'.$langs->trans("NonAffectedUsers").'</td>'."\n";
print '<tr class="liste_titre"><td class="liste_titre" width="25%">'.$langs->trans("UsersToAdd").'</td>'."\n"; print '<tr class="liste_titre"><td class="liste_titre" width="25%">'.$langs->trans("UsersToAdd").'</td>'."\n";
print '<td>'; print '<td>';
print $form->select_array("user",$uss,'',1); print $form->select_array("user",$uss,'',1);
print ' &nbsp; '; print ' &nbsp; ';
print '<input type="submit" class=button value="'.$langs->trans("Add").'">'; print '<input type="submit" class=button value="'.$langs->trans("Add").'">';
print '</td></tr>'."\n"; print '</td></tr>'."\n";
print '</table></form>'."\n"; print '</table></form>'."\n";
print '<br>'; print '<br>';
} }
/* /*
* Membres du groupe * Membres du groupe
*/ */
$sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin, u.entity"; $sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.admin, u.entity";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u,"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u,";
$sql.= " ".MAIN_DB_PREFIX."usergroup_user as ug"; $sql.= " ".MAIN_DB_PREFIX."usergroup_user as ug";
$sql.= " WHERE ug.fk_user = u.rowid"; $sql.= " WHERE ug.fk_user = u.rowid";
$sql.= " AND ug.fk_usergroup = ".$group->id; $sql.= " AND ug.fk_usergroup = ".$group->id;
$sql.= " ORDER BY u.name"; $sql.= " ORDER BY u.name";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td class="liste_titre" width="25%">'.$langs->trans("Login").'</td>'; print '<td class="liste_titre" width="25%">'.$langs->trans("Login").'</td>';
print '<td class="liste_titre" width="25%">'.$langs->trans("Lastname").'</td>'; print '<td class="liste_titre" width="25%">'.$langs->trans("Lastname").'</td>';
print '<td class="liste_titre" width="25%">'.$langs->trans("Firstname").'</td>'; print '<td class="liste_titre" width="25%">'.$langs->trans("Firstname").'</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print "<td>&nbsp;</td></tr>\n"; print "<td>&nbsp;</td></tr>\n";
if ($num) { if ($num) {
$var=True; $var=True;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td>'; print '<td>';
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'</a>'; 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) if ($obj->admin && !$obj->entity)
{ {
print img_redstar($langs->trans("SuperAdministrator")); print img_redstar($langs->trans("SuperAdministrator"));
} }
else if ($obj->admin) else if ($obj->admin)
{ {
print img_picto($langs->trans("Administrator"),'star'); print img_picto($langs->trans("Administrator"),'star');
} }
print '</td>'; print '</td>';
print '<td>'.ucfirst(stripslashes($obj->name)).'</td>'; print '<td>'.ucfirst(stripslashes($obj->name)).'</td>';
print '<td>'.ucfirst(stripslashes($obj->firstname)).'</td>'; print '<td>'.ucfirst(stripslashes($obj->firstname)).'</td>';
print '<td>&nbsp;</td><td>'; print '<td>&nbsp;</td><td>';
if ($user->admin) if ($user->admin)
{ {
print '<a href="fiche.php?id='.$group->id.'&amp;action=removeuser&amp;user='.$obj->rowid.'">'; print '<a href="fiche.php?id='.$group->id.'&amp;action=removeuser&amp;user='.$obj->rowid.'">';
print img_delete($langs->trans("RemoveFromGroup")); print img_delete($langs->trans("RemoveFromGroup"));
} }
else else
{ {
print "-"; print "-";
} }
print "</td></tr>\n"; print "</td></tr>\n";
$i++; $i++;
} }
} }
else else
{ {
print '<tr><td colspan=2>'.$langs->trans("None").'</td></tr>'; print '<tr><td colspan=2>'.$langs->trans("None").'</td></tr>';
} }
print "</table>"; print "</table>";
print "<br>"; print "<br>";
$db->free($result); $db->free($result);
} }
else { else {
dol_print_error($db); dol_print_error($db);
} }
} }
/* /*
* Fiche en mode edition * Fiche en mode edition
*/ */
if ($_GET["action"] == 'edit' && $caneditperms) if ($_GET["action"] == 'edit' && $caneditperms)
{ {
print '<form action="fiche.php?id='.$group->id.'" method="post" name="updategroup" enctype="multipart/form-data">'; 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 '<input type="hidden" name="action" value="update">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>'; 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.'">'; print '<td width="75%" class="valeur"><input size="15" type="text" name="group" value="'.$group->nom.'">';
if (!$group->entity) if (!$group->entity)
{ {
print img_redstar($langs->trans("GlobalGroup")); print img_redstar($langs->trans("GlobalGroup"));
} }
print "</td></tr>\n"; print "</td></tr>\n";
print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
print '<td class="valeur">'; 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");
@ -442,15 +442,15 @@ else
print '</textarea>'; print '</textarea>';
} }
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";
print '<tr><td align="center" colspan="2"><input class="button" value="'.$langs->trans("Save").'" type="submit"></td></tr>'; print '<tr><td align="center" colspan="2"><input class="button" value="'.$langs->trans("Save").'" type="submit"></td></tr>';
print "</table>\n"; print "</table>\n";
print '</form>'; print '</form>';
print '</div>'; print '</div>';
} }
} }
} }
$db->close(); $db->close();

19
htdocs/user/group/ldap.php
View File

@ -62,7 +62,7 @@ $fgroup->getrights();
*/ */
$head = group_prepare_head($fgroup); $head = group_prepare_head($fgroup);
dol_fiche_head($head, 'ldap', $langs->trans("Group").": ".$fgroup->nom); dol_fiche_head($head, 'ldap', $langs->trans("Group"));
@ -71,10 +71,21 @@ dol_fiche_head($head, 'ldap', $langs->trans("Group").": ".$fgroup->nom);
*/ */
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Nom // Ref
print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">';
print $form->showrefnav($fgroup,'id','',$user->rights->user->group->lire || $user->admin);
print '</td>';
print '</tr>';
// Name
print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
print '<td width="75%" class="valeur">'.$fgroup->nom.'</td>'; print '<td width="75%" class="valeur">'.$fgroup->nom;
print "</tr>\n"; if (!$fgroup->entity)
{
print img_redstar($langs->trans("GlobalGroup"));
}
print "</td></tr>\n";
// Note // Note
print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';

90
htdocs/user/group/perms.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org> * Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
@ -21,19 +21,16 @@
*/ */
/** /**
\file htdocs/user/group/perms.php * \file htdocs/user/group/perms.php
\brief Onglet user et permissions de la fiche utilisateur * \brief Onglet user et permissions de la fiche utilisateur
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/usergroups.lib.php");
$langs->load("users"); $langs->load("users");
$form = new Form($db);
$module=isset($_GET["module"])?$_GET["module"]:$_POST["module"]; $module=isset($_GET["module"])?$_GET["module"]:$_POST["module"];
// Defini si peux modifier utilisateurs et permisssions // Defini si peux modifier utilisateurs et permisssions
@ -62,6 +59,8 @@ if ($_GET["action"] == 'delrights' && $caneditperms)
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
$form = new Form($db);
llxHeader('',$langs->trans("Permissions")); llxHeader('',$langs->trans("Permissions"));
if ($_GET["id"]) if ($_GET["id"])
@ -77,38 +76,47 @@ if ($_GET["id"])
$title = $langs->trans("Group"); $title = $langs->trans("Group");
if (!$fgroup->entity) $title = $langs->trans("GlobalGroup"); if (!$fgroup->entity) $title = $langs->trans("GlobalGroup");
dol_fiche_head($head, 'rights', $title.": ".$fgroup->nom); dol_fiche_head($head, 'rights', $title);
$db->begin(); $db->begin();
// Charge les modules soumis a permissions // Charge les modules soumis a permissions
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/";
$handle=opendir($dir);
$modules = array(); $modules = array();
while (($file = readdir($handle))!==false) foreach ($conf->dol_document_root as $dirroot)
{ {
if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, strlen($file) - 10) == '.class.php') $dir = $dirroot . "/includes/modules/";
{
$modName = substr($file, 0, strlen($file) - 10);
if ($modName) // Load modules attributes in arrays (name, numero, orders) from dir directory
{ //print $dir."\n<br>";
include_once("../../includes/modules/$file"); $handle=@opendir($dir);
$objMod = new $modName($db); if ($handle)
if ($objMod->rights_class) { {
while (($file = readdir($handle))!==false)
{
if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, strlen($file) - 10) == '.class.php')
{
$modName = substr($file, 0, strlen($file) - 10);
$ret=$objMod->insert_permissions(); if ($modName)
{
include_once($dir."/".$file);
$objMod = new $modName($db);
if ($objMod->rights_class) {
$ret=$objMod->insert_permissions();
$modules[$objMod->rights_class]=$objMod;
//print "modules[".$objMod->rights_class."]=$objMod;";
}
}
}
}
}
}
$modules[$objMod->rights_class]=$objMod;
//print "modules[".$objMod->rights_class."]=$objMod;";
}
}
}
}
$db->commit(); $db->commit();
// Lecture des droits groupes // Lecture des droits groupes
$permsgroup = array(); $permsgroup = array();
@ -144,32 +152,32 @@ if ($_GET["id"])
*/ */
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Ref // Ref
print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
print '<td colspan="2">'; print '<td colspan="2">';
print $form->showrefnav($fgroup,'id','',$user->rights->user->user->lire || $user->admin); print $form->showrefnav($fgroup,'id','',$user->rights->user->user->lire || $user->admin);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Nom // Nom
print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
print '<td colspan="2">'.$fgroup->nom.''; print '<td colspan="2">'.$fgroup->nom.'';
if (!$obj->entity) if (! $fgroup->entity)
{ {
print img_redstar($langs->trans("GlobalGroup")); print img_redstar($langs->trans("GlobalGroup"));
} }
print "</td></tr>\n"; print "</td></tr>\n";
// Note // Note
print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
print '<td class="valeur">'.nl2br($fgroup->note).'&nbsp;</td>'; print '<td class="valeur">'.nl2br($fgroup->note).'</td>';
print "</tr>\n"; print "</tr>\n";
print '</table><br>'; print '</table><br>';
if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules")); if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"));
print '<table width="100%" class="noborder">'; print '<table width="100%" class="noborder">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Module").'</td>'; print '<td>'.$langs->trans("Module").'</td>';
@ -195,7 +203,7 @@ if ($_GET["id"])
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
// Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore // Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore
if (! $modules[$obj->module]) if (! $modules[$obj->module])
{ {
$i++; $i++;
continue; continue;
@ -209,12 +217,12 @@ if ($_GET["id"])
// Rupture détectée, on récupère objMod // Rupture détectée, on récupère objMod
$objMod = $modules[$obj->module]; $objMod = $modules[$obj->module];
$picto=($objMod->picto?$objMod->picto:'generic'); $picto=($objMod->picto?$objMod->picto:'generic');
if ($caneditperms) if ($caneditperms)
{ {
print '<tr '. $bc[$var].'>'; print '<tr '. $bc[$var].'>';
print '<td nowrap="nowrap">'.img_object('',$picto).' '.$objMod->getName(); print '<td nowrap="nowrap">'.img_object('',$picto).' '.$objMod->getName();
print '<a name="'.$objMod->getName().'">&nbsp;</a></td>'; print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
print '<td align="center" nowrap="nowrap">'; print '<td align="center" nowrap="nowrap">';
print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$fgroup->id.'&amp;action=addrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>"; print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$fgroup->id.'&amp;action=addrights&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
print '/'; print '/';