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

Clean not required vars

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-04 19:25:36 +02:00
parent 8454598722
commit 647d09050b
2 changed files with 30 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
htdocs/categories/class/categorie.class.php
View File

@ -55,6 +55,7 @@ class Categorie extends CommonObject
const TYPE_BANK_LINE = 'bank_line'; const TYPE_BANK_LINE = 'bank_line';
const TYPE_WAREHOUSE = 'warehouse'; const TYPE_WAREHOUSE = 'warehouse';
const TYPE_ACTIONCOMM = 'actioncomm'; const TYPE_ACTIONCOMM = 'actioncomm';
const TYPE_WEBSITE_PAGE = 'website_page';
/** /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@ -65,7 +66,7 @@ class Categorie extends CommonObject
/** /**
* @var array ID mapping from type string * @var array ID mapping from type string
* *
* @note This array should be remove in future, once previous constants are moved to the string value. Deprecated * @note This array should be removed in future, once previous constants are moved to the string value. Deprecated
*/ */
protected $MAP_ID = array( protected $MAP_ID = array(
'product' => 0, 'product' => 0,
@ -78,11 +79,13 @@ class Categorie extends CommonObject
'user' => 7, 'user' => 7,
'bank_line' => 8, 'bank_line' => 8,
'warehouse' => 9, 'warehouse' => 9,
'actioncomm' => 10, 'actioncomm' => 10
); );
/** /**
* @var array Code mapping from ID * @var array Code mapping from ID
*
* @note This array should be removed in future, once previous constants are moved to the string value. Deprecated
*/ */
public static $MAP_ID_TO_CODE = array( public static $MAP_ID_TO_CODE = array(
0 => 'product', 0 => 'product',
@ -99,41 +102,26 @@ class Categorie extends CommonObject
); );
/** /**
* @var array Foreign keys mapping from type string * @var array Foreign keys mapping from type string when value does not match
* *
* @todo Move to const array when PHP 5.6 will be our minimum target * @todo Move to const array when PHP 5.6 will be our minimum target
*/ */
protected $MAP_CAT_FK = array( protected $MAP_CAT_FK = array(
'product' => 'product',
'customer' => 'soc', 'customer' => 'soc',
'supplier' => 'soc', 'supplier' => 'soc',
'member' => 'member',
'contact' => 'socpeople', 'contact' => 'socpeople',
'user' => 'user',
'account' => 'account', // old key for bank_account
'bank_account' => 'account', 'bank_account' => 'account',
'project' => 'project',
'warehouse'=> 'warehouse',
'actioncomm' => 'actioncomm',
); );
/** /**
* @var array Category tables mapping from type string (llx_categorie_...) * @var array Category tables mapping from type string (llx_categorie_...) when value does not match
* *
* @note Move to const array when PHP 5.6 will be our minimum target * @note Move to const array when PHP 5.6 will be our minimum target
*/ */
protected $MAP_CAT_TABLE = array( protected $MAP_CAT_TABLE = array(
'product' => 'product',
'customer' => 'societe', 'customer' => 'societe',
'supplier' => 'fournisseur', 'supplier' => 'fournisseur',
'member' => 'member',
'contact' => 'contact',
'user' => 'user',
'account' => 'account', // old key for bank_account
'bank_account'=> 'account', 'bank_account'=> 'account',
'project' => 'project',
'warehouse'=> 'warehouse',
'actioncomm' => 'actioncomm',
); );
/** /**
@ -153,25 +141,22 @@ class Categorie extends CommonObject
'project' => 'Project', 'project' => 'Project',
'warehouse'=> 'Entrepot', 'warehouse'=> 'Entrepot',
'actioncomm' => 'ActionComm', 'actioncomm' => 'ActionComm',
'website_page' => 'WebsitePage'
); );
/** /**
* @var array Object table mapping from type string (table llx_...) * @var array Object table mapping from type string (table llx_...) when value of key does not match table name.
* *
* @note Move to const array when PHP 5.6 will be our minimum target * @note Move to const array when PHP 5.6 will be our minimum target
*/ */
protected $MAP_OBJ_TABLE = array( protected $MAP_OBJ_TABLE = array(
'product' => 'product',
'customer' => 'societe', 'customer' => 'societe',
'supplier' => 'societe', 'supplier' => 'societe',
'member' => 'adherent', 'member' => 'adherent',
'contact' => 'socpeople', 'contact' => 'socpeople',
'user' => 'user',
'account' => 'bank_account', // old for bank account 'account' => 'bank_account', // old for bank account
'bank_account' => 'bank_account',
'project' => 'projet', 'project' => 'projet',
'warehouse'=> 'entrepot', 'warehouse'=> 'entrepot'
'actioncomm' => 'actioncomm',
); );
/** /**
@ -278,10 +263,10 @@ class Categorie extends CommonObject
$mapList[] = array( $mapList[] = array(
'id' => $mapId, 'id' => $mapId,
'code' => $mapCode, 'code' => $mapCode,
'cat_fk' => $this->MAP_CAT_FK[$mapCode], 'cat_fk' => (empty($this->MAP_CAT_FK[$mapCode]) ? $mapCode : $this->MAP_CAT_FK[$mapCode]),
'cat_table' => $this->MAP_CAT_TABLE[$mapCode], 'cat_table' => (empty($this->MAP_CAT_TABLE[$mapCode]) ? $mapCode : $this->MAP_CAT_TABLE[$mapCode]),
'obj_class' => $this->MAP_OBJ_CLASS[$mapCode], 'obj_class' => (empty($this->MAP_OBJ_CLASS[$mapCode]) ? $mapCode : $this->MAP_OBJ_CLASS[$mapCode]),
'obj_table' => $this->MAP_OBJ_TABLE[$mapCode] 'obj_table' => (empty($this->MAP_OBJ_TABLE[$mapCode]) ? $mapCode : $this->MAP_OBJ_TABLE[$mapCode])
); );
} }
@ -672,8 +657,8 @@ class Categorie extends CommonObject
$this->db->begin(); $this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type]; $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
$sql .= " (fk_categorie, fk_".$this->MAP_CAT_FK[$type].")"; $sql .= " (fk_categorie, fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]).")";
$sql .= " VALUES (".$this->id.", ".$obj->id.")"; $sql .= " VALUES (".$this->id.", ".$obj->id.")";
dol_syslog(get_class($this).'::add_type', LOG_DEBUG); dol_syslog(get_class($this).'::add_type', LOG_DEBUG);
@ -782,9 +767,9 @@ class Categorie extends CommonObject
$this->db->begin(); $this->db->begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type]; $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
$sql .= " WHERE fk_categorie = ".$this->id; $sql .= " WHERE fk_categorie = ".$this->id;
$sql .= " AND fk_".$this->MAP_CAT_FK[$type]." = ".$obj->id; $sql .= " AND fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".$obj->id;
dol_syslog(get_class($this).'::del_type', LOG_DEBUG); dol_syslog(get_class($this).'::del_type', LOG_DEBUG);
if ($this->db->query($sql)) if ($this->db->query($sql))
@ -835,12 +820,12 @@ class Categorie extends CommonObject
$tmpclass = $this->MAP_OBJ_CLASS[$type]; $tmpclass = $this->MAP_OBJ_CLASS[$type];
$obj = new $tmpclass($this->db); $obj = new $tmpclass($this->db);
$sql = "SELECT c.fk_".$this->MAP_CAT_FK[$type]; $sql = "SELECT c.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]);
$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type]." as c"; $sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as c";
$sql .= ", ".MAIN_DB_PREFIX.$this->MAP_OBJ_TABLE[$type]." as o"; $sql .= ", ".MAIN_DB_PREFIX.(empty($this->MAP_OBJ_TABLE[$type]) ? $type : $this->MAP_OBJ_TABLE[$type])." as o";
$sql .= " WHERE o.entity IN (".getEntity($obj->element).")"; $sql .= " WHERE o.entity IN (".getEntity($obj->element).")";
$sql .= " AND c.fk_categorie = ".$this->id; $sql .= " AND c.fk_categorie = ".$this->id;
$sql .= " AND c.fk_".$this->MAP_CAT_FK[$type]." = o.rowid"; $sql .= " AND c.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = o.rowid";
// Protection for external users // Protection for external users
if (($type == 'customer' || $type == 'supplier') && $user->socid > 0) if (($type == 'customer' || $type == 'supplier') && $user->socid > 0)
{ {
@ -857,12 +842,12 @@ class Categorie extends CommonObject
{ {
if ($onlyids) if ($onlyids)
{ {
$objs[] = $rec['fk_'.$this->MAP_CAT_FK[$type]]; $objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
} }
else else
{ {
$obj = new $this->MAP_OBJ_CLASS[$type]($this->db); $obj = new $this->MAP_OBJ_CLASS[$type]($this->db);
$obj->fetch($rec['fk_'.$this->MAP_CAT_FK[$type]]); $obj->fetch($rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])]);
$objs[] = $obj; $objs[] = $obj;
} }
} }
@ -885,8 +870,8 @@ class Categorie extends CommonObject
*/ */
public function containsObject($type, $object_id) public function containsObject($type, $object_id)
{ {
$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type]; $sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
$sql .= " WHERE fk_categorie = ".$this->id." AND fk_".$this->MAP_CAT_FK[$type]." = ".$object_id; $sql .= " WHERE fk_categorie = ".$this->id." AND fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".$object_id;
dol_syslog(get_class($this)."::containsObject", LOG_DEBUG); dol_syslog(get_class($this)."::containsObject", LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
@ -1546,8 +1531,8 @@ class Categorie extends CommonObject
else else
{ {
$sql = "SELECT ct.fk_categorie, c.label, c.rowid"; $sql = "SELECT ct.fk_categorie, c.label, c.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type]." as ct, ".MAIN_DB_PREFIX."categorie as c"; $sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".$this->MAP_CAT_FK[$type]." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type]; $sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];
$sql .= " AND c.entity IN (".getEntity('category').")"; $sql .= " AND c.entity IN (".getEntity('category').")";
$res = $this->db->query($sql); $res = $this->db->query($sql);

4
htdocs/core/class/commonobject.class.php
View File

@ -8489,8 +8489,8 @@ abstract class CommonObject
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$categorystatic = new Categorie($this->db); $categorystatic = new Categorie($this->db);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$categorystatic->MAP_CAT_TABLE[$type]." (fk_categorie, fk_product)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type])." (fk_categorie, fk_product)";
$sql .= " SELECT fk_categorie, $toId FROM ".MAIN_DB_PREFIX."categorie_".$categorystatic->MAP_CAT_TABLE[$type]; $sql .= " SELECT fk_categorie, $toId FROM ".MAIN_DB_PREFIX."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type]);
$sql .= " WHERE fk_product = '".$fromId."'"; $sql .= " WHERE fk_product = '".$fromId."'";
if (!$this->db->query($sql)) if (!$this->db->query($sql))