|
@@ -576,8 +576,8 @@ class User extends CommonObject
|
|
|
if ($loadpersonalconf) {
|
|
|
// Load user->conf for user
|
|
|
$sql = "SELECT param, value FROM ".MAIN_DB_PREFIX."user_param";
|
|
|
- $sql .= " WHERE fk_user = ".$this->id;
|
|
|
- $sql .= " AND entity = ".$conf->entity;
|
|
|
+ $sql .= " WHERE fk_user = ".((int) $this->id);
|
|
|
+ $sql .= " AND entity = ".((int) $conf->entity);
|
|
|
//dol_syslog(get_class($this).'::fetch load personalized conf', LOG_DEBUG);
|
|
|
$resql = $this->db->query($sql);
|
|
|
if ($resql) {
|
|
@@ -727,7 +727,7 @@ class User extends CommonObject
|
|
|
//print "$module-$perms-$subperms";
|
|
|
$sql = "SELECT id";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
|
|
|
- $sql .= " WHERE entity = ".$entity;
|
|
|
+ $sql .= " WHERE entity = ".((int) $entity);
|
|
|
if (!empty($whereforadd) && $whereforadd != 'allmodules') {
|
|
|
$sql .= " AND ".$whereforadd;
|
|
|
}
|
|
@@ -740,11 +740,11 @@ class User extends CommonObject
|
|
|
$obj = $this->db->fetch_object($result);
|
|
|
$nid = $obj->id;
|
|
|
|
|
|
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id." AND fk_id=".$nid." AND entity = ".$entity;
|
|
|
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".((int) $this->id)." AND fk_id = ".((int) $nid)." AND entity = ".((int) $entity);
|
|
|
if (!$this->db->query($sql)) {
|
|
|
$error++;
|
|
|
}
|
|
|
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (entity, fk_user, fk_id) VALUES (".$entity.", ".$this->id.", ".$nid.")";
|
|
|
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rights (entity, fk_user, fk_id) VALUES (".((int) $entity).", ".((int) $this->id).", ".((int) $nid).")";
|
|
|
if (!$this->db->query($sql)) {
|
|
|
$error++;
|
|
|
}
|
|
@@ -808,7 +808,7 @@ class User extends CommonObject
|
|
|
$sql = "SELECT module, perms, subperms";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
|
|
|
$sql .= " WHERE id = '".$this->db->escape($rid)."'";
|
|
|
- $sql .= " AND entity = ".$entity;
|
|
|
+ $sql .= " AND entity = ".((int) $entity);
|
|
|
|
|
|
$result = $this->db->query($sql);
|
|
|
if ($result) {
|
|
@@ -853,7 +853,7 @@ class User extends CommonObject
|
|
|
//print "$module-$perms-$subperms";
|
|
|
$sql = "SELECT id";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."rights_def";
|
|
|
- $sql .= " WHERE entity = ".$entity;
|
|
|
+ $sql .= " WHERE entity = ".((int) $entity);
|
|
|
if (!empty($wherefordel) && $wherefordel != 'allmodules') {
|
|
|
$sql .= " AND ".$wherefordel;
|
|
|
}
|
|
@@ -875,8 +875,8 @@ class User extends CommonObject
|
|
|
$nid = $obj->id;
|
|
|
|
|
|
$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights";
|
|
|
- $sql .= " WHERE fk_user = ".$this->id." AND fk_id = ".((int) $nid);
|
|
|
- $sql .= " AND entity = ".$entity;
|
|
|
+ $sql .= " WHERE fk_user = ".((int) $this->id)." AND fk_id = ".((int) $nid);
|
|
|
+ $sql .= " AND entity = ".((int) $entity);
|
|
|
if (!$this->db->query($sql)) {
|
|
|
$error++;
|
|
|
}
|
|
@@ -1022,12 +1022,12 @@ class User extends CommonObject
|
|
|
if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
|
|
|
$sql .= " AND gu.entity IN (0,".$conf->entity.")";
|
|
|
} else {
|
|
|
- $sql .= " AND r.entity = ".$conf->entity;
|
|
|
+ $sql .= " AND r.entity = ".((int) $conf->entity);
|
|
|
}
|
|
|
} else {
|
|
|
- $sql .= " AND gr.entity = ".$conf->entity;
|
|
|
- $sql .= " AND gu.entity = ".$conf->entity;
|
|
|
- $sql .= " AND r.entity = ".$conf->entity;
|
|
|
+ $sql .= " AND gr.entity = ".((int) $conf->entity);
|
|
|
+ $sql .= " AND gu.entity = ".((int) $conf->entity);
|
|
|
+ $sql .= " AND r.entity = ".((int) $conf->entity);
|
|
|
}
|
|
|
$sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
|
|
|
$sql .= " AND gu.fk_user = ".((int) $this->id);
|
|
@@ -1180,7 +1180,7 @@ class User extends CommonObject
|
|
|
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
|
|
|
|
|
|
// Remove rights
|
|
|
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".$this->id;
|
|
|
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_rights WHERE fk_user = ".((int) $this->id);
|
|
|
|
|
|
if (!$error && !$this->db->query($sql)) {
|
|
|
$error++;
|
|
@@ -1188,14 +1188,14 @@ class User extends CommonObject
|
|
|
}
|
|
|
|
|
|
// Remove group
|
|
|
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user WHERE fk_user = ".$this->id;
|
|
|
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user WHERE fk_user = ".((int) $this->id);
|
|
|
if (!$error && !$this->db->query($sql)) {
|
|
|
$error++;
|
|
|
$this->error = $this->db->lasterror();
|
|
|
}
|
|
|
|
|
|
// Remove params
|
|
|
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param WHERE fk_user = ".$this->id;
|
|
|
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param WHERE fk_user = ".((int) $this->id);
|
|
|
if (!$error && !$this->db->query($sql)) {
|
|
|
$error++;
|
|
|
$this->error = $this->db->lasterror();
|
|
@@ -1221,7 +1221,7 @@ class User extends CommonObject
|
|
|
|
|
|
// Remove user
|
|
|
if (!$error) {
|
|
|
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".$this->id;
|
|
|
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".((int) $this->id);
|
|
|
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
|
|
|
if (!$this->db->query($sql)) {
|
|
|
$error++;
|
|
@@ -1574,7 +1574,7 @@ class User extends CommonObject
|
|
|
$num = 0;
|
|
|
$sql = "SELECT id FROM ".MAIN_DB_PREFIX."rights_def";
|
|
|
$sql .= " WHERE bydefault = 1";
|
|
|
- $sql .= " AND entity = ".$conf->entity;
|
|
|
+ $sql .= " AND entity = ".((int) $conf->entity);
|
|
|
|
|
|
$resql = $this->db->query($sql);
|
|
|
if ($resql) {
|
|
@@ -1769,7 +1769,7 @@ class User extends CommonObject
|
|
|
$sql .= ", default_c_exp_tax_cat = ".($this->default_c_exp_tax_cat > 0 ? $this->default_c_exp_tax_cat : 'null');
|
|
|
$sql .= ", fk_warehouse = ".($this->fk_warehouse > 0 ? $this->fk_warehouse : "null");
|
|
|
$sql .= ", lang = ".($this->lang ? "'".$this->db->escape($this->lang)."'" : "null");
|
|
|
- $sql .= " WHERE rowid = ".$this->id;
|
|
|
+ $sql .= " WHERE rowid = ".((int) $this->id);
|
|
|
|
|
|
dol_syslog(get_class($this)."::update", LOG_DEBUG);
|
|
|
$resql = $this->db->query($sql);
|
|
@@ -1960,7 +1960,7 @@ class User extends CommonObject
|
|
|
$sql .= " datepreviouslogin = datelastlogin,";
|
|
|
$sql .= " datelastlogin = '".$this->db->idate($now)."',";
|
|
|
$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 = ".((int) $this->id);
|
|
|
|
|
|
dol_syslog(get_class($this)."::update_last_login_date user->id=".$this->id." ".$sql, LOG_DEBUG);
|
|
|
$resql = $this->db->query($sql);
|
|
@@ -2021,7 +2021,7 @@ class User extends CommonObject
|
|
|
} else {
|
|
|
$sql .= ", pass = '".$this->db->escape($password)."'";
|
|
|
}
|
|
|
- $sql .= " WHERE rowid = ".$this->id;
|
|
|
+ $sql .= " WHERE rowid = ".((int) $this->id);
|
|
|
|
|
|
dol_syslog(get_class($this)."::setPassword", LOG_DEBUG);
|
|
|
$result = $this->db->query($sql);
|
|
@@ -2079,7 +2079,7 @@ class User extends CommonObject
|
|
|
// After receiving confirmation link, we will erase and store it in pass_crypted
|
|
|
$sql = "UPDATE ".MAIN_DB_PREFIX."user";
|
|
|
$sql .= " SET pass_temp = '".$this->db->escape($password)."'";
|
|
|
- $sql .= " WHERE rowid = ".$this->id;
|
|
|
+ $sql .= " WHERE rowid = ".((int) $this->id);
|
|
|
|
|
|
dol_syslog(get_class($this)."::setPassword", LOG_DEBUG); // No log
|
|
|
$result = $this->db->query($sql);
|
|
@@ -2225,7 +2225,7 @@ class User extends CommonObject
|
|
|
// phpcs:enable
|
|
|
$sql = "SELECT url, login, pass, poste ";
|
|
|
$sql .= " FROM ".MAIN_DB_PREFIX."user_clicktodial as u";
|
|
|
- $sql .= " WHERE u.fk_user = ".$this->id;
|
|
|
+ $sql .= " WHERE u.fk_user = ".((int) $this->id);
|
|
|
|
|
|
$resql = $this->db->query($sql);
|
|
|
if ($resql) {
|
|
@@ -2260,7 +2260,7 @@ class User extends CommonObject
|
|
|
$this->db->begin();
|
|
|
|
|
|
$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_clicktodial";
|
|
|
- $sql .= " WHERE fk_user = ".$this->id;
|
|
|
+ $sql .= " WHERE fk_user = ".((int) $this->id);
|
|
|
|
|
|
dol_syslog(get_class($this).'::update_clicktodial', LOG_DEBUG);
|
|
|
$result = $this->db->query($sql);
|
|
@@ -2305,14 +2305,14 @@ class User extends CommonObject
|
|
|
$this->db->begin();
|
|
|
|
|
|
$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";
|
|
|
- $sql .= " WHERE fk_user = ".$this->id;
|
|
|
+ $sql .= " WHERE fk_user = ".((int) $this->id);
|
|
|
$sql .= " AND fk_usergroup = ".((int) $group);
|
|
|
- $sql .= " AND entity = ".$entity;
|
|
|
+ $sql .= " AND entity = ".((int) $entity);
|
|
|
|
|
|
$result = $this->db->query($sql);
|
|
|
|
|
|
$sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_user (entity, fk_user, fk_usergroup)";
|
|
|
- $sql .= " VALUES (".$entity.",".$this->id.",".$group.")";
|
|
|
+ $sql .= " VALUES (".((int) $entity).",".((int) $this->id).",".((int) $group).")";
|
|
|
|
|
|
$result = $this->db->query($sql);
|
|
|
if ($result) {
|
|
@@ -2362,9 +2362,9 @@ class User extends CommonObject
|
|
|
$this->db->begin();
|
|
|
|
|
|
$sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_user";
|
|
|
- $sql .= " WHERE fk_user = ".$this->id;
|
|
|
+ $sql .= " WHERE fk_user = ".((int) $this->id);
|
|
|
$sql .= " AND fk_usergroup = ".((int) $group);
|
|
|
- $sql .= " AND entity = ".$entity;
|
|
|
+ $sql .= " AND entity = ".((int) $entity);
|
|
|
|
|
|
$result = $this->db->query($sql);
|
|
|
if ($result) {
|
|
@@ -3093,7 +3093,7 @@ class User extends CommonObject
|
|
|
{
|
|
|
// phpcs:enable
|
|
|
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user";
|
|
|
- $sql .= " WHERE fk_user = ".$this->id;
|
|
|
+ $sql .= " WHERE fk_user = ".((int) $this->id);
|
|
|
|
|
|
dol_syslog(get_class($this)."::get_children sql=".$sql, LOG_DEBUG);
|
|
|
$res = $this->db->query($sql);
|