[Dolibarr-cvs] dolibarr/htdocs/user fiche.php

[Regis Houssin]

CVSROOT:        /cvsroot/dolibarr
Module name:    dolibarr
Changes by:     Regis Houssin <hregis>  06/06/13 17:36:23

Modified files:
        htdocs/user    : fiche.php 

Log message:
        Fix: amélioration des droits

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dolibarr/htdocs/user/fiche.php?cvsroot=dolibarr&r1=1.88&r2=1.89

Patches:
Index: fiche.php
===================================================================
RCS file: /cvsroot/dolibarr/dolibarr/htdocs/user/fiche.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- fiche.php   8 May 2006 17:22:54 -0000       1.88
+++ fiche.php   13 Jun 2006 17:36:23 -0000      1.89
@@ -20,14 +20,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: fiche.php,v 1.88 2006/05/08 17:22:54 eldy Exp $
+ * $Id: fiche.php,v 1.89 2006/06/13 17:36:23 hregis Exp $
  * $Source: /cvsroot/dolibarr/dolibarr/htdocs/user/fiche.php,v $
  */
 
 /**     
         \file       htdocs/user/fiche.php
         \brief      Onglet user et permissions de la fiche utilisateur
-        \version    $Revision: 1.88 $
+        \version    $Revision: 1.89 $
 */
 
 require("./pre.inc.php");
@@ -38,6 +38,8 @@
 $canreadperms=($user->admin || $user->rights->user->user->lire);
 $caneditperms=($user->admin || $user->rights->user->user->creer);
 $candisableperms=($user->admin || $user->rights->user->user->supprimer);
+$caneditselfperms=($user->rights->user->self->supprimer);
+$caneditpassword=($user->rights->user->self->password);
 
 if ($user->id <> $_GET["id"])
 {
@@ -177,7 +179,7 @@
     }
 }
 
-if ($_POST["action"] == 'update' && $caneditperms)
+if ($_POST["action"] == 'update' && ($caneditperms || $caneditselfperms))
 {
     $message="";
 
@@ -249,7 +251,7 @@
 
 // Action modif mot de passe
 if ((($_POST["action"] == 'confirm_password' && $_POST["confirm"] == 'yes')
-      || $_GET["action"] == 'confirm_passwordsend') && $caneditperms)
+      || $_GET["action"] == 'confirm_passwordsend') && ($caneditperms || 
$caneditpassword)
 {
     $edituser = new User($db, $_GET["id"]);
     $edituser->fetch();
@@ -581,7 +583,7 @@
              */
             print '<div class="tabsAction">';
 
-            if ($caneditperms || ($user->id == $fuser->id))
+            if ($caneditperms || (($user->id == $fuser->id) && 
$caneditselfperms))
             {
                 print '<a class="butAction" 
href="fiche.php?id='.$fuser->id.'&amp;action=edit">'.$langs->trans("Edit").'</a>';
             }
@@ -871,5 +873,5 @@
 
 $db->close();
 
-llxFooter('$Date: 2006/05/08 17:22:54 $ - $Revision: 1.88 $');
+llxFooter('$Date: 2006/06/13 17:36:23 $ - $Revision: 1.89 $');
 ?>