diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 151ad565429..b4a436ee1e7 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -77,7 +77,7 @@ if ($db->label == 'MySQL')
{
?>
document.getElementById("mysql_options").style.display = 'none';
-
label == 'PostgreSQL')
{
?>
document.getElementById("postgresql_options").style.display = 'none';
-
}
@@ -175,17 +175,7 @@ if ($db->label == 'MySQL')
trans("FullPathToMysqldumpCommand");
if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP))
{
- $resql=$db->query('SHOW VARIABLES LIKE \'basedir\'');
- if ($resql)
- {
- $liste=$db->fetch_array($resql);
- $basedir=$liste['Value'];
- $fullpathofmysqldump=$basedir.'bin/mysqldump';
- }
- else
- {
- $fullpathofmysqldump='/pathtomysqldump/mysqldump';
- }
+ $fullpathofmysqldump=$db->getPathOfDump();
}
else
{
@@ -298,7 +288,7 @@ if ($db->label == 'MySQL')
-label == 'PostgreSQL')
@@ -312,17 +302,7 @@ if ($db->label == 'PostgreSQL')
trans("FullPathToPostgreSQLdumpCommand");
if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP))
{
- $resql=$db->query('SHOW data_directory');
- if ($resql)
- {
- $liste=$db->fetch_array($resql);
- $basedir=$liste['data_directory'];
- $fullpathofpgdump=preg_replace('/data$/','bin',$basedir).'/pg_dump';
- }
- else
- {
- $fullpathofpgdump='/pathtopgdump/pg_dump';
- }
+ $fullpathofpgdump=$db->getPathOfDump();
}
else
{
@@ -383,7 +363,7 @@ if ($db->label == 'PostgreSQL')
-
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 3e588248af6..5b053494e83 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -94,12 +94,16 @@ print '
';