From 3445244487c7b6148e7e68986c71774592fca53e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Oct 2009 03:10:12 +0000 Subject: [PATCH] Fix: Errors in postgreSQL support --- htdocs/admin/tools/dolibarr_export.php | 255 +++++++++++++++---------- htdocs/admin/tools/export.php | 101 ++++++++-- htdocs/langs/en_US/admin.lang | 4 +- htdocs/langs/en_US/install.lang | 2 +- htdocs/langs/fr_FR/admin.lang | 3 +- htdocs/langs/fr_FR/install.lang | 2 +- 6 files changed, 252 insertions(+), 115 deletions(-) diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index f434c025c48..1f3b7ce8bd4 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -73,10 +73,7 @@ if ($_GET["msg"]) // @@ -117,7 +104,10 @@ print '
';
trans("ExportMethod"); ?> - +label == 'MySQL') +{ +?>
- +
- - +label; +} +?>
@@ -186,6 +150,7 @@ print '
';
+
trans("MySqlExportParameters"); ?> @@ -214,41 +179,46 @@ print '
'; value="" />
-
- - - -
- -
- - -
- - - +
trans("ExportOptions"); ?> +
+ + + +
+ +
+ + +
+ + + + +
+ +
';
-
+ +
@@ -311,6 +282,89 @@ print '
';
+ + +
+ trans("PostgreSqlExportParameters"); ?> + +
+ 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'; + } + } + else + { + $fullpathofpgdump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP; + } + ?>
+ +
+ + +
+
+ trans("ExportOptions"); ?> + +
+ + +
+ +
+
+ + + + +
+ +
+
+ + + + + + +
+ +
+
+ + +