modification pour la variable $dolibarr_main_db_type

corrcetion des mysql.lib.php3 en mysql.lib.php
This commit is contained in:
opensides 2004-09-09 10:32:18 +00:00
parent 7495549c71
commit 5797af447d
9 changed files with 27 additions and 13 deletions

View File

@ -137,7 +137,7 @@ if ($_POST["action"] == "set")
$dir[5] = "$main_data_dir/rapport"; $dir[5] = "$main_data_dir/rapport";
$dir[6] = "$main_data_dir/images"; $dir[6] = "$main_data_dir/images";
$dir[7] = "$main_data_dir/rsscache"; $dir[7] = "$main_data_dir/rsscache";
$dir[8] = "$main_data_dir/logo"; $dir[8] = "$main_data_dir/logo";
if (! is_dir($main_dir)) if (! is_dir($main_dir))
{ {

View File

@ -38,12 +38,12 @@ if($dolibarr_main_db_type == "mysql")
} }
else else
{ {
require ($dolibarr_main_document_root . "/lib/pgsql.lib.php"); require ($dolibarr_main_document_root . "/lib/pgsql.lib.php";
require ($dolibarr_main_document_root . "/lib/grant.postgres.php"); require ($dolibarr_main_document_root . "/lib/grant.postgres.php");
$choix=2; $choix=2;
} }
require ($dolibarr_main_document_root . "/conf/conf.class.php");// ne sert plus require ($dolibarr_main_document_root . "/conf/conf.class.php");
if ($_POST["action"] == "set") if ($_POST["action"] == "set")
{ {

View File

@ -30,9 +30,9 @@ if (file_exists($conf))
} }
if($dolibarr_main_db_type == "mysql") if($dolibarr_main_db_type == "mysql")
require ($dolibarr_main_document_root . "/lib/mysql.lib.php"); require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
else else
require ($dolibarr_main_document_root . "/lib/pgsql.lib.php"); require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");

View File

@ -33,9 +33,9 @@ if (file_exists($conf))
if($dolibarr_main_db_type == "mysql") if($dolibarr_main_db_type == "mysql")
require ($dolibarr_main_document_root . "/lib/mysql.lib.php"); require ($dolibarr_main_document_root . "/lib/mysql.lib.php");
else else
require ($dolibarr_main_document_root . "/lib/pgsql.lib.php"); require ($dolibarr_main_document_root . "/lib/pgsql.lib.php");
require ($dolibarr_main_document_root . "/conf/conf.class.php"); require ($dolibarr_main_document_root . "/conf/conf.class.php");

View File

@ -27,13 +27,20 @@
* *
*/ */
require("../../lib/mysql.lib.php");
require("../../conf/conf.class.php"); require("../../conf/conf.class.php");
require("../../retourbplc.class.php"); require("../../retourbplc.class.php");
require("../../don.class.php"); require("../../don.class.php");
$conf = new Conf(); $conf = new Conf();
conf->db->type = $dolibarr_main_db_type;
// Si type non défini (pour compatibilité avec ancienne install), on
// travail avec mysql
if (! $conf->db->type) { $conf->db->type = 'mysql'; }
require (DOL_DOCUMENT_ROOT ."/lib/".$dolibarr_main_db_type.".lib.php");
$db = new DoliDb(); $db = new DoliDb();
$retbplc = new Retourbplc($db); $retbplc = new Retourbplc($db);

View File

@ -9,7 +9,7 @@
<title>EUCD.INFO - Dépenses</title> <title>EUCD.INFO - Dépenses</title>
<script language="php"> <script language="php">
require("../../conf/conf.class.php"); require("../../conf/conf.class.php");
require("../../lib/mysql.lib.php3"); require("../../lib/mysql.lib.php");
</script> </script>
</head> </head>

View File

@ -9,7 +9,7 @@
<title>Dons FSF France Projet EUCD.INFO</title> <title>Dons FSF France Projet EUCD.INFO</title>
<script language="php"> <script language="php">
require("../../conf/conf.class.php"); require("../../conf/conf.class.php");
require("../../lib/mysql.lib.php3"); require("../../lib/mysql.lib.php");
require("../../don.class.php"); require("../../don.class.php");
</script> </script>
</head> </head>

View File

@ -9,7 +9,7 @@
<title>Dons FSF France Projet EUCD.INFO</title> <title>Dons FSF France Projet EUCD.INFO</title>
<script language="php"> <script language="php">
require("../../conf/conf.class.php"); require("../../conf/conf.class.php");
require("../../lib/mysql.lib.php3"); require("../../lib/mysql.lib.php");
require("../../don.class.php"); require("../../don.class.php");
</script> </script>
</head> </head>

View File

@ -21,11 +21,18 @@
*/ */
require("../../don.class.php"); require("../../don.class.php");
require("../../lib/mysql.lib.php");
require("../../conf/conf.class.php"); require("../../conf/conf.class.php");
$conf = new Conf(); $conf = new Conf();
conf->db->type = $dolibarr_main_db_type;
// Si type non défini (pour compatibilité avec ancienne install), on
// travail avec mysql
if (! $conf->db->type) { $conf->db->type = 'mysql'; }
require("../../lib/.$dolibarr_main_db_type.lib.php");
if ($conf->don->enabled) if ($conf->don->enabled)
{ {