From ed9346dfb98718d579757ab6e4fa191565106415 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 27 Jan 2022 10:00:26 +0100 Subject: [PATCH] Works on replace MAIN_DB_PREFIX by $db->prefix() --- htdocs/user/class/api_users.class.php | 6 +++--- htdocs/user/class/userbankaccount.class.php | 8 +++---- htdocs/user/class/usergroup.class.php | 24 ++++++++++----------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php index 68aa2b650f7..b2f8085de5a 100644 --- a/htdocs/user/class/api_users.class.php +++ b/htdocs/user/class/api_users.class.php @@ -82,9 +82,9 @@ class Users extends DolibarrApi //$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe; $sql = "SELECT t.rowid"; - $sql .= " FROM ".MAIN_DB_PREFIX."user as t"; + $sql .= " FROM ".$this->db->prefix()."user as t"; if ($category > 0) { - $sql .= ", ".MAIN_DB_PREFIX."categorie_user as c"; + $sql .= ", ".$this->db->prefix()."categorie_user as c"; } $sql .= ' WHERE t.entity IN ('.getEntity('user').')'; if ($user_ids) { @@ -536,7 +536,7 @@ class Users extends DolibarrApi //$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe; $sql = "SELECT t.rowid"; - $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as t"; + $sql .= " FROM ".$this->db->prefix()."usergroup as t"; $sql .= ' WHERE t.entity IN ('.getEntity('user').')'; if ($group_ids) { $sql .= " AND t.rowid IN (".$this->db->sanitize($group_ids).")"; diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php index d9392ade9d7..42164ce8b2c 100644 --- a/htdocs/user/class/userbankaccount.class.php +++ b/htdocs/user/class/userbankaccount.class.php @@ -93,12 +93,12 @@ class UserBankAccount extends Account { $now = dol_now(); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_rib (fk_user, datec)"; + $sql = "INSERT INTO ".$this->db->prefix()."user_rib (fk_user, datec)"; $sql .= " VALUES (".$this->userid.", '".$this->db->idate($now)."')"; $resql = $this->db->query($sql); if ($resql) { if ($this->db->affected_rows($resql)) { - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."user_rib"); + $this->id = $this->db->last_insert_id($this->db->prefix()."user_rib"); return $this->update($user); } @@ -123,7 +123,7 @@ class UserBankAccount extends Account $this->create(); } - $sql = "UPDATE ".MAIN_DB_PREFIX."user_rib SET"; + $sql = "UPDATE ".$this->db->prefix()."user_rib SET"; $sql .= " bank = '".$this->db->escape($this->bank)."'"; $sql .= ",code_banque='".$this->db->escape($this->code_banque)."'"; $sql .= ",code_guichet='".$this->db->escape($this->code_guichet)."'"; @@ -167,7 +167,7 @@ class UserBankAccount extends Account $sql = "SELECT rowid, fk_user, entity, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,"; $sql .= " owner_address, label, datec, tms as datem"; - $sql .= " FROM ".MAIN_DB_PREFIX."user_rib"; + $sql .= " FROM ".$this->db->prefix()."user_rib"; if ($id) { $sql .= " WHERE rowid = ".((int) $id); } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index b1b3175aaa9..00e031c33f1 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -191,8 +191,8 @@ class UserGroup extends CommonObject $ret = array(); $sql = "SELECT g.rowid, ug.entity as usergroup_entity"; - $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g,"; - $sql .= " ".MAIN_DB_PREFIX."usergroup_user as ug"; + $sql .= " FROM ".$this->db->prefix()."usergroup as g,"; + $sql .= " ".$this->db->prefix()."usergroup_user as ug"; $sql .= " WHERE ug.fk_usergroup = g.rowid"; $sql .= " AND ug.fk_user = ".((int) $userid); if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) { @@ -241,9 +241,9 @@ class UserGroup extends CommonObject if (!empty($this->id)) { $sql .= ", ug.entity as usergroup_entity"; } - $sql .= " FROM ".MAIN_DB_PREFIX."user as u"; + $sql .= " FROM ".$this->db->prefix()."user as u"; if (!empty($this->id)) { - $sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug"; + $sql .= ", ".$this->db->prefix()."usergroup_user as ug"; } $sql .= " WHERE 1 = 1"; if (!empty($this->id)) { @@ -315,7 +315,7 @@ class UserGroup extends CommonObject // Si on a demande ajout d'un droit en particulier, on recupere // les caracteristiques (module, perms et subperms) de ce droit. $sql = "SELECT module, perms, subperms"; - $sql .= " FROM ".MAIN_DB_PREFIX."rights_def"; + $sql .= " FROM ".$this->db->prefix()."rights_def"; $sql .= " WHERE id = ".((int) $rid); $sql .= " AND entity = ".((int) $entity); @@ -358,7 +358,7 @@ class UserGroup extends CommonObject if (!empty($whereforadd)) { //print "$module-$perms-$subperms"; $sql = "SELECT id"; - $sql .= " FROM ".MAIN_DB_PREFIX."rights_def"; + $sql .= " FROM ".$this->db->prefix()."rights_def"; $sql .= " WHERE entity = ".((int) $entity); if (!empty($whereforadd) && $whereforadd != 'allmodules') { $sql .= " AND ".$whereforadd; @@ -372,11 +372,11 @@ class UserGroup extends CommonObject $obj = $this->db->fetch_object($result); $nid = $obj->id; - $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights WHERE fk_usergroup = ".((int) $this->id)." AND fk_id=".((int) $nid)." AND entity = ".((int) $entity); + $sql = "DELETE FROM ".$this->db->prefix()."usergroup_rights WHERE fk_usergroup = ".((int) $this->id)." AND fk_id=".((int) $nid)." AND entity = ".((int) $entity); if (!$this->db->query($sql)) { $error++; } - $sql = "INSERT INTO ".MAIN_DB_PREFIX."usergroup_rights (entity, fk_usergroup, fk_id) VALUES (".((int) $entity).", ".((int) $this->id).", ".((int) $nid).")"; + $sql = "INSERT INTO ".$this->db->prefix()."usergroup_rights (entity, fk_usergroup, fk_id) VALUES (".((int) $entity).", ".((int) $this->id).", ".((int) $nid).")"; if (!$this->db->query($sql)) { $error++; } @@ -437,7 +437,7 @@ class UserGroup extends CommonObject // Si on a demande supression d'un droit en particulier, on recupere // les caracteristiques module, perms et subperms de ce droit. $sql = "SELECT module, perms, subperms"; - $sql .= " FROM ".MAIN_DB_PREFIX."rights_def"; + $sql .= " FROM ".$this->db->prefix()."rights_def"; $sql .= " WHERE id = ".((int) $rid); $sql .= " AND entity = ".((int) $entity); @@ -485,7 +485,7 @@ class UserGroup extends CommonObject if (!empty($wherefordel)) { //print "$module-$perms-$subperms"; $sql = "SELECT id"; - $sql .= " FROM ".MAIN_DB_PREFIX."rights_def"; + $sql .= " FROM ".$this->db->prefix()."rights_def"; $sql .= " WHERE entity = ".((int) $entity); if (!empty($wherefordel) && $wherefordel != 'allmodules') { $sql .= " AND ".$wherefordel; @@ -503,7 +503,7 @@ class UserGroup extends CommonObject $nid = $obj->id; } - $sql = "DELETE FROM ".MAIN_DB_PREFIX."usergroup_rights"; + $sql = "DELETE FROM ".$this->db->prefix()."usergroup_rights"; $sql .= " WHERE fk_usergroup = $this->id AND fk_id=".((int) $nid); $sql .= " AND entity = ".((int) $entity); if (!$this->db->query($sql)) { @@ -564,7 +564,7 @@ class UserGroup extends CommonObject * Recuperation des droits */ $sql = "SELECT r.module, r.perms, r.subperms "; - $sql .= " FROM ".MAIN_DB_PREFIX."usergroup_rights as u, ".MAIN_DB_PREFIX."rights_def as r"; + $sql .= " FROM ".$this->db->prefix()."usergroup_rights as u, ".$this->db->prefix()."rights_def as r"; $sql .= " WHERE r.id = u.fk_id"; $sql .= " AND r.entity = ".((int) $conf->entity); $sql .= " AND u.entity = ".((int) $conf->entity);