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

Fix: Bad path on fedora

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-04 13:58:14 +00:00
parent 5199f67d3c
commit d72f0fec45
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/lib/databases/mssql.lib.php
View File

@ -21,7 +21,7 @@
/**
* \file htdocs/lib/databases/mssql.lib.php
* \brief Fichier de la classe permettant de gerer une base mssql
* \version $Id: mssql.lib.php,v 1.86 2011/07/31 23:26:03 eldy Exp $
* \version $Id: mssql.lib.php,v 1.87 2011/08/04 13:58:14 eldy Exp $
*/
// Pour compatibilite lors de l'upgrade
@ -1022,14 +1022,24 @@ class DoliDb
return ''; // attente debugage
}
/*
* Return full path of dump program
* @return string Full path of dump program
*/
function getPathOfDump()
{
return '';
}
/**
* Return full path of restore program
* @return string Full path of restore program
*/
function getPathOfRestore()
{
return '';
}
}

4
htdocs/lib/databases/mysql.lib.php
View File

@ -22,7 +22,7 @@
/**
* \file htdocs/lib/databases/mysql.lib.php
* \brief Class file to manage Dolibarr database access for a Mysql database
* \version $Id: mysql.lib.php,v 1.120 2011/08/04 13:58:14 eldy Exp $
* \version $Id: mysql.lib.php,v 1.121 2011/08/04 13:58:55 eldy Exp $
*/
// For compatibility during upgrade
if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '../..');
@ -1174,7 +1174,7 @@ class DoliDb
{
$liste=$this->fetch_array($resql);
$basedir=$liste['Value'];
$fullpathofimport=$basedir.'bin/mysql';
$fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
}
return $fullpathofimport;
}

4
htdocs/lib/databases/mysqli.lib.php
View File

@ -22,7 +22,7 @@
/**
* \file htdocs/lib/databases/mysqli.lib.php
* \brief Class file to manage Dolibarr database access for a Mysql database
* \version $Id: mysqli.lib.php,v 1.114 2011/08/04 13:58:14 eldy Exp $
* \version $Id: mysqli.lib.php,v 1.115 2011/08/04 13:58:55 eldy Exp $
*/
// For compatibility during upgrade
@ -1185,7 +1185,7 @@ class DoliDb
{
$liste=$this->fetch_array($resql);
$basedir=$liste['Value'];
$fullpathofimport=$basedir.'bin/mysql';
$fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
}
return $fullpathofimport;
}

14
htdocs/lib/databases/pgsql.lib.php
View File

@ -23,7 +23,7 @@
/**
* \file htdocs/lib/databases/pgsql.lib.php
* \brief Fichier de la classe permettant de gerer une base pgsql
* \version $Id: pgsql.lib.php,v 1.110 2011/07/31 23:26:03 eldy Exp $
* \version $Id: pgsql.lib.php,v 1.111 2011/08/04 13:58:14 eldy Exp $
*/
// For compatibility during upgrade
if (! defined('DOL_DOCUMENT_ROOT')) define('DOL_DOCUMENT_ROOT', '../..');
@ -1233,8 +1233,8 @@ class DoliDb
}
/**
* \brief Return full path of dump program
* \return string Full path of dump program
* Return full path of dump program
* @return string Full path of dump program
*/
function getPathOfDump()
{
@ -1259,10 +1259,10 @@ class DoliDb
return $fullpathofdump;
}
/**
* \brief Return full path of restore program
* \return string Full path of restore program
*/
/**
* Return full path of restore program
* @return string Full path of restore program
*/
function getPathOfRestore()
{
$fullpathofdump='/pathtopgrestore/pg_restore';