diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 44abd8ca8346c452aef7bd57b34a68bc92bd44d6..b5f4a5fde29d7c74df4158e68b703f7e618bd1d5 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 e6abff9b3eff722ed4b69ac41138833492368905..7440f9a8271676bdeecc9584645a404634f33905 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -38,21 +38,26 @@ if (! $user->admin) accessforbidden(); -llxHeader(); - -$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 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); + +print_fiche_titre($langs->trans("Backup"),'','setup'); +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 5c192b58db60526506e5e6ee8618bf785b2d4ba1..7ada97f24c997e53e9fe9b6630f5eb002f85111a 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 6711432cc59c8c175f816266d17339f03f03d048..4ff0ee1a62f8d3b432d6e4c84648657612fb868c 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