Move db classes in /htdocs/core/db
This commit is contained in:
parent
ecc5519a4e
commit
dd963235cd
@ -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"].".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 @@ if (! $error)
|
||||
}
|
||||
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++;
|
||||
|
||||
@ -259,7 +259,7 @@ if (! empty($force_install_message))
|
||||
$option='';
|
||||
|
||||
// Scan les drivers
|
||||
$dir=DOL_DOCUMENT_ROOT.'/lib/databases';
|
||||
$dir=DOL_DOCUMENT_ROOT.'/core/db';
|
||||
$handle=opendir($dir);
|
||||
if (is_resource($handle))
|
||||
{
|
||||
|
||||
@ -111,7 +111,7 @@ 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.".class.php");
|
||||
$result=include_once($dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.".class.php");
|
||||
if (! $result)
|
||||
{
|
||||
$includeconferror='ErrorBadValueForDolibarrMainDBType';
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -105,7 +105,7 @@ 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.".class.php");
|
||||
$result=include_once($dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.".class.php");
|
||||
if (! $result)
|
||||
{
|
||||
$includeconferror='ErrorBadValueForDolibarrMainDBType';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user