diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index 34d0d5ceb44e446fb618a21f398a6f7cb2a79360..44abd8ca8346c452aef7bd57b34a68bc92bd44d6 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -32,6 +32,9 @@ $langs->load("admin"); if (! $user->admin) accessforbidden(); + +$html=new Form($db); + llxHeader(); @@ -42,6 +45,10 @@ print '<br>'; print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b><br>'; print '<br>'; +$result=$html->show_documents('systemtools','',DOL_DATA_ROOT.'/admin/temp',$_SERVER['PHP_SELF'],0,1); +if ($result) print '<br><br>'; + + ?> @@ -86,7 +93,7 @@ function show_checked_option() { </script> <fieldset id="fieldsetexport"> -<legend>Sch�ma et/ou contenu des bases de donn�es +<legend><?php echo $langs->trans("NewBackup"); ?> </legend> @@ -533,7 +540,7 @@ if (function_exists('bz_open')) <center> - <input type="submit" class="button" value="Ex�cuter" id="buttonGo" /><br><br> + <input type="submit" class="button" value="<?php echo $langs->trans("NewBackup") ?>" id="buttonGo" /><br><br> </center> diff --git a/htdocs/document.php b/htdocs/document.php index f87c2422b0fdc4b511e13875dcc12b189376a36e..f446494dad3448f27b7fcfed599574acbd759b98 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -40,8 +40,9 @@ $action = $_GET["action"]; $original_file = urldecode($_GET["file"]); $modulepart = urldecode($_GET["modulepart"]); $urlsource = urldecode($_GET["urlsource"]); -// D�fini type et attachment +// D�fini type (attachment=1 pour forcer popup 'enregistrer sous') $type = urldecode($_GET["type"]); $attachment = true; +if (eregi('\.sql',$original_file)) { $type='text/plain'; $attachment = true; } if (eregi('\.html',$original_file)) { $type='text/html'; $attachment = false; } if (eregi('\.csv',$original_file)) { $type='text/csv'; $attachment = true; } if (eregi('\.pdf',$original_file)) { $type='application/pdf'; $attachment = true; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 857e3b10e91fc2d70172533d7493e230c97e6ea4..3ad754e1f628cbbb6c47c485680d4b9fe1dcb7c2 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -43,6 +43,7 @@ System=System SystemInfo=System informations SystemTools=System tools SystemToolsArea=System tools area +NewBackup=New backup Backup=Backup Restore=Restore RunCommandSummary=Backup will be done through the following command diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index d044adcb901a9c475973a6eba0c11418c805ce9c..908c2aa23c735a7ff1ce8e0f004705c86815b9ee 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -43,6 +43,7 @@ System=Syst SystemInfo=Infos Syst�me SystemTools=Outils Syst�me SystemToolsArea=Espace outils syst�mes +NewBackup=Nouvelle sauvegarde Backup=Sauvegarde Restore=Restauration RunCommandSummary=La sauvegarde sera ex�cut�e par la commande suivante