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

Move db classes in /htdocs/core/db

Browse Source
This commit is contained in:
Regis Houssin 2011-10-24 10:06:37 +02:00
parent ecc5519a4e
commit dd963235cd
10 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
htdocs/lib/databases/index.php → htdocs/core/db/index.php
View File

0
htdocs/lib/databases/mssql.class.php → htdocs/core/db/mssql.class.php
View File

0
htdocs/lib/databases/mysql.class.php → htdocs/core/db/mysql.class.php
View File

0
htdocs/lib/databases/mysqli.class.php → htdocs/core/db/mysqli.class.php
View File

0
htdocs/lib/databases/pgsql.class.php → htdocs/core/db/pgsql.class.php
View File

4
htdocs/install/etape1.php
View File

@ -116,7 +116,7 @@ if (! $main_data_dir) { $main_data_dir="$main_dir/documents"; }
// Test database connexion // Test database connexion
if (! $error) if (! $error)
{ {
$result=@include_once($main_dir."/lib/databases/".$_POST["db_type"].".class.php"); $result=@include_once($main_dir."/core/db/".$_POST["db_type"].".class.php");
if ($result) if ($result)
{ {
// If we ask database or user creation we need to connect as root // If we ask database or user creation we need to connect as root
@ -195,7 +195,7 @@ if (! $error)
} }
else else
{ {
print "<br>\nFailed to include_once(\"".$main_dir."/lib/databases/".$_POST["db_type"].".class.php\")<br>\n"; print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$_POST["db_type"].".class.php\")<br>\n";
print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'</div>'; print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'</div>';
print $langs->trans("ErrorGoBackAndCorrectParameters"); print $langs->trans("ErrorGoBackAndCorrectParameters");
$error++; $error++;

2
htdocs/install/fileconf.php
View File

@ -259,7 +259,7 @@ if (! empty($force_install_message))
$option=''; $option='';
// Scan les drivers // Scan les drivers
$dir=DOL_DOCUMENT_ROOT.'/lib/databases'; $dir=DOL_DOCUMENT_ROOT.'/core/db';
$handle=opendir($dir); $handle=opendir($dir);
if (is_resource($handle)) if (is_resource($handle))
{ {

2
htdocs/install/inc.php
View File

@ -111,7 +111,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile))
{ {
if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type)) if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type))
{ {
$result=include_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".class.php"); $result=include_once($dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.".class.php");
if (! $result) if (! $result)
{ {
$includeconferror='ErrorBadValueForDolibarrMainDBType'; $includeconferror='ErrorBadValueForDolibarrMainDBType';

2
htdocs/lib/functions.lib.php
View File

@ -44,7 +44,7 @@
*/ */
function getDoliDBInstance($type, $host, $user, $pass, $name, $port) function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
{ {
require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$type.".class.php"); require_once(DOL_DOCUMENT_ROOT ."/core/db/".$type.".class.php");
$class='DoliDB'.ucfirst($type); $class='DoliDB'.ucfirst($type);
$dolidb=new $class($type, $host, $user, $pass, $name, $port); $dolidb=new $class($type, $host, $user, $pass, $name, $port);

2
htdocs/support/inc.php
View File

@ -105,7 +105,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile))
{ {
if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type)) if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type))
{ {
$result=include_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".class.php"); $result=include_once($dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.".class.php");
if (! $result) if (! $result)
{ {
$includeconferror='ErrorBadValueForDolibarrMainDBType'; $includeconferror='ErrorBadValueForDolibarrMainDBType';