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

Qual: Uniformize code

Browse Source
This commit is contained in:
Laurent Destailleur 2011-09-23 23:46:14 +00:00
parent 4e302faa07
commit 5137d1ac86
1 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
htdocs/user/class/user.class.php
View File

@ -166,7 +166,7 @@ class User extends CommonObject
$sql.= " AND u.rowid = ".$id; $sql.= " AND u.rowid = ".$id;
} }
dol_syslog("User::Fetch sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
@ -222,7 +222,7 @@ class User extends CommonObject
else else
{ {
$this->error="USERNOTFOUND"; $this->error="USERNOTFOUND";
dol_syslog("User::fetch user not found", LOG_DEBUG); dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG);
$this->db->free($result); $this->db->free($result);
return 0; return 0;
@ -231,7 +231,7 @@ class User extends CommonObject
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog("User::fetch Error -1, fails to get user - ".$this->error." - sql=".$sql, LOG_ERR); dol_syslog(get_class($this)."::fetch Error -1, fails to get user - ".$this->error." - sql=".$sql, LOG_ERR);
return -1; return -1;
} }
@ -258,7 +258,7 @@ class User extends CommonObject
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog("User::fetch Error -2, fails to get setup user - ".$this->error." - sql=".$sql, LOG_ERR); dol_syslog(get_class($this)."::fetch Error -2, fails to get setup user - ".$this->error." - sql=".$sql, LOG_ERR);
return -2; return -2;
} }
} }
@ -468,7 +468,7 @@ class User extends CommonObject
*/ */
function clearrights() function clearrights()
{ {
dol_syslog("User::clearrights reset user->rights"); dol_syslog(get_class($this)."::clearrights reset user->rights");
$this->rights=''; $this->rights='';
$this->all_permissions_are_loaded=false; $this->all_permissions_are_loaded=false;
$this->tab_loaded=array(); $this->tab_loaded=array();
@ -509,7 +509,7 @@ class User extends CommonObject
$sql.= " AND r.perms IS NOT NULL"; $sql.= " AND r.perms IS NOT NULL";
if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'"; if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
dol_syslog('User::getRights sql='.$sql, LOG_DEBUG); dol_syslog(get_class($this).'::getRights sql='.$sql, LOG_DEBUG);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
@ -558,7 +558,7 @@ class User extends CommonObject
$sql.= " AND gu.entity IN (0,".$conf->entity.")"; $sql.= " AND gu.entity IN (0,".$conf->entity.")";
if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'"; if ($moduletag) $sql.= " AND r.module = '".$this->db->escape($moduletag)."'";
dol_syslog('User::getRights sql='.$sql, LOG_DEBUG); dol_syslog(get_class($this).'::getRights sql='.$sql, LOG_DEBUG);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
@ -623,7 +623,7 @@ class User extends CommonObject
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
$result = $this->db->query($sql); $result = $this->db->query($sql);
dol_syslog("User::setstatus sql=".$sql); dol_syslog(get_class($this)."::setstatus sql=".$sql);
if ($result) if ($result)
{ {
// Appel des triggers // Appel des triggers
@ -722,7 +722,7 @@ class User extends CommonObject
$this->login = trim($this->login); $this->login = trim($this->login);
if (! isset($this->entity)) $this->entity=$conf->entity; // If not defined, we use default value if (! isset($this->entity)) $this->entity=$conf->entity; // If not defined, we use default value
dol_syslog("User::Create login=".$this->login.", user=".(is_object($user)?$user->id:''), LOG_DEBUG); dol_syslog(get_class($this)."::create login=".$this->login.", user=".(is_object($user)?$user->id:''), LOG_DEBUG);
// Check parameters // Check parameters
if (! empty($conf->global->USER_MAIL_REQUIRED) && ! isValidEMail($this->email)) if (! empty($conf->global->USER_MAIL_REQUIRED) && ! isValidEMail($this->email))
@ -751,7 +751,7 @@ class User extends CommonObject
if ($num) if ($num)
{ {
$this->error = 'ErrorLoginAlreadyExists'; $this->error = 'ErrorLoginAlreadyExists';
dol_syslog("User::Create ".$this->error, LOG_WARNING); dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
$this->db->rollback(); $this->db->rollback();
return -6; return -6;
} }
@ -761,7 +761,7 @@ class User extends CommonObject
$sql.= " VALUES('".$this->db->idate($now)."','".$this->db->escape($this->login)."','".$this->ldap_sid."',".$this->entity.")"; $sql.= " VALUES('".$this->db->idate($now)."','".$this->db->escape($this->login)."','".$this->ldap_sid."',".$this->entity.")";
$result=$this->db->query($sql); $result=$this->db->query($sql);
dol_syslog("User::Create sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
if ($result) if ($result)
{ {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user"); $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user");
@ -811,7 +811,7 @@ class User extends CommonObject
else else
{ {
$this->error=$interface->error; $this->error=$interface->error;
dol_syslog("User::Create ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -3; return -3;
} }
@ -819,7 +819,7 @@ class User extends CommonObject
else else
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog("User::Create ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -2; return -2;
} }
@ -828,7 +828,7 @@ class User extends CommonObject
else else
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog("User::Create ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
@ -870,7 +870,7 @@ class User extends CommonObject
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
dol_syslog("User::create_from_contact sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::create_from_contact sql=".$sql, LOG_DEBUG);
if ($resql) if ($resql)
{ {
// Appel des triggers // Appel des triggers
@ -886,7 +886,7 @@ class User extends CommonObject
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog("User::create_from_contact ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create_from_contact ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
@ -895,7 +895,7 @@ class User extends CommonObject
else else
{ {
// $this->error deja positionne // $this->error deja positionne
dol_syslog("User::create_from_contact - 0"); dol_syslog(get_class($this)."::create_from_contact - 0");
$this->db->rollback(); $this->db->rollback();
return $result; return $result;
@ -937,7 +937,7 @@ class User extends CommonObject
if ($member->fk_soc) $sql.= ", fk_societe=".$member->fk_soc; if ($member->fk_soc) $sql.= ", fk_societe=".$member->fk_soc;
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;
dol_syslog("User::create_from_member sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::create_from_member sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -947,7 +947,7 @@ class User extends CommonObject
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dol_syslog("User::create_from_member - 1 - ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create_from_member - 1 - ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
@ -956,7 +956,7 @@ class User extends CommonObject
else else
{ {
// $this->error deja positionne // $this->error deja positionne
dol_syslog("User::create_from_member - 2 - ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return $result; return $result;
@ -1022,7 +1022,7 @@ class User extends CommonObject
$nbrowsaffected=0; $nbrowsaffected=0;
$error=0; $error=0;
dol_syslog("User::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass); dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass);
// Clean parameters // Clean parameters
$this->nom = trim($this->nom); // TODO deprecated $this->nom = trim($this->nom); // TODO deprecated
@ -1076,7 +1076,7 @@ class User extends CommonObject
$sql.= ", entity = '".$this->entity."'"; $sql.= ", entity = '".$this->entity."'";
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
dol_syslog("User::update sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -1097,13 +1097,13 @@ class User extends CommonObject
if ($this->fk_member > 0) if ($this->fk_member > 0)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL where fk_member = ".$this->fk_member; $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member = NULL where fk_member = ".$this->fk_member;
dol_syslog("User::update sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; } if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; }
} }
// Set link to user // Set link to user
$sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member =".($this->fk_member>0?$this->fk_member:'null')." where rowid = ".$this->id; $sql = "UPDATE ".MAIN_DB_PREFIX."user SET fk_member =".($this->fk_member>0?$this->fk_member:'null')." where rowid = ".$this->id;
dol_syslog("User::update sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; } if (! $resql) { $this->error=$this->db->error(); $this->db->rollback(); return -5; }
@ -1141,7 +1141,7 @@ class User extends CommonObject
if ($result < 0) if ($result < 0)
{ {
$this->error=$luser->error; $this->error=$luser->error;
dol_syslog("User::update ".$this->error,LOG_ERR); dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
$error++; $error++;
} }
} }
@ -1202,7 +1202,7 @@ class User extends CommonObject
$sql.= " tms = tms"; // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion $sql.= " tms = tms"; // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
dol_syslog("Update last login date for user->id=".$this->id." ".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::update_last_login_date user->id=".$this->id." ".$sql, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
@ -1212,7 +1212,7 @@ class User extends CommonObject
} }
else else
{ {
$this->error=$this->db->error().' sql='.$sql; $this->error=$this->db->lasterror().' sql='.$sql;
return -1; return -1;
} }
} }
@ -1235,7 +1235,7 @@ class User extends CommonObject
$error=0; $error=0;
dol_syslog("User::setPassword user=".$user->id." password=".preg_replace('/./i','*',$password)." changelater=".$changelater." notrigger=".$notrigger." nosyncmember=".$nosyncmember, LOG_DEBUG); dol_syslog(get_class($this)."::setPassword user=".$user->id." password=".preg_replace('/./i','*',$password)." changelater=".$changelater." notrigger=".$notrigger." nosyncmember=".$nosyncmember, LOG_DEBUG);
// If new password not provided, we generate one // If new password not provided, we generate one
if (! $password) if (! $password)
@ -1262,7 +1262,7 @@ class User extends CommonObject
} }
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
dol_syslog("User::setPassword sql=hidden", LOG_DEBUG); dol_syslog(get_class($this)."::setPassword sql=hidden", LOG_DEBUG);
//dol_syslog("User::Password sql=".$sql); //dol_syslog("User::Password sql=".$sql);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
@ -1288,7 +1288,7 @@ class User extends CommonObject
if ($result < 0) if ($result < 0)
{ {
$this->error=$adh->error; $this->error=$adh->error;
dol_syslog("User::setPassword ".$this->error,LOG_ERR); dol_syslog(get_class($this)."::setPassword ".$this->error,LOG_ERR);
$error++; $error++;
} }
} }
@ -1299,7 +1299,7 @@ class User extends CommonObject
} }
} }
dol_syslog("User::setPassword notrigger=".$notrigger." error=".$error,LOG_DEBUG); dol_syslog(get_class($this)."::setPassword notrigger=".$notrigger." error=".$error,LOG_DEBUG);
if (! $error && ! $notrigger) if (! $error && ! $notrigger)
{ {
@ -1332,7 +1332,7 @@ class User extends CommonObject
$sql.= " SET pass_temp = '".$this->db->escape($password)."'"; $sql.= " SET pass_temp = '".$this->db->escape($password)."'";
$sql.= " WHERE rowid = ".$this->id; $sql.= " WHERE rowid = ".$this->id;
dol_syslog("User::setPassword sql=hidden", LOG_DEBUG); // No log dol_syslog(get_class($this)."::setPassword sql=hidden", LOG_DEBUG); // No log
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
@ -1571,7 +1571,7 @@ class User extends CommonObject
else else
{ {
$this->error=$interface->error; $this->error=$interface->error;
dol_syslog("User::SetInGroup ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -2; return -2;
} }
@ -1579,7 +1579,7 @@ class User extends CommonObject
else else
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog("User::SetInGroup ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }
@ -1627,7 +1627,7 @@ class User extends CommonObject
else else
{ {
$this->error=$interface->error; $this->error=$interface->error;
dol_syslog("User::RemoveFromGroup ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -2; return -2;
} }
@ -1635,7 +1635,7 @@ class User extends CommonObject
else else
{ {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
dol_syslog("User::RemoveFromGroup ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);
$this->db->rollback(); $this->db->rollback();
return -1; return -1;
} }