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

Bugfix

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2006-12-03 19:29:41 +00:00
parent b8368e3388
commit 9896a2098e
1 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
htdocs/user.class.php
View File

@ -107,28 +107,28 @@ class User
* \param login Si défini, login a utiliser pour recherche * \param login Si défini, login a utiliser pour recherche
* \return int <0 si ko, >0 si ok * \return int <0 si ko, >0 si ok
*/ */
function fetch($login='') function fetch($login='')
{ {
global $conf; global $conf;
// Recupere utilisateur // Recupere utilisateur
$sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.office_phone, u.office_fax, u.user_mobile,"; $sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.office_phone, u.office_fax, u.user_mobile,";
$sql.= " u.code, u.admin, u.login, u.pass, u.webcal_login, u.note,"; $sql.= " u.code, u.admin, u.login, u.pass, u.webcal_login, u.note,";
$sql.= " u.fk_societe, u.fk_socpeople, u.ldap_sid,"; $sql.= " u.fk_societe, u.fk_socpeople, u.ldap_sid,";
$sql.= " u.statut, u.lang,"; $sql.= " u.statut, u.lang,";
$sql.= " ".$this->db->pdate("u.datec")." as datec,"; $sql.= " ".$this->db->pdate("u.datec")." as datec,";
$sql.= " ".$this->db->pdate("u.tms")." as datem,"; $sql.= " ".$this->db->pdate("u.tms")." as datem,";
$sql.= " ".$this->db->pdate("u.datelastlogin")." as datel,"; $sql.= " ".$this->db->pdate("u.datelastlogin")." as datel,";
$sql.= " ".$this->db->pdate("u.datepreviouslogin")." as datep"; $sql.= " ".$this->db->pdate("u.datepreviouslogin")." as datep";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
if ($login) if ($login)
{ {
$sql .= " WHERE u.login = '".$login."'"; $sql .= " WHERE u.login = '".$login."'";
} }
else else
{ {
$sql .= " WHERE u.rowid = ".$this->id; $sql .= " WHERE u.rowid = ".$this->id;
} }
dolibarr_syslog("User.class::fetch this->id=".$this->id." login=".$login); dolibarr_syslog("User.class::fetch this->id=".$this->id." login=".$login);
$result = $this->db->query($sql); $result = $this->db->query($sql);
@ -1407,19 +1407,49 @@ class User
$socid = rand(1, $num_socs); $socid = rand(1, $num_socs);
$this->societe_id = $socids[$socid]; $this->societe_id = $socids[$socid];
} }
/**
* \brief Charge la liste des entrepots pour l'utilisateur
* \return int 0 si ok, <> 0 si erreur
*/
function load_entrepots()
{
$err=0;
$this->entrepots = array();
$sql = "SELECT fk_entrepot,consult,send";
$sql.= " FROM ".MAIN_DB_PREFIX."user_entrepot";
$sql.= " WHERE fk_user = '".$this->id."'";
if ( $this->db->query($sql) )
{
while ($obj = $this->db->fetch_object($result) )
{
$this->entrepots[$i]['id'] = $obj->consult;
$this->entrepots[$i]['consult'] = $obj->consult;
$this->entrepots[$i]['send'] = $obj->send;
}
}
else
{
$err++;
dolibarr_print_error($this->db);
}
return $err;
}
} }
/** /**
\brief Fonction pour créer un mot de passe aléatoire en minuscule \brief Fonction pour créer un mot de passe aléatoire en minuscule
\param sel Donnée aléatoire \param sel Donnée aléatoire
\return string Mot de passe \return string Mot de passe
*/ */
function creer_pass_aleatoire_1($sel = "") function creer_pass_aleatoire_1($sel = "")
{ {
$longueur = 8; $longueur = 8;
return strtolower(substr(md5(uniqid(rand())),0,$longueur)); return strtolower(substr(md5(uniqid(rand())),0,$longueur));
} }
@ -1457,33 +1487,6 @@ function creer_pass_aleatoire_2($sel = "")
return $pass; return $pass;
} }
/**
* \brief Charge la liste des entrepots pour l'utilisateur
* \return int 0 si ok, <> 0 si erreur
*/
function load_entrepots()
{
$err=0;
$this->entrepots = array();
$sql = "SELECT fk_entrepot,consult,send";
$sql.= " FROM ".MAIN_DB_PREFIX."user_entrepot";
$sql.= " WHERE fk_user = '".$this->id."'";
if ( $this->db->query($sql) )
{
while ($obj = $this->db->fetch_object($result) )
{
$this->entrepots[$i]['id'] = $obj->consult;
$this->entrepots[$i]['consult'] = $obj->consult;
$this->entrepots[$i]['send'] = $obj->send;
}
}
else
{
$err++;
dolibarr_print_error($this->db);
}
return $err;
}
?> ?>