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

Qual: Removed duplicate code

Browse Source
This commit is contained in:
Laurent Destailleur 2010-04-03 10:38:28 +00:00
parent f6f5346229
commit a2e43a4464
1 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/includes/modules/DolibarrModules.class.php
View File

@ -774,8 +774,8 @@ class DolibarrModules
} }
/** /**
* \brief Insere les constantes associees au module dans llx_const * \brief Insert constants defined into $this->const array into table llx_const
* \return int Nombre d'erreurs (0 si ok) * \return int Number of errors (0 if OK)
*/ */
function insert_const() function insert_const()
{ {
@ -792,6 +792,10 @@ class DolibarrModules
$visible= $this->const[$key][4]; $visible= $this->const[$key][4];
$entity = ! empty($this->const[$key][5])?0:$conf->entity; $entity = ! empty($this->const[$key][5])?0:$conf->entity;
// Clean
if (empty($visible)) $visible='0';
if (empty($val)) $val='';
$sql = "SELECT count(*)"; $sql = "SELECT count(*)";
$sql.= " FROM ".MAIN_DB_PREFIX."const"; $sql.= " FROM ".MAIN_DB_PREFIX."const";
$sql.= " WHERE ".$this->db->decrypt('name')." = '".$name."'"; $sql.= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
@ -803,41 +807,17 @@ class DolibarrModules
$row = $this->db->fetch_row($result); $row = $this->db->fetch_row($result);
if ($row[0] == 0) // If not found if ($row[0] == 0) // If not found
{
if (! $visible) $visible='0';
if (strlen($note))
{ {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
$sql.= " VALUES ("; $sql.= " VALUES (";
$sql.= $this->db->encrypt($name,1); $sql.= $this->db->encrypt($name,1);
$sql.= ",'".$type."'"; $sql.= ",'".$type."'";
$sql.= ",".$this->db->encrypt($val,1); $sql.= ",".($val?$this->db->encrypt($val,1):"''");
$sql.= ",'".addslashes($note)."'"; $sql.= ",".($note?"'".addslashes($note)."'":"null");
$sql.= ",'".$visible."'"; $sql.= ",'".$visible."'";
$sql.= ",".$entity; $sql.= ",".$entity;
$sql.= ")"; $sql.= ")";
}
elseif (strlen($val))
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,visible,entity)";
$sql.= " VALUES (";
$sql.= $this->db->encrypt($name,1);
$sql.= ",'".$type."'";
$sql.= ",".$this->db->encrypt($val,1);
$sql.= ",'".$visible."'";
$sql.= ",".$entity;
$sql.= ")";
}
else
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,visible,entity)";
$sql.= " VALUES (";
$sql.= $this->db->encrypt($name,1);
$sql.= ",'".$type."'";
$sql.= ",'".$visible."'";
$sql.= ",".$entity;
$sql.= ")";
}
dol_syslog("DolibarrModules::insert_const sql=".$sql); dol_syslog("DolibarrModules::insert_const sql=".$sql);
if (! $this->db->query($sql) ) if (! $this->db->query($sql) )
@ -848,7 +828,7 @@ class DolibarrModules
} }
else else
{ {
dol_syslog("DolibarrModules::insert_const constant '".$name."' already exists"); dol_syslog("DolibarrModules::insert_const constant '".$name."' already exists", LOG_WARNING);
} }
} }
else else