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

New: Modification de la forme de la fiche user pour permettre l'ajout d'une photo.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-01-16 20:21:58 +00:00
parent bf3b464921
commit b78cea389b
2 changed files with 60 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/user.class.php
View File

@ -53,8 +53,11 @@ class User
var $admin; var $admin;
var $login; var $login;
var $pass; var $pass;
var $datec;
var $datem;
var $societe_id; var $societe_id;
var $webcal_login; var $webcal_login;
var $errorstr; var $errorstr;
var $userpref_limite_liste; var $userpref_limite_liste;
var $all_permissions_are_loaded; /**< \private all_permissions_are_loaded */ 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 * \brief Charge un objet user avec toutes ces caractéristiques depuis un login
* \param login login a charger * \param login login a charger
@ -551,9 +555,9 @@ class User
function fetch($login='') 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 = "SELECT u.rowid, u.name, u.firstname, u.email, u.code, u.admin, u.login, u.pass, u.webcal_login, u.note";
//$sql .= " FROM ".MAIN_DB_PREFIX."user as u"; $sql .= ", ".$this->db->pdate("u.datec")." datec, ".$this->db->pdate("u.tms")." datem";
$sql = "SELECT * FROM ".MAIN_DB_PREFIX."user as u"; $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
if ($this->id) if ($this->id)
{ {
$sql .= " WHERE u.rowid = $this->id"; $sql .= " WHERE u.rowid = $this->id";
@ -574,18 +578,18 @@ class User
$this->nom = stripslashes($obj->name); $this->nom = stripslashes($obj->name);
$this->prenom = stripslashes($obj->firstname); $this->prenom = stripslashes($obj->firstname);
$this->note = stripslashes($obj->note);
$this->fullname = $this->prenom . ' ' . $this->nom; $this->fullname = $this->prenom . ' ' . $this->nom;
$this->admin = $obj->admin;
$this->webcal_login = $obj->webcal_login;
$this->code = $obj->code; $this->code = $obj->code;
$this->email = $obj->email;
$this->contact_id = $obj->fk_socpeople;
$this->login = $obj->login; $this->login = $obj->login;
$this->pass = $obj->pass; $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->webcal_login = $obj->webcal_login;
$this->societe_id = $obj->fk_societe; $this->societe_id = $obj->fk_societe;

71
htdocs/user/fiche.php
View File

@ -22,10 +22,9 @@
* $Source$ * $Source$
*/ */
/** /** \file htdocs/user/fiche.php
\file htdocs/user/fiche.php \brief Onglet user et permissions de la fiche utilisateur
\brief Onglet user et permissions de la fiche utilisateur \version $Revision$
\version $Revision$
*/ */
@ -328,33 +327,43 @@ else
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Lastname").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Lastname").'</td>';
print '<td width="25%" class="valeur">'.$fuser->nom.'</td>'; print '<td colspan="2" width="50%" class="valeur">'.$fuser->nom.'</td>';
print '<td width="25%" valign="top">'.$langs->trans("Firstname").'</td>'; print '<td align=center valign=top width="50%" rowspan="8">';
print '<td width="25%" class="valeur">'.$fuser->prenom.'</td>'; 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>\n";
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Login").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Login").'</td>';
print '<td width="25%" class="valeur">'.$fuser->login.'</td>'; print '<td colspan="2" width="50%" class="valeur">'.$fuser->login.'</td></tr>';
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("EMail").'</td>';
print '<td colspan="2" width="50%" class="valeur"><a href="mailto:'.$fuser->email.'">'.$fuser->email.'</a></td>';
print "</tr>\n"; print "</tr>\n";
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Administrator").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("Administrator").'</td>';
print '<td colspan="3" class="valeur">'.yn($fuser->admin).'</td>'; print '<td colspan="2" class="valeur">'.yn($fuser->admin).'</td>';
print "</tr>\n"; print "</tr>\n";
if ($fuser->societe_id > 0) print '<tr><td width="25%" valign="top">'.$langs->trans("DateCreation").'</td>';
{ print '<td colspan="2" class="valeur">'.dolibarr_print_date($fuser->datec).'</td>';
$societe = new Societe($db); print "</tr>\n";
$societe->fetch($fuser->societe_id);
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("Company").'</td>'; print '<tr><td width="25%" valign="top">'.$langs->trans("DateModification").'</td>';
print '<td colspan="3">'.$societe->nom.'&nbsp;</td>'; print '<td colspan="2" class="valeur">'.dolibarr_print_date($fuser->datem).'</td>';
print "</tr>\n"; print "</tr>\n";
}
print "<tr>".'<td width="25%" valign="top">'.$langs->trans("ContactCard").'</td>'; print "<tr>".'<td width="25%" valign="top">'.$langs->trans("ContactCard").'</td>';
print '<td colspan="3" valign="top">'; print '<td>';
if ($fuser->contact_id) if ($fuser->contact_id)
{ {
print '<a href="../contact/fiche.php?id='.$fuser->contact_id.'">'.$langs->trans("ContactCard").'</a>'; print '<a href="../contact/fiche.php?id='.$fuser->contact_id.'">'.$langs->trans("ContactCard").'</a>';
@ -366,6 +375,16 @@ else
print '</td>'; print '</td>';
print "</tr>\n"; 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 "<tr>".'<td width="25%" valign="top">'.$langs->trans("Note").'</td>';
print '<td colspan="3" class="valeur">'.nl2br($fuser->note).'&nbsp;</td>'; print '<td colspan="3" class="valeur">'.nl2br($fuser->note).'&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
@ -418,16 +437,16 @@ else
{ {
print '<form action="fiche.php?id='.$fuser->id.'" method="post">'; print '<form action="fiche.php?id='.$fuser->id.'" method="post">';
print '<input type="hidden" name="action" value="update">'; 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 "<tr>".'<td valign="top">'.$langs->trans("Lastname").'</td>';
print '<td><input size="30" type="text" name="nom" value="'.$fuser->nom.'"></td></tr>'; print '<td><input size="30" type="text" name="nom" value="'.$fuser->nom.'"></td></tr>';
print "<tr>".'<td valign="top">'.$langs->trans("Firstname").'</td>'; 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 "<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 "<tr>".'<td valign="top">'.$langs->trans("EMail").'</td>';
print '<td><input size="30" type="text" name="email" value="'.$fuser->email.'"></td></tr>'; print '<td><input size="30" type="text" name="email" value="'.$fuser->email.'"></td></tr>';