From aa4cb1b2728682d9a6638372f90bca90b7ed363c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 24 Aug 2006 18:51:59 +0000
Subject: [PATCH] =?UTF-8?q?Am=E9lioration=20gestion=20erreur=20sauvegarde?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/tools/dolibarr_export.php |  9 ++++++++-
 htdocs/admin/tools/export.php          | 21 +++++++++++++--------
 htdocs/langs/en_US/admin.lang          |  1 +
 htdocs/langs/fr_FR/admin.lang          |  3 ++-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 44abd8ca834..b5f4a5fde29 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -45,6 +45,13 @@ print '<br>';
 print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b><br>';
 print '<br>';
 
+if ($_GET["msg"])
+{
+	print '<div class="error">'.$_GET["msg"].'</div>';
+	print '<br>';
+	print "\n";
+}
+
 $result=$html->show_documents('systemtools','',DOL_DATA_ROOT.'/admin/temp',$_SERVER['PHP_SELF'],0,1);
 if ($result) print '<br><br>';
 
@@ -102,7 +109,7 @@ function show_checked_option() {
 
 <div id="div_container_exportoptions">
 <fieldset id="exportoptions">
-<legend>Méthode d'exportation</legend>
+<legend><?php echo $langs->trans("ExportMethod"); ?></legend>
 
     <div class="formelementrow">
         <input type="radio" name="what" value="mysql" id="radio_dump_mysql"
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index e6abff9b3ef..7440f9a8271 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -38,6 +38,19 @@ if (! $user->admin)
   accessforbidden();
 
 
+if ($file && ! $what) 
+{
+   //print DOL_URL_ROOT.'/dolibarr_export.php';
+	header("Location: ".DOL_URL_ROOT.'/admin/tools/dolibarr_export.php?msg='.urlencode($langs->trans("ErrorFieldRequired",$langs->trans("ExportMethod"))));
+/*
+	print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("ExportMethod")).'</div>';
+	print '<br>';
+*/
+	exit;
+}
+
+
+
 llxHeader();
 
 $html=new Form($db);
@@ -45,14 +58,6 @@ $html=new Form($db);
 print_fiche_titre($langs->trans("Backup"),'','setup');
 print '<br>';
 
-if ($file && ! $what) 
-{
-	print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("ee")).'</div>';
-	print '<br>';
-}
-
-
-
 /**
  * Increase time limit for script execution and initializes some variables
  */
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 5c192b58db6..7ada97f24c9 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -53,6 +53,7 @@ BackupFileSuccessfullyCreated=Backup file successfully generated
 YouCanDownloadBackupFile=Generated files can now be downlaoded
 NoBackupFileAvailable=No backup files available.
 ToBuildBackupFileClickHere=To build one backup file, click <a href="%s">here</a>.
+ExportMethod=Export method
 Yes=Yes
 No=No
 AutoDetectLang=Autodetect (browser language)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 6711432cc59..4ff0ee1a62f 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -51,7 +51,8 @@ WebServerMustHavePermissionForCommand=Votre serveur web doit avoir les droits po
 BackupResult=Résultat sauvegarde
 BackupFileSuccessfullyCreated=Fichier backup généré avec succès
 YouCanDownloadBackupFile=Les fichiers générés peuvent maintenant être téléchargés
-NoBackupFileAvailable=Aucune fichier backup disponible.
+NoBackupFileAvailable=Aucun fichier backup disponible.
+ExportMethod=Méthode d'export
 ToBuildBackupFileClickHere=Pour générer un fichier de sauvegarde, cliquez <a href="%s">ici</a>.
 Yes=Oui
 No=Non