From 7a65ee7cb30baab8d034444e14d17852840a591a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 6 Sep 2010 10:08:36 +0000
Subject: [PATCH] Qual: Code is now simpler using jQuery. Removed rubbish
 javascript.

---
 htdocs/admin/tools/dolibarr_export.php | 12 ++++++------
 htdocs/admin/tools/dolibarr_import.php |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 19d57bc25eb..4345fb9d17f 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -263,8 +263,8 @@ if ($_GET["msg"])
 
 
 
-<fieldset><label for="filename_template"> <?php echo $langs->trans("FileNameToGenerate"); ?></label>
-: <input type="text" name="filename_template" size="60"
+<fieldset><label for="filename_template"> <?php echo $langs->trans("FileNameToGenerate"); ?></label>:
+ <input type="text" name="filename_template" size="60"
 	id="filename_template"
 	value="<?php
 $prefix='dump';
@@ -281,7 +281,7 @@ echo $file;
 $compression=array(
 	'none' => array('function' => '',         'id' => 'radio_compression_none', 'label' => $langs->trans("None")),
 //	'zip'  => array('function' => 'zip_open', 'id' => 'radio_compression_zip',  'label' => $langs->trans("Zip")),		Not open source
-	'gz'   => array('function' => 'gzopen',  'id' => 'radio_compression_gzip', 'label' => $langs->trans("Gzip")),
+	'gz'   => array('function' => 'gzopen',   'id' => 'radio_compression_gzip', 'label' => $langs->trans("Gzip")),
 );
 if ($db->label == 'MySQL')
 {
@@ -297,12 +297,12 @@ print $langs->trans("Compression").': &nbsp; ';
 
 foreach($compression as $key => $val)
 {
-	if (! $val['function'] || function_exists($val['function']))
+	if (! $val['function'] || function_exists($val['function']))	// Enabled export format
 	{
-		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'">';
+		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" checked="true">';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
 	}
-	else
+	else	// Disabled export format
 	{
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled="true">';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index d053e6fba2c..b6e837d8fc0 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -66,6 +66,7 @@ print $langs->trans("RestoreDesc3",DOL_DATA_ROOT).'<br><br>';
 <?php print '<legend>'.$langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b></legend>'; ?>
 <table><tr><td valign="top">
 
+<?php if ($conf->use_javascript_ajax) { ?>
 <div id="div_container_exportoptions">
 <fieldset id="exportoptions">
 	<legend><?php echo $langs->trans("ImportMethod"); ?></legend>
@@ -77,7 +78,7 @@ print $langs->trans("RestoreDesc3",DOL_DATA_ROOT).'<br><br>';
     </div>
 </fieldset>
 </div>
-
+<?php } ?>
 
 </td><td valign="top">