Skip to content

Commit

Permalink
Fix: PostgreSQL compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@hregis
hregis committed Feb 12, 2011
1 parent cc39ca7 commit af97652
Showing 1 changed file with 38 additions and 38 deletions.
76 changes: 38 additions & 38 deletions htdocs/includes/modules/DolibarrModules.class.php
View file
Expand Up @@ -3,8 +3,8 @@
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -55,8 +55,8 @@ class DolibarrModules


/**
* \brief Constructeur
* \param DB handler d'acces base
* Constructor
* @param DB Database access handler
*/
function DolibarrModules($DB)
{
Expand All @@ -66,10 +66,10 @@ function DolibarrModules($DB)


/**
* \brief Fonction d'activation. Insere en base les constantes et boites du module
* \param array_sql Tableau de requete sql a executer a l'activation
* \param options Options when enabling module ('', 'noboxes')
* \return int 1 if OK, 0 if KO
* Fonction d'activation. Insere en base les constantes et boites du module
* @param array_sql Tableau de requete sql a executer a l'activation
* @param options Options when enabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function _init($array_sql, $options='')
{
Expand All @@ -96,7 +96,7 @@ function _init($array_sql, $options='')
// Insert activation login method
if (! $err) $err+=$this->insert_login_method();

// Insere les constantes associees au module dans llx_const
// Insert constant defined by modules, into llx_const
if (! $err) $err+=$this->insert_const();

// Insere les boites dans llx_boxes_def
Expand Down Expand Up @@ -164,10 +164,10 @@ function _init($array_sql, $options='')
}

/**
* \brief Fonction de desactivation. Supprime de la base les constantes et boites du module
* \param array_sql tableau de requete sql a executer a la desactivation
* \param options Options when disabling module ('', 'noboxes')
* \return int 1 if OK, 0 if KO
* Fonction de desactivation. Supprime de la base les constantes et boites du module
* @param array_sql tableau de requete sql a executer a la desactivation
* @param options Options when disabling module ('', 'noboxes')
* @return int 1 if OK, 0 if KO
*/
function _remove($array_sql, $options='')
{
Expand Down Expand Up @@ -418,8 +418,8 @@ function _dbunactive()


/**
* \brief Insert constant to activate module
* \return int Nb of errors (0 if OK)
* Insert constant to activate module
* @return int Nb of errors (0 if OK)
*/
function _active()
{
Expand Down Expand Up @@ -453,8 +453,8 @@ function _active()


/**
* \brief Remove activation line
* \return int Nb of errors (0 if OK)
* Remove activation line
* @return int Nb of errors (0 if OK)
**/
function _unactive()
{
Expand Down Expand Up @@ -577,7 +577,7 @@ function insert_boxes()
$sql.= " WHERE file = '".$file."'";
$sql.= " AND entity = ".$conf->entity;

if ($note) $sql.=" AND note ='".addslashes($note)."'";
if ($note) $sql.=" AND note ='".$this->db->escape($note)."'";

$result=$this->db->query($sql);
if ($result)
Expand All @@ -586,9 +586,9 @@ function insert_boxes()
if ($row[0] == 0)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file,entity,note)";
$sql.= " VALUES ('".addslashes($file)."',";
$sql.= " VALUES ('".$this->db->escape($file)."',";
$sql.= $conf->entity.",";
$sql.= $note?"'".addslashes($note)."'":"null";
$sql.= $note?"'".$this->db->escape($note)."'":"null";
$sql.= ")";

dol_syslog("DolibarrModules::insert_boxes sql=".$sql);
Expand Down Expand Up @@ -632,7 +632,7 @@ function delete_boxes()
$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
$sql.= " USING ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
$sql.= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
$sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".addslashes($file)."'";
$sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."'";
$sql.= " AND ".MAIN_DB_PREFIX."boxes_def.entity = ".$conf->entity;

dol_syslog("DolibarrModules::delete_boxes sql=".$sql);
Expand All @@ -645,7 +645,7 @@ function delete_boxes()
}

$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
$sql.= " WHERE file = '".addslashes($file)."'";
$sql.= " WHERE file = '".$this->db->escape($file)."'";
$sql.= " AND entity = ".$conf->entity;

dol_syslog("DolibarrModules::delete_boxes sql=".$sql);
Expand Down Expand Up @@ -807,8 +807,8 @@ function insert_tabs()
}

/**
* \brief Insert constants defined into $this->const array into table llx_const
* \return int Number of errors (0 if OK)
* Insert constants defined into $this->const array into table llx_const
* @return int Number of errors (0 if OK)
*/
function insert_const()
{
Expand Down Expand Up @@ -846,7 +846,7 @@ function insert_const()
$sql.= $this->db->encrypt($name,1);
$sql.= ",'".$type."'";
$sql.= ",".($val?$this->db->encrypt($val,1):"''");
$sql.= ",".($note?"'".addslashes($note)."'":"null");
$sql.= ",".($note?"'".$this->db->escape($note)."'":"null");
$sql.= ",'".$visible."'";
$sql.= ",".$entity;
$sql.= ")";
Expand Down Expand Up @@ -919,22 +919,22 @@ function insert_permissions($reinitadminperms=0)
$sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
$sql.= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
$sql.= " VALUES ";
$sql.= "(".$r_id.",".$conf->entity.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
$sql.= "(".$r_id.",".$conf->entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
}
else
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
$sql.= " (id, entity, libelle, module, type, bydefault, perms)";
$sql.= " VALUES ";
$sql.= "(".$r_id.",".$conf->entity.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
$sql.= "(".$r_id.",".$conf->entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
}
}
else
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
$sql .= " (id, entity, libelle, module, type, bydefault)";
$sql .= " VALUES ";
$sql .= "(".$r_id.",".$conf->entity.",'".addslashes($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
$sql .= "(".$r_id.",".$conf->entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
}

dol_syslog("DolibarrModules::insert_permissions sql=".$sql, LOG_DEBUG);
Expand Down Expand Up @@ -975,8 +975,8 @@ function insert_permissions($reinitadminperms=0)


/**
\brief Supprime les permissions
\return int Nombre d'erreurs (0 si ok)
* \brief Supprime les permissions
* \return int Nombre d'erreurs (0 si ok)
*/
function delete_permissions()
{
Expand All @@ -991,7 +991,7 @@ function delete_permissions()
if (! $this->db->query($sql))
{
$this->error=$this->db->lasterror();
dol_syslog("DolibarrModules::delete_dirs ".$this->error, LOG_ERR);
dol_syslog("DolibarrModules::delete_permissions ".$this->error, LOG_ERR);
$err++;
}

Expand All @@ -1000,8 +1000,8 @@ function delete_permissions()


/**
* \brief Insere les menus dans llx_menu*
* \return int Nombre d'erreurs (0 si ok)
* \brief Insert menus entries into llx_menu*
* \return int Nb of errors (0 if OK)
*/
function insert_menus()
{
Expand Down Expand Up @@ -1095,7 +1095,7 @@ function delete_menus()
$err=0;

$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
$sql.= " WHERE module = '".addslashes($this->rights_class)."'";
$sql.= " WHERE module = '".$this->db->escape($this->rights_class)."'";
$sql.= " AND entity = ".$conf->entity;

dol_syslog("DolibarrModules::delete_menus sql=".$sql);
Expand Down Expand Up @@ -1299,8 +1299,8 @@ function delete_triggers()
}

/**
* \brief Insert activation login method from modules in llx_const
* \return int Number of errors (0 if ok)
* Insert activation login method from modules in llx_const
* @return int Number of errors (0 if ok)
*/
function insert_login_method()
{
Expand Down Expand Up @@ -1339,8 +1339,8 @@ function insert_login_method()
}

/**
* \brief Remove activation login method from modules in llx_const
* \return int Nombre d'erreurs (0 si ok)
* Remove activation login method from modules in llx_const
* @return int Nombre d'erreurs (0 si ok)
*/
function delete_login_method()
{
Expand Down

0 comments on commit af97652

Please sign in to comment.