From 8fedb1327bd51eadcd9a84cfe1330ce59f3fa791 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 25 Nov 2009 19:05:04 +0000
Subject: [PATCH] Fix: Option of mysql dump was using postgressql choices.

---
 htdocs/admin/tools/dolibarr_export.php | 33 ++++++++++++++++++++++----
 htdocs/admin/tools/export.php          | 10 ++++----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 1f3b7ce8bd4..151ad565429 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -72,8 +72,22 @@ if ($_GET["msg"])
 <script type="text/javascript" language="javascript">
 //<![CDATA[
 function hide_them_all() {
+<?php
+if ($db->label == 'MySQL')
+{
+?>
     document.getElementById("mysql_options").style.display = 'none';
-    document.getElementById("postgresql_options").style.display = 'none';
+<?php 
+}
+?>
+<?php
+if ($db->label == 'PostgreSQL')
+{
+?>
+	document.getElementById("postgresql_options").style.display = 'none';
+	<?php 
+}
+?>
 }
 
 function show_checked_option() {
@@ -149,7 +163,10 @@ else
 
 <div id="div_container_sub_exportoptions">
 
-
+<?php
+if ($db->label == 'MySQL')
+{
+?>
 <!--  Fieldset mysqldump -->
 <fieldset id="mysql_options">
     <legend><?php echo $langs->trans("MySqlExportParameters"); ?></legend>
@@ -281,8 +298,12 @@ else
 
     </fieldset>
 </fieldset>
+<?php 
+}
 
-
+if ($db->label == 'PostgreSQL')
+{
+?>
 <!--  Fieldset pg_dump -->
 <fieldset id="postgresql_options">
     <legend><?php echo $langs->trans("PostgreSqlExportParameters"); ?></legend>
@@ -362,7 +383,9 @@ else
 
     </fieldset>
 </fieldset>
-
+<?php 
+}
+?>
 
 
 <!--
@@ -661,7 +684,7 @@ if (window.parent.frames[1]) {
 <?php
 
 
-$result=$formfile->show_documents('systemtools','',DOL_DATA_ROOT.'/admin/temp',$_SERVER['PHP_SELF'],0,1,'','',0,0,54,0,'',$langs->trans("PreviousDumpFiles"));
+$result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_output.'/backup',$_SERVER['PHP_SELF'],0,1,'','',0,0,54,0,'',$langs->trans("PreviousDumpFiles"));
 //if ($result) print '<br><br>';
 
 
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 3aff53accf9..8a4cbd53817 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -86,14 +86,14 @@ if ($what == 'mysql')
 		dolibarr_set_const($db, 'SYSTEMTOOLS_MYSQLDUMP', $cmddump,'chaine',0,'',$conf->entity);
 	}
 
-	$outputdir  = $conf->admin->dir_temp;
+	$outputdir  = $conf->admin->dir_output.'/backup';
 	$outputfile = $outputdir.'/'.$file;
 	// for compression format, we add extension
 	$compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
 	if ($compression == 'gz') $outputfile.='.gz';
 	if ($compression == 'bz') $outputfile.='.bz2';
 	$outputerror = $outputfile.'.err';
-	create_exdir($conf->admin->dir_temp);
+	create_exdir($conf->admin->dir_output.'/backup');
 
 	// Parameteres execution
 	$command=$cmddump;
@@ -195,7 +195,7 @@ if ($what == 'mysql')
 		{
 			// Renommer fichier sortie en fichier erreur
 			//print "$outputfile -> $outputerror";
-			dol_delete_file($outputerror,1);
+			@dol_delete_file($outputerror,1);
 			@rename($outputfile,$outputerror);
 			// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
 			if (! $errormsg) $errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
@@ -213,14 +213,14 @@ if ($what == 'postgresql')
 		dolibarr_set_const($db, 'SYSTEMTOOLS_POSTGRESQLDUMP', $cmddump,'chaine',0,'',$conf->entity);
 	}
 
-	$outputdir  = $conf->admin->dir_temp;
+	$outputdir  = $conf->admin->dir_output.'/backup';
 	$outputfile = $outputdir.'/'.$file;
 	// for compression format, we add extension
 	$compression=isset($_POST['compression']) ? $_POST['compression'] : 'none';
 	if ($compression == 'gz') $outputfile.='.gz';
 	if ($compression == 'bz') $outputfile.='.bz2';
 	$outputerror = $outputfile.'.err';
-	create_exdir($conf->admin->dir_temp);
+	create_exdir($conf->admin->dir_output.'/backup');
 
 	// Parameteres execution
 	$command=$cmddump;