diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 2ac33a71796..0005ed8e6a5 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1400,14 +1400,16 @@ class Adherent extends CommonObject defined('ADHERENT_SPIP_USER') && ADHERENT_SPIP_USER != '' && defined('ADHERENT_SPIP_PASS') && ADHERENT_SPIP_PASS != '' && defined('ADHERENT_SPIP_DB') && ADHERENT_SPIP_DB != '' - ){ + ) + { $mdpass=dol_hash($this->pass); $htpass=crypt($this->pass,makesalt()); $query = "INSERT INTO spip_auteurs (nom, email, login, pass, htpass, alea_futur, statut) VALUES(\"".$this->prenom." ".$this->nom."\",\"".$this->email."\",\"".$this->login."\",\"$mdpass\",\"$htpass\",FLOOR(32000*RAND()),\"1comite\")"; - // $mydb=new Db('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB); - $mydb=new DoliDb('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT); - $result = $mydb->query($query); + $mydb=getDoliDBInstance('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT); + //$mydb=new DoliDb('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT); + + $result = $mydb->query($query); if ($result) { $mydb->close(); @@ -1431,11 +1433,14 @@ class Adherent extends CommonObject defined('ADHERENT_SPIP_USER') && ADHERENT_SPIP_USER != '' && defined('ADHERENT_SPIP_PASS') && ADHERENT_SPIP_PASS != '' && defined('ADHERENT_SPIP_DB') && ADHERENT_SPIP_DB != '' - ){ + ) + { $query = "DELETE FROM spip_auteurs WHERE login='".$this->login."'"; - $mydb=new DoliDb('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT); - $result = $mydb->query($query); + $mydb=getDoliDBInstance('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT); + //$mydb=new DoliDb('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT); + + $result = $mydb->query($query); if ($result) { $mydb->close(); @@ -1462,12 +1467,12 @@ class Adherent extends CommonObject defined('ADHERENT_SPIP_PASS') && ADHERENT_SPIP_PASS != '' && defined('ADHERENT_SPIP_DB') && ADHERENT_SPIP_DB != '') { - $query = "SELECT login FROM spip_auteurs WHERE login='".$this->login."'"; - $mydb=new DoliDb('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT); - if ($mydb->ok) { + $mydb=getDoliDBInstance('mysql',ADHERENT_SPIP_SERVEUR,ADHERENT_SPIP_USER,ADHERENT_SPIP_PASS,ADHERENT_SPIP_DB,ADHERENT_SPIP_PORT); + if ($mydb->ok) + { $result = $mydb->query($query); if ($result) @@ -1490,7 +1495,9 @@ class Adherent extends CommonObject $this->error=$mydb->error(); return -1; } - } else { + } + else + { $this->error="Echec de connexion avec les identifiants ".ADHERENT_SPIP_SERVEUR." ".ADHERENT_SPIP_USER." ".ADHERENT_SPIP_PASS." ".ADHERENT_SPIP_DB; return -1; } diff --git a/htdocs/admin/system/database-tables-contraintes.php b/htdocs/admin/system/database-tables-contraintes.php index 3bcdc878583..da6623d72f4 100644 --- a/htdocs/admin/system/database-tables-contraintes.php +++ b/htdocs/admin/system/database-tables-contraintes.php @@ -24,13 +24,11 @@ */ require("../../main.inc.php"); -include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php"; $langs->load("admin"); -if (!$user->admin) -accessforbidden(); +if (!$user->admin) accessforbidden(); /* diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php index 8b2693ee743..5c74dfbc346 100644 --- a/htdocs/admin/system/database-tables.php +++ b/htdocs/admin/system/database-tables.php @@ -24,12 +24,10 @@ */ require("../../main.inc.php"); -include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php"; $langs->load("admin"); -if (!$user->admin) -accessforbidden(); +if (!$user->admin) accessforbidden(); if ($_GET["action"] == 'convert') diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php index 4096c146f09..0c48f9675a9 100644 --- a/htdocs/admin/system/database.php +++ b/htdocs/admin/system/database.php @@ -24,12 +24,10 @@ */ require("../../main.inc.php"); -include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php"; $langs->load("admin"); -if (!$user->admin) -accessforbidden(); +if (!$user->admin) accessforbidden(); diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php index 9e07e1066a9..f389e73a053 100644 --- a/htdocs/admin/system/dbtable.php +++ b/htdocs/admin/system/dbtable.php @@ -24,13 +24,11 @@ */ require("../../main.inc.php"); -include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php"; $langs->load("admin"); -if (!$user->admin) -accessforbidden(); +if (!$user->admin) accessforbidden(); /* diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 1b4ad3508be..4af1b6b3342 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -23,7 +23,6 @@ */ require("../../main.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/lib/databases/".$conf->db->type.".lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); $langs->load("admin"); diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 782ad2bf2db..972f18530d6 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -23,7 +23,6 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php"; $langs->load("admin"); diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 980e32db2bf..25214f40a0c 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -24,7 +24,6 @@ require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); -include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php"; $what=$_REQUEST["what"]; $export_type=$_REQUEST["export_type"]; diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php index 6a581eee154..2f229a00eee 100644 --- a/htdocs/admin/tools/purge.php +++ b/htdocs/admin/tools/purge.php @@ -21,7 +21,6 @@ */ require("../../main.inc.php"); -include_once(DOL_DOCUMENT_ROOT."/lib/databases/".$conf->db->type.".lib.php"); include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); $langs->load("admin"); diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 4de48203702..5c1ffaf241c 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -22,7 +22,6 @@ */ require("../../main.inc.php"); -include_once $dolibarr_main_document_root."/lib/databases/".$conf->db->type.".lib.php"; include_once $dolibarr_main_document_root."/lib/files.lib.php"; $langs->load("admin"); diff --git a/htdocs/boutique/admin/boutique.php b/htdocs/boutique/admin/boutique.php index 35bcfdf45e7..a02a1ca145f 100644 --- a/htdocs/boutique/admin/boutique.php +++ b/htdocs/boutique/admin/boutique.php @@ -31,8 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); $langs->load("admin"); $langs->load("oscommerce"); -if (!$user->admin) -accessforbidden(); +if (!$user->admin) accessforbidden(); @@ -78,10 +77,7 @@ elseif ($_POST["test"]) $conf->oscommerce->db->user=$_POST["oscommerce_dbuser"]; $conf->oscommerce->db->pass=$_POST["oscommerce_dbpass"]; - $oscommercedb=new DoliDB($conf->oscommerce->db->type,$conf->oscommerce->db->host,$conf->oscommerce->db->user,$conf->oscommerce->db->pass,$conf->oscommerce->db->name,$conf->oscommerce->db->port); - - //print "D ".$db." - ".$db->db."
\n"; - //print "W ".$oscommercedb." - ".$oscommercedb->db."
\n"; + $oscommercedb=getDoliDBInstance($conf->oscommerce->db->type,$conf->oscommerce->db->host,$conf->oscommerce->db->user,$conf->oscommerce->db->pass,$conf->oscommerce->db->name,$conf->oscommerce->db->port); if ($oscommercedb->connected == 1 && $oscommercedb->database_selected == 1) { @@ -202,12 +198,7 @@ print ""; print "\n"; -clearstatcache(); - -if ($mesg) print "
$mesg
"; -print "
"; - - +dol_htmloutput_mesg($mesg); $db->close(); diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php index a63749c7fe8..92960baab17 100644 --- a/htdocs/boutique/osc_master.inc.php +++ b/htdocs/boutique/osc_master.inc.php @@ -20,12 +20,12 @@ * \brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce */ -require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php"); /* * Creation objet $dbosc */ -$dbosc = new DoliDb($conf->db->type,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME,$conf->global->OSC_DB_PORT); +$dbosc=getDoliDBInstance($conf->db->type,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME,$conf->global->OSC_DB_PORT); +//$dbosc = new DoliDb($conf->db->type,$conf->global->OSC_DB_HOST,$conf->global->OSC_DB_USER,$conf->global->OSC_DB_PASS,$conf->global->OSC_DB_NAME,$conf->global->OSC_DB_PORT); if (! $dbosc->connected) { dol_syslog($dbosc,"host=".$conf->global->OSC_DB_HOST.", user=".$conf->global->OSC_DB_USER.", databasename=".$conf->global->OSC_DB_NAME.", ".$db->error,LOG_ERR); diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 1ad2cb5abc7..5f79e3d8fc2 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -280,7 +280,6 @@ else else { require_once($dolibarr_main_document_root."/lib/admin.lib.php"); - require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php"); // $conf is already instancied inside inc.php $conf->db->type = $dolibarr_main_db_type; @@ -289,7 +288,7 @@ else $conf->db->name = $dolibarr_main_db_name; $conf->db->user = $dolibarr_main_db_user; $conf->db->pass = $dolibarr_main_db_pass; - $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); if ($db->connected == 1 && $db->database_selected == 1) { $ok=1; diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index bba7d93e928..da522def453 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -116,7 +116,7 @@ if (! $main_data_dir) { $main_data_dir="$main_dir/documents"; } // Test database connexion if (! $error) { - $result=@include_once($main_dir."/lib/databases/".$_POST["db_type"].".lib.php"); + $result=@include_once($main_dir."/lib/databases/".$_POST["db_type"].".class.php"); if ($result) { // If we ask database or user creation we need to connect as root @@ -157,7 +157,9 @@ if (! $error) } } //print $_POST["db_type"].",".$_POST["db_host"].",$userroot,$passroot,$databasefortest,".$_POST["db_port"]; - $db = new DoliDb($_POST["db_type"],$_POST["db_host"],$userroot,$passroot,$databasefortest,$_POST["db_port"]); + + $db=getDoliDBInstance($_POST["db_type"],$_POST["db_host"],$userroot,$passroot,$databasefortest,$_POST["db_port"]); + //$db = new DoliDb($_POST["db_type"],$_POST["db_host"],$userroot,$passroot,$databasefortest,$_POST["db_port"]); dol_syslog("databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected, LOG_DEBUG); //print "databasefortest=".$databasefortest." connected=".$db->connected." database_selected=".$db->database_selected; @@ -181,7 +183,8 @@ if (! $error) // If we need simple access if (! $error && (empty($_POST["db_create_database"]) && empty($_POST["db_create_user"]))) { - $db = new DoliDb($_POST["db_type"],$_POST["db_host"],$_POST["db_user"],$_POST["db_pass"],$_POST["db_name"],$_POST["db_port"]); + $db=getDoliDBInstance($_POST["db_type"],$_POST["db_host"],$_POST["db_user"],$_POST["db_pass"],$_POST["db_name"],$_POST["db_port"]); + //$db = new DoliDb($_POST["db_type"],$_POST["db_host"],$_POST["db_user"],$_POST["db_pass"],$_POST["db_name"],$_POST["db_port"]); if ($db->error) { print '
'.$db->error.'
'; @@ -193,7 +196,7 @@ if (! $error) } else { - print "
\nFailed to include_once(\"".$main_dir."/lib/databases/".$_POST["db_type"].".lib.php\")
\n"; + print "
\nFailed to include_once(\"".$main_dir."/lib/databases/".$_POST["db_type"].".class.php\")
\n"; print '
'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'
'; print $langs->trans("ErrorGoBackAndCorrectParameters"); $error++; @@ -275,12 +278,9 @@ if (! $error && $db->connected && $action == "set") } } - // Load database driver if (! $error) { dolibarr_install_syslog("etape1: Directory '".$main_dir."' exists"); - - require_once($main_dir."/lib/databases/".$_POST["db_type"].".lib.php"); } @@ -433,7 +433,8 @@ if (! $error && $db->connected && $action == "set") // Creation handler de base, verification du support et connexion - $db = new DoliDb($conf->db->type,$conf->db->host,$userroot,$passroot,$databasefortest,$conf->db->port); + $db=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,$databasefortest,$conf->db->port); + //$db = new DoliDb($conf->db->type,$conf->db->host,$userroot,$passroot,$databasefortest,$conf->db->port); if ($db->error) { print '
'.$db->error.'
'; @@ -507,7 +508,8 @@ if (! $error && $db->connected && $action == "set") if (! $error && (isset($_POST["db_create_database"]) && $_POST["db_create_database"] == "on")) { dolibarr_install_syslog("etape1: Create database : ".$dolibarr_main_db_name, LOG_DEBUG); - $db = new DoliDb($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port); + $db=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port); + //$db = new DoliDb($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port); if ($db->connected) { @@ -570,7 +572,8 @@ if (! $error && $db->connected && $action == "set") dolibarr_install_syslog("etape1: connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name, LOG_DEBUG); //print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name; - $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + //$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); if ($db->connected == 1) { diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index 500eb3c00e1..b68d144fc17 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -23,7 +23,6 @@ */ include("./inc.php"); -require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root."/core/class/conf.class.php"); require_once($dolibarr_main_document_root."/lib/admin.lib.php"); @@ -80,7 +79,8 @@ if ($action == "set") print ''; $error=0; - $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + //$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); if ($db->connected == 1) { print "
"; diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php index fe257ec4df3..9007e3a1db0 100644 --- a/htdocs/install/etape4.php +++ b/htdocs/install/etape4.php @@ -26,7 +26,6 @@ include_once("./inc.php"); -require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root."/core/class/conf.class.php"); require_once($dolibarr_main_document_root."/lib/admin.lib.php"); @@ -70,7 +69,8 @@ print '
'.$langs->trans("LastStepDesc").'

'; print ''; -$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); +$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); +//$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); if ($db->ok == 1) { print ''; diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.class.php similarity index 99% rename from htdocs/lib/databases/mssql.lib.php rename to htdocs/lib/databases/mssql.class.php index dd2abfc881f..ee38e7d1f79 100644 --- a/htdocs/lib/databases/mssql.lib.php +++ b/htdocs/lib/databases/mssql.class.php @@ -19,17 +19,17 @@ */ /** - * \file htdocs/lib/databases/mssql.lib.php + * \file htdocs/lib/databases/mssql.class.php * \brief Fichier de la classe permettant de gerer une base mssql */ /** - * \class DoliDb + * \class DoliDbMssql * \brief Classe de gestion de la database de dolibarr * \remarks Works with PHP5 Only */ -class DoliDb +class DoliDbMssql { //! Database handler var $db; @@ -80,7 +80,7 @@ class DoliDb * @param int $port Port of database server * @return int 1 if OK, 0 if not */ - function DoliDb($type='mssql', $host, $user, $pass, $name='', $port=0) + function DoliDbMssql($type, $host, $user, $pass, $name='', $port=0) { global $conf,$langs; diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.class.php similarity index 99% rename from htdocs/lib/databases/mysql.lib.php rename to htdocs/lib/databases/mysql.class.php index b3c6815fa54..4240820195a 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.class.php @@ -20,16 +20,16 @@ */ /** - * \file htdocs/lib/databases/mysql.lib.php + * \file htdocs/lib/databases/mysql.class.php * \brief Class file to manage Dolibarr database access for a Mysql database */ /** - * \class DoliDb + * \class DoliDbMysql * \brief Class to manage Dolibarr database access for a Mysql database */ -class DoliDb +class DoliDbMysql { //! Database handler var $db; @@ -80,7 +80,7 @@ class DoliDb * @param int $port Port of database server * @return int 1 if OK, 0 if not */ - function DoliDb($type='mysql', $host, $user, $pass, $name='', $port=0) + function DoliDb($type, $host, $user, $pass, $name='', $port=0) { global $conf,$langs; diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.class.php similarity index 99% rename from htdocs/lib/databases/mysqli.lib.php rename to htdocs/lib/databases/mysqli.class.php index bb8b82859e4..7dc71ce8c02 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.class.php @@ -20,16 +20,16 @@ */ /** - * \file htdocs/lib/databases/mysqli.lib.php + * \file htdocs/lib/databases/mysqli.class.php * \brief Class file to manage Dolibarr database access for a Mysql database */ /** - * \class DoliDb + * \class DoliDBMysqli * \brief Class to manage Dolibarr database access for a Mysql database */ -class DoliDb +class DoliDBMysqli { //! Database handler var $db; @@ -80,7 +80,7 @@ class DoliDb * @param int $port Port of database server * @return int 1 if OK, 0 if not */ - function DoliDb($type='mysqli', $host, $user, $pass, $name='', $port=0) + function DoliDBMysqli($type, $host, $user, $pass, $name='', $port=0) { global $conf,$langs; diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.class.php similarity index 99% rename from htdocs/lib/databases/pgsql.lib.php rename to htdocs/lib/databases/pgsql.class.php index 2bbc600ae9b..7982e963e23 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.class.php @@ -21,16 +21,16 @@ */ /** - * \file htdocs/lib/databases/pgsql.lib.php + * \file htdocs/lib/databases/pgsql.class.php * \brief Fichier de la classe permettant de gerer une base pgsql */ /** - * \class DoliDb + * \class DoliDbPgsql * \brief Class to drive a Postgresql database for Dolibarr */ -class DoliDb +class DoliDbPgsql { var $db; // Database handler var $type='pgsql'; // Name of manager @@ -70,7 +70,7 @@ class DoliDb * @param int $port Port of database server * @return int 1 if OK, 0 if not */ - function DoliDb($type='pgsql', $host, $user, $pass, $name='', $port=0) + function DoliDbPgsql($type, $host, $user, $pass, $name='', $port=0) { global $conf,$langs; diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 63e0a37dadb..bb6923f8697 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -31,6 +31,27 @@ */ +/** + * Return a DoliDB instance (database handler). + * + * @param string $type Type of database (mysql, pgsql...) + * @param string $host Address of database server + * @param string $user Nom de l'utilisateur autorise + * @param string $pass Mot de passe + * @param string $name Nom de la database + * @param int $port Port of database server + * @return DoliDB A DoliDB instance + */ +function getDoliDBInstance($type, $host, $user, $pass, $name, $port) +{ + require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$type.".class.php"); + + $class='DoliDB'.ucfirst($type); + $dolidb=new $class($type, $host, $user, $pass, $name, $port); + return $dolidb; +} + + /** * This function output memory used by PHP and exit everything. Used for debugging purpose. * diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 81edaa64666..0ac7204ba5f 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -83,7 +83,6 @@ if (! empty($dolibarr_main_document_root_alt)) if (! defined('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user/class/user.class.php"); // Need 500ko memory if (! defined('NOREQUIRETRAN')) require_once(DOL_DOCUMENT_ROOT ."/core/class/translate.class.php"); if (! defined('NOREQUIRESOC')) require_once(DOL_DOCUMENT_ROOT ."/societe/class/societe.class.php"); -if (! defined('NOREQUIREDB')) require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php"); /* * Creation objet $langs (must be before all other code) @@ -98,7 +97,8 @@ if (! defined('NOREQUIRETRAN')) */ if (! defined('NOREQUIREDB')) { - $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + //$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); if ($db->error) { diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 77b3fbb81b0..ecacb1c691d 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -105,12 +105,8 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile)) { if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type)) { - $result=include_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); - if ($result) - { - // OK - } - else + $result=include_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".class.php"); + if (! $result) { $includeconferror='ErrorBadValueForDolibarrMainDBType'; } diff --git a/test/phpunit/hudson_phpunittest.xml b/test/phpunit/hudson_phpunittest.xml index d7370618ba7..74483c13d3e 100644 --- a/test/phpunit/hudson_phpunittest.xml +++ b/test/phpunit/hudson_phpunittest.xml @@ -34,10 +34,6 @@ ../../htdocs/includes/odtphp/../../htdocs/includes/phpexcel/../../htdocs/includes/tcpdf/ - ../../htdocs/lib/databases/mssql.lib.php - ../../htdocs/lib/databases/pgsql.lib.php - ../../htdocs/lib/databases/mysql.lib.php - ../../htdocs/ @@ -71,10 +67,6 @@ ../../htdocs/includes/odtphp/ ../../htdocs/includes/phpexcel/ ../../htdocs/includes/tcpdf/ - ../../htdocs/lib/databases/mssql.lib.php - ../../htdocs/lib/databases/pgsql.lib.php - ../../htdocs/lib/databases/mysql.lib.php - diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml index ae82b0f05a2..42eef476c2b 100644 --- a/test/phpunit/phpunittest.xml +++ b/test/phpunit/phpunittest.xml @@ -27,10 +27,6 @@ ../../htdocs/includes/odtphp/../../htdocs/includes/phpexcel/../../htdocs/includes/tcpdf/ - ../../htdocs/lib/databases/mssql.lib.php - ../../htdocs/lib/databases/pgsql.lib.php - ../../htdocs/lib/databases/mysql.lib.php - ../../htdocs/ @@ -67,10 +63,6 @@ ../../htdocs/includes/odtphp/ ../../htdocs/includes/phpexcel/ ../../htdocs/includes/tcpdf/ - ../../htdocs/lib/databases/mssql.lib.php - ../../htdocs/lib/databases/pgsql.lib.php - ../../htdocs/lib/databases/mysql.lib.php -
'.$langs->trans("DolibarrAdminLogin").' :'; diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 8249c875e53..4c845b0db7f 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -27,7 +27,6 @@ include_once("./inc.php"); if (file_exists($conffile)) include_once($conffile); -require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root . "/lib/admin.lib.php"); @@ -137,7 +136,8 @@ if ($action == "set" || preg_match('/upgrade/i',$action)) $conf->db->dolibarr_main_db_encryption = isset($dolibarr_main_db_encryption)?$dolibarr_main_db_encryption:''; $conf->db->dolibarr_main_db_cryptkey = isset($dolibarr_main_db_cryptkey)?$dolibarr_main_db_cryptkey:''; - $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + //$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); $ok = 0; diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index fa4e4a61692..3a7f117fbe2 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -270,7 +270,7 @@ if (! empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') { // Enabled if t { while (($file = readdir($handle))!==false) { - if (is_readable($dir."/".$file) && preg_match('/^(.*)\.lib\.php/i',$file,$reg)) + if (is_readable($dir."/".$file) && preg_match('/^(.*)\.class\.php/i',$file,$reg)) { $type=$reg[1]; diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 6488503ce49..8221c7c67b6 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -111,12 +111,8 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile)) { if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type)) { - $result=include_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); - if ($result) - { - // OK - } - else + $result=include_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".class.php"); + if (! $result) { $includeconferror='ErrorBadValueForDolibarrMainDBType'; } diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index c98de6ea427..17e6c284625 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -24,7 +24,6 @@ include_once("./inc.php"); if (file_exists($conffile)) include_once($conffile); -require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root."/lib/admin.lib.php"); @@ -95,7 +94,8 @@ $conf->db->name = $dolibarr_main_db_name; $conf->db->user = $dolibarr_main_db_user; $conf->db->pass = $dolibarr_main_db_pass; -$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); +$db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); +//$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); if ($db->connected == 1) { print '
'; diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index c7f0e4aa188..0eeb5f6b733 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -28,7 +28,6 @@ if (! file_exists($conffile)) print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").'; } require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility -require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root."/lib/admin.lib.php"); $grant_query=''; @@ -112,7 +111,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey=''; $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey; - $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + //$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); if ($db->connected == 1) { print '
'; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 72693b0c340..25c16e4c171 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -29,7 +29,6 @@ if (! file_exists($conffile)) print 'Error: Dolibarr config file was not found. This may means that Dolibarr is not installed yet. Please call the page "/install/index.php" instead of "/install/upgrade.php").'; } require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql'; // For backward compatibility -require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root . '/compta/facture/class/facture.class.php'); require_once($dolibarr_main_document_root . '/comm/propal/class/propal.class.php'); require_once($dolibarr_main_document_root . '/contrat/class/contrat.class.php'); @@ -106,7 +105,8 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) $conf->db->user = $dolibarr_main_db_user; $conf->db->pass = $dolibarr_main_db_pass; - $db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); + //$db = new DoliDb($conf->db->type,$conf->db->host,$conf->db->user,$conf->db->pass,$conf->db->name,$conf->db->port); if ($db->connected != 1) { print '
'.$langs->trans("ErrorFailedToConnectToDatabase",$conf->db->name).''.$langs->trans('Error').'