From 6eaacf92ce647d441cfd0d01acda1359b639d79f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 13 Sep 2011 12:12:48 +0000 Subject: [PATCH] Qual: All functions that should be moved outside of commonobject are at end. --- htdocs/core/class/commonobject.class.php | 106 +++++++++++------------ 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1854eef87c1..fe10778d1da 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1510,6 +1510,59 @@ abstract class CommonObject } + /** + * Add/Update extra fields + */ + function insertExtraFields() + { + if (sizeof($this->array_options) > 0) + { + $this->db->begin(); + + $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id; + dol_syslog(get_class($this)."::insertExtraFields delete sql=".$sql_del); + $this->db->query($sql_del); + + $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."_extrafields (fk_object"; + foreach($this->array_options as $key => $value) + { + // Add field of attribut + $sql.=",".substr($key,8); // Remove 'options_' prefix + } + $sql .= ") VALUES (".$this->id; + foreach($this->array_options as $key => $value) + { + // Add field o fattribut + if ($this->array_options[$key] != '') + { + $sql.=",'".$this->array_options[$key]."'"; + } + else + { + $sql.=",null"; + } + } + $sql.=")"; + + dol_syslog(get_class($this)."::insertExtraFields insert sql=".$sql); + $resql = $this->db->query($sql); + if (! $resql) + { + $this->error=$this->db->lasterror(); + dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR); + $this->db->rollback(); + return -1; + } + else + { + $this->db->commit(); + return 1; + } + } + else return 0; + } + + /** * Function to check if an object is used by others * @@ -1978,59 +2031,6 @@ abstract class CommonObject include(DOL_DOCUMENT_ROOT.'/core/tpl/originproductline.tpl.php'); } - - - /** - * Add/Update extra fields - */ - function insertExtraFields() - { - if (sizeof($this->array_options) > 0) - { - $this->db->begin(); - - $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields WHERE fk_object = ".$this->id; - dol_syslog(get_class($this)."::insertExtraFields delete sql=".$sql_del); - $this->db->query($sql_del); - - $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."_extrafields (fk_object"; - foreach($this->array_options as $key => $value) - { - // Add field of attribut - $sql.=",".substr($key,8); // Remove 'options_' prefix - } - $sql .= ") VALUES (".$this->id; - foreach($this->array_options as $key => $value) - { - // Add field o fattribut - if ($this->array_options[$key] != '') - { - $sql.=",'".$this->array_options[$key]."'"; - } - else - { - $sql.=",null"; - } - } - $sql.=")"; - - dol_syslog(get_class($this)."::insertExtraFields insert sql=".$sql); - $resql = $this->db->query($sql); - if (! $resql) - { - $this->error=$this->db->lasterror(); - dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR); - $this->db->rollback(); - return -1; - } - else - { - $this->db->commit(); - return 1; - } - } - else return 0; - } } ?>