Move db classes in /htdocs/core/db

Dolibarr · Oct 24, 2011 · dd96323 · dd96323
1 parent ecc5519
commit dd96323
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 6 deletions.
diff --git a/htdocs/lib/databases/index.php → htdocs/core/db/index.php b/htdocs/lib/databases/index.php → htdocs/core/db/index.php
diff --git a/htdocs/lib/databases/mssql.class.php → htdocs/core/db/mssql.class.php b/htdocs/lib/databases/mssql.class.php → htdocs/core/db/mssql.class.php
diff --git a/htdocs/lib/databases/mysql.class.php → htdocs/core/db/mysql.class.php b/htdocs/lib/databases/mysql.class.php → htdocs/core/db/mysql.class.php
diff --git a/htdocs/lib/databases/mysqli.class.php → htdocs/core/db/mysqli.class.php b/htdocs/lib/databases/mysqli.class.php → htdocs/core/db/mysqli.class.php
diff --git a/htdocs/lib/databases/pgsql.class.php → htdocs/core/db/pgsql.class.php b/htdocs/lib/databases/pgsql.class.php → htdocs/core/db/pgsql.class.php
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
@@ -116,7 +116,7 @@
 // Test database connexion
 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 we ask database or user creation we need to connect as root
@@ -195,7 +195,7 @@
     }
     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 $langs->trans("ErrorGoBackAndCorrectParameters");
         $error++;

diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
@@ -259,7 +259,7 @@
 		$option='';
 
 		// Scan les drivers
-		$dir=DOL_DOCUMENT_ROOT.'/lib/databases';
+		$dir=DOL_DOCUMENT_ROOT.'/core/db';
 		$handle=opendir($dir);
 		if (is_resource($handle))
 		{

diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
@@ -111,7 +111,7 @@
         {
             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)
                 {
                     $includeconferror='ErrorBadValueForDolibarrMainDBType';

diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
@@ -44,7 +44,7 @@
  */
 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);
     $dolidb=new $class($type, $host, $user, $pass, $name, $port);

diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
@@ -105,7 +105,7 @@
 		{
 			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)
 				{
 					$includeconferror='ErrorBadValueForDolibarrMainDBType';