diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index fb1b2a3367b..f7478a3a57e 100755
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -50,6 +50,10 @@ ShowGroup=Show group
ShowUser=Show user
NonAffectedUsers=Non affected users
UserModified=User modified successfully
+GroupModified=Group modified successfully
PhotoFile=Fichier photo
UserWithDolibarrAccess=User with Dolibarr access
-ListOfUsersInGroup=List of users in group
\ No newline at end of file
+ListOfUsersInGroup=List of users in this group
+ListOfGroupsForUser=List of groups for this user
+UsersToAdd=Users to add to this group
+GroupsToAdd=Groups to add to this user
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 66982e99f90..8f6a3a9e22b 100755
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -50,6 +50,10 @@ ShowGroup=Afficher groupe
ShowUser=Afficher utilisateur
NonAffectedUsers=Utilisateurs non affectés au groupe
UserModified=Utilisateur modifié avec succès
+GroupModified=Groupe modifié avec succès
PhotoFile=Fichier photo
UserWithDolibarrAccess=Utilisateur avec accès Dolibarr
-ListOfUsersInGroup=Liste des utilisateurs dans le groupe
\ No newline at end of file
+ListOfUsersInGroup=Liste des utilisateurs dans ce groupe
+ListOfGroupsForUser=Liste des groupes pour cet utilisateur
+UsersToAdd=Utilisateur à ajouter à ce groupe
+GroupsToAdd=Groupes à ajouter pour cet utilisateur
\ No newline at end of file
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 4282d3bb15e..9469fab8c1b 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -22,7 +22,8 @@
* $Source$
*/
-/** \file htdocs/user/fiche.php
+/**
+ \file htdocs/user/fiche.php
\brief Onglet user et permissions de la fiche utilisateur
\version $Revision$
*/
@@ -43,89 +44,110 @@ $action=isset($_GET["action"])?$_GET["action"]:$_POST["action"];
*/
if ($_GET["subaction"] == 'addrights' && $user->admin)
{
- $edituser = new User($db,$_GET["id"]);
- $edituser->addrights($_GET["rights"]);
+ $edituser = new User($db,$_GET["id"]);
+ $edituser->addrights($_GET["rights"]);
}
if ($_GET["subaction"] == 'delrights' && $user->admin)
{
- $edituser = new User($db,$_GET["id"]);
- $edituser->delrights($_GET["rights"]);
+ $edituser = new User($db,$_GET["id"]);
+ $edituser->delrights($_GET["rights"]);
}
if ($_POST["action"] == 'confirm_disable' && $_POST["confirm"] == "yes")
{
- if ($_GET["id"] <> $user->id)
+ if ($_GET["id"] <> $user->id)
{
- $edituser = new User($db, $_GET["id"]);
- $edituser->fetch($_GET["id"]);
- $edituser->disable();
- Header("Location: index.php");
+ $edituser = new User($db, $_GET["id"]);
+ $edituser->fetch($_GET["id"]);
+ $edituser->disable();
+ Header("Location: index.php");
}
}
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == "yes")
{
- if ($_GET["id"] <> $user->id)
+ if ($_GET["id"] <> $user->id)
{
- $edituser = new User($db, $_GET["id"]);
- $edituser->fetch($_GET["id"]);
- $edituser->delete();
- Header("Location: index.php");
+ $edituser = new User($db, $_GET["id"]);
+ $edituser->fetch($_GET["id"]);
+ $edituser->delete();
+ Header("Location: index.php");
}
}
-
/**
* Action ajout user
*/
if ($_POST["action"] == 'add' && $user->admin)
{
- $message="";
- if (! $_POST["nom"]) {
- $message=''.$langs->trans("NameNotDefined").'
';
- $action="create"; // Go back to create page
- }
- if (! $_POST["login"]) {
- $message=''.$langs->trans("LoginNotDefined").'
';
- $action="create"; // Go back to create page
- }
-
- if (! $message) {
- $edituser = new User($db,0);
-
- $edituser->nom = trim($_POST["nom"]);
- $edituser->note = trim($_POST["note"]);
- $edituser->prenom = trim($_POST["prenom"]);
- $edituser->login = trim($_POST["login"]);
- $edituser->email = trim($_POST["email"]);
- $edituser->admin = trim($_POST["admin"]);
- $edituser->webcal_login = trim($_POST["webcal_login"]);
-
- $db->begin();
-
- $id = $edituser->create();
-
- if ($id > 0)
- {
- if (isset($_POST['password']) && trim($_POST['password']))
- {
- $edituser->password($user,trim($_POST['password']),$conf->password_encrypted);
- }
-
- $db->commit();
-
- Header("Location: fiche.php?id=$id");
- }
- else
- {
- $db->rollback();
-
- $message=''.$langs->trans("ErrorLoginAlreadyExists",$edituser->login).'
';
+ $message="";
+ if (! $_POST["nom"]) {
+ $message=''.$langs->trans("NameNotDefined").'
';
+ $action="create"; // Go back to create page
+ }
+ if (! $_POST["login"]) {
+ $message=''.$langs->trans("LoginNotDefined").'
';
$action="create"; // Go back to create page
}
- }
+ if (! $message) {
+ $edituser = new User($db,0);
+
+ $edituser->nom = trim($_POST["nom"]);
+ $edituser->note = trim($_POST["note"]);
+ $edituser->prenom = trim($_POST["prenom"]);
+ $edituser->login = trim($_POST["login"]);
+ $edituser->email = trim($_POST["email"]);
+ $edituser->admin = trim($_POST["admin"]);
+ $edituser->webcal_login = trim($_POST["webcal_login"]);
+
+ $db->begin();
+
+ $id = $edituser->create();
+
+ if ($id > 0)
+ {
+ if (isset($_POST['password']) && trim($_POST['password']))
+ {
+ $edituser->password($user,trim($_POST['password']),$conf->password_encrypted);
+ }
+
+ $db->commit();
+
+ Header("Location: fiche.php?id=$id");
+ }
+ else
+ {
+ $db->rollback();
+
+ $message=''.$langs->trans("ErrorLoginAlreadyExists",$edituser->login).'
';
+ $action="create"; // Go back to create page
+ }
+
+ }
+}
+
+if ($_POST["action"] == 'addgroup' && $user->admin)
+{
+ if ($_POST["group"])
+ {
+ $edituser = new User($db, $_GET["id"]);
+ $edituser->SetInGroup($_POST["group"]);
+
+ Header("Location: fiche.php?id=".$_GET["id"]);
+ }
+}
+
+if ($_GET["action"] == 'removegroup' && $user->admin)
+{
+ if ($_GET["group"])
+ {
+ $edituser = new User($db, $_GET["id"]);
+ $edituser->RemoveFromGroup($_GET["group"]);
+
+ Header("Location: fiche.php?id=".$_GET["id"]);
+ }
}
if ($_POST["action"] == 'update' && $user->admin)
@@ -133,7 +155,7 @@ if ($_POST["action"] == 'update' && $user->admin)
$message="";
$db->begin();
-
+
$edituser = new User($db, $_GET["id"]);
$edituser->fetch();
@@ -168,7 +190,7 @@ if ($_POST["action"] == 'update' && $user->admin)
$newfile=$conf->users->dir_output . "/" . $edituser->id . ".jpg";
if (! doliMoveFileUpload($_FILES['photo']['tmp_name'],$newfile))
{
- $message .= ''.$langs->trans("ErrorFailedToSaveFile").'
';
+ $message .= ''.$langs->trans("ErrorFailedToSaveFile").'
';
}
}
}
@@ -184,310 +206,422 @@ if ($_POST["action"] == 'update' && $user->admin)
if ($_GET["action"] == 'password' && $user->admin)
{
- $edituser = new User($db, $_GET["id"]);
- $edituser->fetch();
+ $edituser = new User($db, $_GET["id"]);
+ $edituser->fetch();
- if ($edituser->password($user,'',$conf->password_encrypted))
+ if ($edituser->password($user,'',$conf->password_encrypted))
{
- $message = ''.$langs->trans("PasswordChangedAndSentTo",$edituser->email).'
';
+ $message = ''.$langs->trans("PasswordChangedAndSentTo",$edituser->email).'
';
}
}
-llxHeader('','Fiche Utilisateur');
+llxHeader('',$langs->trans("UserCard"));
if ($action == 'create')
{
- /* ************************************************************************** */
- /* */
- /* Affichage fiche en mode création */
- /* */
- /* ************************************************************************** */
+ /* ************************************************************************** */
+ /* */
+ /* Affichage fiche en mode création */
+ /* */
+ /* ************************************************************************** */
- print_titre($langs->trans("NewUser"));
+ print_titre($langs->trans("NewUser"));
- print "
";
- if ($message) { print $message."
"; }
+ print "
";
+ if ($message) { print $message."
"; }
- print ''."\n";
+ }
+
+ /*
+ * Groupes affectés
+ */
+ $sql = "SELECT g.rowid, g.nom ";
+ $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
+ $sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+ $sql .= " WHERE ug.fk_usergroup = g.rowid";
+ $sql .= " AND ug.fk_user = ".$_GET["id"];
+ $sql .= " ORDER BY g.nom";
+
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $i = 0;
+
+ print '
';
+
+ print '";
+ print "
";
+ $db->free($result);
+ }
+ else {
+ dolibarr_print_error($db);
+ }
+
+ }
+
+ /*
+ * Fiche en mode edition
+ */
+ if ($_GET["action"] == 'edit' && $user->admin)
{
- print '';
}
+
}
-
}
$db->close();
diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php
index 7fc95139df6..66e1b5238a6 100644
--- a/htdocs/user/group/fiche.php
+++ b/htdocs/user/group/fiche.php
@@ -104,7 +104,32 @@ if ($_GET["action"] == 'removeuser' && $user->admin)
}
}
-llxHeader();
+if ($_POST["action"] == 'update' && $user->admin)
+{
+ $message="";
+
+ $db->begin();
+
+ $editgroup = new Usergroup($db, $_GET["id"]);
+ $editgroup->fetch($_GET["id"]);
+
+ $editgroup->nom = $_POST["group"];
+ $editgroup->note = $_POST["note"];
+
+ $ret=$editgroup->update();
+
+ if ($ret >= 0) {
+ $message.=''.$langs->trans("GroupModified").'
';
+ $db->commit();
+ } else {
+ $message.=''.$editgroup->error.'
';
+ $db->rollback;
+ }
+
+}
+
+
+llxHeader('',$langs->trans("GroupCard"));
/* ************************************************************************** */
@@ -145,7 +170,7 @@ if ($action == 'create')
/* ************************************************************************** */
else
{
- if ($_GET["id"])
+ if ($_GET["id"] )
{
$group = new UserGroup($db);
$group->fetch($_GET["id"]);
@@ -182,141 +207,182 @@ else
* Fiche en mode visu
*/
- print '';
- print '| '.$langs->trans("Name").' | ';
- print ''.$group->nom.' | ';
- print "
\n";
- print '| '.$langs->trans("Note").' | ';
- print ''.nl2br($group->note).' | ';
- print "
\n";
- print "
\n";
- print "
\n";
+ if ($_GET["action"] != 'edit') {
-
- print '';
-
- if ($message) { print $message; }
-
- /*
- * Barre d'actions
- *
- */
- print '\n";
- print "
\n";
-
- print_titre($langs->trans("ListOfUsersInGroup"));
- print "
\n";
-
- // On sélectionne les users qui ne sont pas déjà dans le groupe
- $uss = array();
-
- $sql = "SELECT u.rowid, u.name, u.firstname, u.code ";
- $sql .= " FROM ".MAIN_DB_PREFIX."user as u ";
- # $sql .= " LEFT JOIN llx_usergroup_user ug ON u.rowid = ug.fk_user";
- # $sql .= " WHERE ug.fk_usergroup IS NULL";
- $sql .= " ORDER BY u.name";
-
- $result = $db->query($sql);
- if ($result)
- {
- $num = $db->num_rows();
- $i = 0;
-
- while ($i < $num)
+ print '';
+ print '| '.$langs->trans("Name").' | ';
+ print ''.$group->nom.' | ';
+ print "
\n";
+ print '| '.$langs->trans("Note").' | ';
+ print ''.nl2br($group->note).' | ';
+ print "
\n";
+ print "
\n";
+ print "
\n";
+
+ print '';
+
+ if ($message) { print $message; }
+
+ /*
+ * Barre d'actions
+ *
+ */
+ print '';
+
+ if ($user->admin)
{
- $obj = $db->fetch_object();
-
- $uss[$obj->rowid] = ucfirst(stripslashes($obj->firstname)) . " ".ucfirst(stripslashes($obj->name));
- $i++;
+ print '
'.$langs->trans("Edit").'';
}
- }
- else {
- dolibarr_print_error($db);
- }
-
- if ($user->admin)
- {
- $form = new Form($db);
- print '
'."\n";
- }
-
- /*
- * Membres du groupe
- */
- $sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.code ";
- $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
- $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);
- if ($result)
- {
- $num = $db->num_rows($result);
- $i = 0;
-
- print '
';
-
- print '
';
- print '';
- print '| '.$langs->trans("Login").' | ';
- print ''.$langs->trans("Lastname").' | ';
- print ''.$langs->trans("Firstname").' | ';
- print ''.$langs->trans("Code").' | ';
- print " |
\n";
- $var=True;
- while ($i < $num)
+
+ if ($user->id <> $_GET["id"] && $user->admin)
{
- $obj = $db->fetch_object($result);
- $var=!$var;
-
- print "";
- print '| ';
- print ''.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.'';
- print ' | ';
- print ''.ucfirst(stripslashes($obj->name)).' | ';
- print ''.ucfirst(stripslashes($obj->firstname)).' | ';
- print ''.$obj->code.' | ';
-
- if ($user->admin)
+ print ''.$langs->trans("DeleteGroup").'';
+ }
+
+ print "\n";
+ print "
\n";
+
+
+ /*
+ * Liste des utilisateurs dans le groupe
+ */
+
+ print_titre($langs->trans("ListOfUsersInGroup"));
+ print "
\n";
+
+ // On sélectionne les users qui ne sont pas déjà dans le groupe
+ $uss = array();
+
+ $sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.code ";
+ $sql .= " FROM ".MAIN_DB_PREFIX."user as u ";
+ # $sql .= " LEFT JOIN llx_usergroup_user ug ON u.rowid = ug.fk_user";
+ # $sql .= " WHERE ug.fk_usergroup IS NULL";
+ $sql .= " ORDER BY u.name";
+
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows();
+ $i = 0;
+
+ while ($i < $num)
{
-
- print '';
- print img_delete($langs->trans("RemoveFromGroup"));
+ $obj = $db->fetch_object();
+
+ $uss[$obj->rowid] = ucfirst(stripslashes($obj->name)).' '.ucfirst(stripslashes($obj->firstname).' ('.$obj->login.')');
+ $i++;
+ }
+ }
+ else {
+ dolibarr_print_error($db);
+ }
+
+ if ($user->admin)
+ {
+ $form = new Form($db);
+ print ''."\n";
+ }
+
+ /*
+ * Membres du groupe
+ */
+ $sql = "SELECT u.rowid, u.login, u.name, u.firstname, u.code ";
+ $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+ $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);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $i = 0;
+
+ print '
';
+
+ print '";
+ print "
";
+ $db->free($result);
}
- print " |
";
- print "
";
- $db->free($result);
+ else {
+ dolibarr_print_error($db);
+ }
+ }
+
+ /*
+ * Fiche en mode edition
+ */
+ if ($_GET["action"] == 'edit' && $user->admin)
+ {
+ print '
';
+
+ print '