From b78cea389b6e8eacd85e1c5290f6a8801273ca22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 16 Jan 2005 20:21:58 +0000
Subject: [PATCH] New: Modification de la forme de la fiche user pour permettre
 l'ajout d'une photo.

---
 htdocs/user.class.php | 26 +++++++++-------
 htdocs/user/fiche.php | 71 +++++++++++++++++++++++++++----------------
 2 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/htdocs/user.class.php b/htdocs/user.class.php
index 04b8a0951e3..3c11aff395d 100644
--- a/htdocs/user.class.php
+++ b/htdocs/user.class.php
@@ -53,8 +53,11 @@ class User
   var $admin;
   var $login;
   var $pass;
+  var $datec;
+  var $datem;
   var $societe_id;
   var $webcal_login;
+ 
   var $errorstr;
   var $userpref_limite_liste;
   var $all_permissions_are_loaded;         /**< \private all_permissions_are_loaded */
@@ -543,6 +546,7 @@ class User
         
     }
 
+
   /**
    *    \brief      Charge un objet user avec toutes ces caractéristiques depuis un login
    *    \param      login   login a charger
@@ -551,9 +555,9 @@ class User
   function fetch($login='')
     {
       
-      //$sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.code, u.admin, u.module_comm, u.module_compta, u.login, u.pass, u.webcal_login, u.note";
-      //$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-      $sql = "SELECT * FROM ".MAIN_DB_PREFIX."user as u";
+      $sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.code, u.admin, u.login, u.pass, u.webcal_login, u.note";
+      $sql .= ", ".$this->db->pdate("u.datec")." datec, ".$this->db->pdate("u.tms")." datem";
+      $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
       if ($this->id)
 	{
 	  $sql .= " WHERE u.rowid = $this->id";
@@ -574,18 +578,18 @@ class User
 	      $this->nom = stripslashes($obj->name);
 	      $this->prenom = stripslashes($obj->firstname);
 	      
-	      $this->note = stripslashes($obj->note);
-	      
 	      $this->fullname = $this->prenom . ' ' . $this->nom;
-	      $this->admin = $obj->admin;
-	      $this->webcal_login = $obj->webcal_login;
 	      $this->code = $obj->code;
-	      $this->email = $obj->email;
-	      
-	      $this->contact_id = $obj->fk_socpeople;
-	      
 	      $this->login = $obj->login;
 	      $this->pass  = $obj->pass;
+	      $this->email = $obj->email;
+	      $this->admin = $obj->admin;
+	      $this->contact_id = $obj->fk_socpeople;
+	      $this->note = stripslashes($obj->note);
+	      
+	      $this->datec  = $obj->datec;
+	      $this->datem  = $obj->datem;
+
 	      $this->webcal_login = $obj->webcal_login;
 	      
 	      $this->societe_id = $obj->fk_societe;
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 909eb2546a7..5ac9fe4facc 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -22,10 +22,9 @@
  * $Source$
  */
 
-/**
-   \file       htdocs/user/fiche.php
-   \brief      Onglet user et permissions de la fiche utilisateur
-   \version    $Revision$
+/**     \file       htdocs/user/fiche.php
+        \brief      Onglet user et permissions de la fiche utilisateur
+        \version    $Revision$
 */
 
 
@@ -328,33 +327,43 @@ else
 	    
 	  print '<table class="border" width="100%">';
 	    
-	  print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Lastname").'</td>';
-	  print '<td width="25%" class="valeur">'.$fuser->nom.'</td>';
-	  print '<td width="25%" valign="top">'.$langs->trans("Firstname").'</td>';
-	  print '<td width="25%" class="valeur">'.$fuser->prenom.'</td>';
+	  print '<tr><td width="25%" valign="top">'.$langs->trans("Lastname").'</td>';
+	  print '<td colspan="2" width="50%" class="valeur">'.$fuser->nom.'</td>';
+	  print '<td align=center valign=top width="50%" rowspan="8">';
+	  if (file_exists($conf->users->dir_output."/".$fuser->id.".jpg"))
+	  {
+	        print '<img src="'.DOL_URL_ROOT.'/image.php?modulepart=userphoto&file='.$fuser->id.'.jpg">';
+	  }
+	  else {
+	        print '<img src="'.DOL_URL_ROOT.'/theme/nophoto.jpg">';
+	  }
+	  print '</td></tr>';
+
+	  print '<tr><td width="25%" valign="top">'.$langs->trans("Firstname").'</td>';
+	  print '<td colspan="2" width="50%" class="valeur">'.$fuser->prenom.'</td>';
 	  print "</tr>\n";
 	    
-	  print "<tr>".'<td width="25%" valign="top">'.$langs->trans("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%" class="valeur"><a href="mailto:'.$fuser->email.'">'.$fuser->email.'</a></td>';
+	  print '<tr><td width="25%" valign="top">'.$langs->trans("Login").'</td>';
+	  print '<td colspan="2" width="50%" class="valeur">'.$fuser->login.'</td></tr>';
+
+	  print '<tr><td width="25%" valign="top">'.$langs->trans("EMail").'</td>';
+	  print '<td colspan="2" width="50%" class="valeur"><a href="mailto:'.$fuser->email.'">'.$fuser->email.'</a></td>';
 	  print "</tr>\n";
             
-	  print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Administrator").'</td>';
-	  print '<td colspan="3" class="valeur">'.yn($fuser->admin).'</td>';
+	  print '<tr><td width="25%" valign="top">'.$langs->trans("Administrator").'</td>';
+	  print '<td colspan="2" class="valeur">'.yn($fuser->admin).'</td>';
 	  print "</tr>\n";
 
-	  if ($fuser->societe_id > 0)
-	    {
-	      $societe = new Societe($db);
-	      $societe->fetch($fuser->societe_id);
-	      print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Company").'</td>';
-	      print '<td colspan="3">'.$societe->nom.'&nbsp;</td>';
-	      print "</tr>\n";
-	    }
+	  print '<tr><td width="25%" valign="top">'.$langs->trans("DateCreation").'</td>';
+	  print '<td colspan="2" class="valeur">'.dolibarr_print_date($fuser->datec).'</td>';
+	  print "</tr>\n";
+
+	  print '<tr><td width="25%" valign="top">'.$langs->trans("DateModification").'</td>';
+	  print '<td colspan="2" class="valeur">'.dolibarr_print_date($fuser->datem).'</td>';
+	  print "</tr>\n";
 
 	  print "<tr>".'<td width="25%" valign="top">'.$langs->trans("ContactCard").'</td>';
-	  print '<td colspan="3" valign="top">';
+	  print '<td>';
 	  if ($fuser->contact_id)
             {
 	      print '<a href="../contact/fiche.php?id='.$fuser->contact_id.'">'.$langs->trans("ContactCard").'</a>';
@@ -365,6 +374,16 @@ else
             }
 	  print '</td>';
 	  print "</tr>\n";
+	  
+
+	  if ($fuser->societe_id > 0)
+	    {
+	      $societe = new Societe($db);
+	      $societe->fetch($fuser->societe_id);
+	      print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Company").'</td>';
+	      print '<td colspan="3">'.$societe->nom.'&nbsp;</td>';
+	      print "</tr>\n";
+	    }
 
 	  print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Note").'</td>';
 	  print '<td colspan="3" class="valeur">'.nl2br($fuser->note).'&nbsp;</td>';
@@ -418,16 +437,16 @@ else
         {
 	  print '<form action="fiche.php?id='.$fuser->id.'" method="post">';
 	  print '<input type="hidden" name="action" value="update">';
-	  print '<table wdith="100%" class="border">';
+	  print '<table width="100%" class="border">';
 
 	  print "<tr>".'<td valign="top">'.$langs->trans("Lastname").'</td>';
 	  print '<td><input size="30" type="text" name="nom" value="'.$fuser->nom.'"></td></tr>';
 
 	  print "<tr>".'<td valign="top">'.$langs->trans("Firstname").'</td>';
-	  print '<td><input size="20" type="text" name="prenom" value="'.$fuser->prenom.'"></td></tr>';
+	  print '<td><input size="30" type="text" name="prenom" value="'.$fuser->prenom.'"></td></tr>';
 
 	  print "<tr>".'<td valign="top">'.$langs->trans("Login").'</td>';
-	  print '<td><input size="10" maxlength="8" type="text" name="login" value="'.$fuser->login.'"></td></tr>';
+	  print '<td><input size="12" maxlength="8" type="text" name="login" value="'.$fuser->login.'"></td></tr>';
 
 	  print "<tr>".'<td valign="top">'.$langs->trans("EMail").'</td>';
 	  print '<td><input size="30" type="text" name="email" value="'.$fuser->email.'"></td></tr>';