account for changes introduced when merging lori/gsoc branch

2010-08-19 16:36:41 +02:00
parent b8cee3086b
commit e344696016
7 changed files with 246 additions and 196 deletions
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1072,6 +1072,13 @@ $cfg['Export'] = array();
 */
 $cfg['Export']['format'] = 'sql';

+/**
+ * quick/custom
+ *
+ * @global string $cfg['Export']['format']
+ */
+$cfg['Export']['method'] = 'quick';
+
 /**
 * none/zip/gzip/bzip2
 *
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -91,12 +91,19 @@ $cfg_db['Import']['ldi_terminated'] = 'short_string';
 $cfg_db['Import']['ldi_enclosed'] = 'short_string';
 $cfg_db['Import']['ldi_escaped'] = 'short_string';
 $cfg_db['Import']['ldi_local_option'] = array('auto', true, false);
+$cfg_db['Export']['_sod_select'] = array(
+    'structure' => __('structure'),
+    'data' => __('data'),
+    'structure_and_data' => __('structure and data'));
+$cfg_db['Export']['method'] = array(
+    'quick' => __('Quick - display only the minimal options to configure'),
+    'custom' => __('Custom - display all possible options to configure'),
+    /*'custom-no-form'*/);
 $cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
    'htmlword', 'latex', 'ods', 'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml',
    'yaml');
 $cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
 $cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
-$cfg_db['Export']['method'] = array('quick', 'custom', 'custom-no-form');
 $cfg_db['Export']['codegen_format'] = array('#', 'NHibernate C# DO', 'NHibernate XML');
 $cfg_db['Export']['csv_separator'] = 'short_string';
 $cfg_db['Export']['csv_terminated'] = 'short_string';
@@ -106,12 +113,21 @@ $cfg_db['Export']['csv_null'] = 'short_string';
 $cfg_db['Export']['excel_null'] = 'short_string';
 $cfg_db['Export']['excel_edition'] = array('win' => 'Windows',
    'mac_excel2003' => 'Excel 2003 / Macintosh', 'mac_excel2008' => 'Excel 2008 / Macintosh');
+$cfg_db['Export']['sql_structure_or_data'] = $cfg_db['Export']['_sod_select'];
 $cfg_db['Export']['sql_type'] = array('INSERT', 'UPDATE', 'REPLACE');
+$cfg_db['Export']['sql_insert_syntax'] = array(
+    'complete' => __('complete inserts'),
+    'extended' => __('extended inserts'),
+    'both' => __('both of the above'),
+    'none' => __('neither of the above'));
 $cfg_db['Export']['xls_null'] = 'short_string';
 $cfg_db['Export']['xlsx_null'] = 'short_string';
+$cfg_db['Export']['htmlword_structure_or_data'] = $cfg_db['Export']['_sod_select'];
 $cfg_db['Export']['htmlword_null'] = 'short_string';
 $cfg_db['Export']['ods_null'] = 'short_string';
 $cfg_db['Export']['odt_null'] = 'short_string';
+$cfg_db['Export']['odt_structure_or_data'] = $cfg_db['Export']['_sod_select'];
+$cfg_db['Export']['texytext_structure_or_data'] = $cfg_db['Export']['_sod_select'];
 $cfg_db['Export']['texytext_null'] = 'short_string';

 /**
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -85,46 +85,42 @@ $strConfigExport_file_template_server_name = __('Server name template');
 $strConfigExport_file_template_table_name = __('Table name template');
 $strConfigExport_format_name = __('Format');
 $strConfigExport_htmlword_columns_name = __('Put columns names in the first row');
-$strConfigExport_htmlword_data_name = __('Data');
 $strConfigExport_htmlword_null_name = __('Replace NULL by');
-$strConfigExport_htmlword_structure_name = __('Structure');
+$strConfigExport_htmlword_structure_or_data_name = __('Dump table');
 $strConfigExport_latex_caption_name = __('Include table caption');
 $strConfigExport_latex_columns_name = __('Put columns names in the first row');
 $strConfigExport_latex_comments_name = __('Comments');
 $strConfigExport_latex_data_caption_name = __('Table caption');
 $strConfigExport_latex_data_continued_caption_name = __('Continued table caption');
 $strConfigExport_latex_data_label_name = __('Label key');
-$strConfigExport_latex_data_name = __('Data');
 $strConfigExport_latex_mime_name = __('MIME type');
 $strConfigExport_latex_null_name  = __('Replace NULL by');
 $strConfigExport_latex_relation_name = __('Relations');
 $strConfigExport_latex_structure_caption_name = __('Table caption');
 $strConfigExport_latex_structure_continued_caption_name = __('Continued table caption');
 $strConfigExport_latex_structure_label_name = __('Label key');
-$strConfigExport_latex_structure_name = __('Structure');
+$strConfigExport_latex_structure_or_data_name = __('Dump table');
+$strConfigExport_method_name = __('Export method');
 $strConfigExport_ods_columns_name = __('Put columns names in the first row');
 $strConfigExport_ods_null_name = __('Replace NULL by');
 $strConfigExport_odt_columns_name = __('Put columns names in the first row');
 $strConfigExport_odt_comments_name = __('Comments');
-$strConfigExport_odt_data_name = __('Data');
 $strConfigExport_odt_mime_name = __('MIME type');
 $strConfigExport_odt_null_name = __('Replace NULL by');
 $strConfigExport_odt_relation_name = __('Relations');
-$strConfigExport_odt_structure_name = __('Structure');
+$strConfigExport_odt_structure_or_data_name = __('Dump table');
 $strConfigExport_onserver_name = __('Save on server');
 $strConfigExport_onserver_overwrite_name = __('Overwrite existing file(s)');
 $strConfigExport_remember_file_template_name = __('Remember file name template');
 $strConfigExport_sql_auto_increment_name = __('Add AUTO_INCREMENT value');
 $strConfigExport_sql_backquotes_name = __('Enclose table and column names with backquotes');
-$strConfigExport_sql_columns_name = __('Complete inserts');
 $strConfigExport_sql_compatibility_name = __('SQL compatibility mode');
-$strConfigExport_sql_data_name = __('Data');
+$strConfigExport_sql_create_table_statements_name = __('Syntax to use when inserting data');
 $strConfigExport_sql_dates_name = __('Creation/Update/Check dates');
 $strConfigExport_sql_delayed_name = __('Use delayed inserts');
 $strConfigExport_sql_disable_fk_name = __('Disable foreign key checks');
 $strConfigExport_sql_drop_database_name = sprintf(__('Add %s'), 'DROP DATABASE');
 $strConfigExport_sql_drop_table_name = sprintf(__('Add %s'), 'DROP TABLE / VIEW / PROCEDURE / FUNCTION / EVENT');
-$strConfigExport_sql_extended_name = __('Extended inserts');
 $strConfigExport_sql_hex_for_blob_name = __('Use hexadecimal for BLOB');
 $strConfigExport_sql_if_not_exists_name = sprintf(__('Add %s'), 'IF NOT EXISTS');
 $strConfigExport_sql_ignore_name = __('Use ignore inserts');
@@ -133,14 +129,13 @@ $strConfigExport_sql_max_query_size_name = __('Maximal length of created query')
 $strConfigExport_sql_mime_name = __('MIME type');
 $strConfigExport_sql_procedure_function_name = sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION / EVENT');
 $strConfigExport_sql_relation_name = __('Relations');
-$strConfigExport_sql_structure_name = __('Structure');
+$strConfigExport_sql_structure_or_data_name = __('Dump table');
 $strConfigExport_sql_type_name = __('Export type');
 $strConfigExport_sql_use_transaction_name = __('Enclose export in a transaction');
 $strConfigExport_sql_utc_time_name = __('Export time in UTC');
 $strConfigExport_texytext_columns_name = __('Put columns names in the first row');
-$strConfigExport_texytext_data_name = __('Data');
 $strConfigExport_texytext_null_name = __('Replace NULL by');
-$strConfigExport_texytext_structure_name = __('Structure');
+$strConfigExport_texytext_structure_or_data_name = __('Dump table');
 $strConfigExport_xls_columns_name = __('Put columns names in the first row');
 $strConfigExport_xls_null_name = __('Replace NULL by');
 $strConfigExport_xlsx_columns_name = __('Put columns names in the first row');
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -39,16 +39,19 @@ $forms['Servers']['Server'] = array('Servers' => array(1 => array(
 $forms['Servers']['Server_auth'] = array('Servers' => array(1 => array(
    'auth_type',
    ':group:' . __('Config authentication'),
-    'user',
-    'password',
+        'user',
+        'password',
+        ':group:end',
    ':group:' . __('Cookie authentication'),
-    'auth_swekey_config' => './swekey.conf',
+        'auth_swekey_config' => './swekey.conf',
+        ':group:end',
    ':group:' . __('HTTP authentication'),
-    'auth_http_realm',
+        'auth_http_realm',
+        ':group:end',
    ':group:' . __('Signon authentication'),
-    'SignonSession',
-    'SignonURL',
-    'LogoutURL')));
+        'SignonSession',
+        'SignonURL',
+        'LogoutURL')));
 $forms['Servers']['Server_config'] = array('Servers' => array(1 => array(
    'only_db',
    'hide_db',
@@ -85,8 +88,8 @@ $forms['Features']['Import_export'] = array(
    'UploadDir',
    'SaveDir',
    'RecodingEngine' => ':group',
-    'IconvExtraParams',
-    ':group:end',
+        'IconvExtraParams',
+        ':group:end',
    'ZipDump',
    'GZipDump',
    'BZipDump',
@@ -176,8 +179,8 @@ $forms['Left_frame']['Left_tables'] = array(
 $forms['Main_frame']['Startup'] = array(
    'MainPageIconic',
    'ShowCreateDb' => ':group',
-    'SuggestDBName',
-    ':group:end',
+        'SuggestDBName',
+        ':group:end',
    'ShowStats',
    'ShowServerInfo',
    'ShowPhpInfo',
@@ -225,31 +228,35 @@ $forms['Import']['Sql'] = array('Import' => array(
    'sql_no_auto_value_on_zero'));
 $forms['Import']['Csv'] = array('Import' => array(
    ':group:' . __('CSV'),
-    'csv_replace',
-    'csv_ignore',
-    'csv_terminated',
-    'csv_enclosed',
-    'csv_escaped',
-    'csv_col_names',
+        'csv_replace',
+        'csv_ignore',
+        'csv_terminated',
+        'csv_enclosed',
+        'csv_escaped',
+        'csv_col_names',
+        ':group:end',
    ':group:' . __('CSV using LOAD DATA'),
-    'ldi_replace',
-    'ldi_ignore',
-    'ldi_terminated',
-    'ldi_enclosed',
-    'ldi_escaped',
-    'ldi_local_option'));
+        'ldi_replace',
+        'ldi_ignore',
+        'ldi_terminated',
+        'ldi_enclosed',
+        'ldi_escaped',
+        'ldi_local_option',
+        ':group:end'));
 $forms['Import']['Microsoft_Office'] = array('Import' => array(
    ':group:' . __('Excel 97-2003 XLS Workbook'),
-    'xls_col_names',
+        'xls_col_names',
+        ':group:end',
    ':group:' . __('Excel 2007 XLSX Workbook'),
-    'xlsx_col_names'));
+        'xlsx_col_names'));
 $forms['Import']['Open_Document'] = array('Import' => array(
    ':group:' . __('Open Document Spreadsheet'),
-    'ods_col_names',
-    'ods_empty_rows',
-    'ods_recognize_percentages',
-    'ods_recognize_currency'));
+        'ods_col_names',
+        'ods_empty_rows',
+        'ods_recognize_percentages',
+        'ods_recognize_currency'));
 $forms['Export']['Export_defaults'] = array('Export' => array(
+    'method',
    'format',
    'compression',
    'charset',
@@ -262,89 +269,100 @@ $forms['Export']['Export_defaults'] = array('Export' => array(
    'file_template_database',
    'file_template_server'));
 $forms['Export']['Sql'] = array('Export' => array(
-    'sql_include_comments',
+    'sql_include_comments' => ':group',
+        'sql_dates',
+        'sql_relation',
+        'sql_mime',
+        ':group:end',
    'sql_use_transaction',
    'sql_disable_fk',
    'sql_compatibility',
    ':group:' . __('Database export options'),
-    'sql_drop_database',
-    'sql_structure' => ':group',
-    'sql_drop_table',
-    'sql_if_not_exists',
-    'sql_auto_increment',
-    'sql_backquotes',
-    'sql_procedure_function',
-    ':group:' . __('Add into comments'),
-    'sql_dates',
-    'sql_relation',
-    'sql_mime',
-    'sql_data' => ':group',
-    'sql_columns',
-    'sql_extended',
-    'sql_max_query_size',
-    'sql_delayed',
-    'sql_ignore',
-    'sql_hex_for_blob',
-    'sql_utc_time',
-    'sql_type'));
+        'sql_drop_database',
+        'sql_structure_or_data',
+        ':group:end',
+    ':group:' . __('Structure'),
+        'sql_drop_table',
+        'sql_procedure_function',
+        'sql_create_table_statements' => ':group',
+            'sql_if_not_exists',
+            'sql_auto_increment',
+            ':group:end',
+        'sql_backquotes',
+        ':group:end',
+    ':group:' . __('Data'),
+        'sql_delayed',
+        'sql_ignore',
+        'sql_type',
+        'sql_insert_syntax',
+        'sql_max_query_size',
+        'sql_hex_for_blob',
+        'sql_utc_time'));
 $forms['Export']['CodeGen'] = array('Export' => array(
    'codegen_format'));
 $forms['Export']['Csv'] = array('Export' => array(
    ':group:' . __('CSV'),
-    'csv_separator',
-    'csv_enclosed',
-    'csv_escaped',
-    'csv_terminated',
-    'csv_null',
-    'csv_removeCRLF',
-    'csv_columns',
+        'csv_separator',
+        'csv_enclosed',
+        'csv_escaped',
+        'csv_terminated',
+        'csv_null',
+        'csv_removeCRLF',
+        'csv_columns',
+        ':group:end',
    ':group:' . __('CSV for MS Excel'),
-    'excel_null',
-    'excel_removeCRLF',
-    'excel_columns',
-    'excel_edition'));
+        'excel_null',
+        'excel_removeCRLF',
+        'excel_columns',
+        'excel_edition'));
 $forms['Export']['Latex'] = array('Export' => array(
    'latex_caption',
-    'latex_structure' => ':group',
-    'latex_structure_caption',
-    'latex_structure_continued_caption',
-    'latex_structure_label',
-    'latex_relation',
-    'latex_comments',
-    'latex_mime',
-    'latex_data' => ':group',
-    'latex_columns',
-    'latex_data_caption',
-    'latex_data_continued_caption',
-    'latex_data_label',
-    'latex_null'));
+    'latex_structure_or_data',
+    ':group:' . __('Structure'),
+        'latex_structure_caption',
+        'latex_structure_continued_caption',
+        'latex_structure_label',
+        'latex_relation',
+        'latex_comments',
+        'latex_mime',
+        ':group:end',
+    ':group:' . __('Data'),
+        'latex_columns',
+        'latex_data_caption',
+        'latex_data_continued_caption',
+        'latex_data_label',
+        'latex_null'));
 $forms['Export']['Microsoft_Office'] = array('Export' => array(
    ':group:' . __('Excel 97-2003 XLS Workbook'),
-    'xls_null',
-    'xls_columns',
+        'xls_null',
+        'xls_columns',
+        ':group:end',
    ':group:' . __('Excel 2007 XLSX Workbook'),
-    'xlsx_null',
-    'xlsx_columns',
+        'xlsx_null',
+        'xlsx_columns',
+        ':group:end',
    ':group:' . __('Microsoft Word 2000'),
-    'htmlword_structure',
-    'htmlword_data',
-    'htmlword_null',
-    'htmlword_columns'));
+        'htmlword_structure_or_data',
+        'htmlword_null',
+        'htmlword_columns'));
 $forms['Export']['Open_Document'] = array('Export' => array(
    ':group:' . __('Open Document Spreadsheet'),
-    'ods_null',
-    'ods_columns',
+        'ods_columns',
+        'ods_null',
+        ':group:end',
    ':group:' . __('Open Document Text'),
-    'odt_structure' => ':group',
-    'odt_relation',
-    'odt_comments',
-    'odt_mime',
-    'odt_data' => ':group',
-    'odt_columns',
-    'odt_null'));
+        'odt_structure_or_data',
+        ':group:' . __('Structure'),
+            'odt_relation',
+            'odt_comments',
+            'odt_mime',
+            ':group:end',
+        ':group:' . __('Data'),
+            'odt_columns',
+            'odt_null'));
 $forms['Export']['Texy'] = array('Export' => array(
-    'texytext_structure',
-    'texytext_data' => ':group',
-    'texytext_null',
-    'texytext_columns'));
+    'texytext_structure_or_data',
+    ':group:' . __('Data'),
+        'texytext_null',
+        'texytext_columns'));
 ?>
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -90,8 +90,8 @@ $forms['Left_frame']['Left_tables'] = array(
 $forms['Main_frame']['Startup'] = array(
    'MainPageIconic',
    'ShowCreateDb' => ':group',
-    'SuggestDBName',
-    ':group:end',
+        'SuggestDBName',
+        ':group:end',
    'ShowStats',
    'ShowServerInfo');
 $forms['Main_frame']['Browse'] = array(
@@ -132,31 +132,34 @@ $forms['Import']['Sql'] = array(
    'Import/sql_no_auto_value_on_zero');
 $forms['Import']['Csv'] = array(
    ':group:' . __('CSV'),
-    'Import/csv_replace',
-    'Import/csv_ignore',
-    'Import/csv_terminated',
-    'Import/csv_enclosed',
-    'Import/csv_escaped',
-    'Import/csv_col_names',
+        'Import/csv_replace',
+        'Import/csv_ignore',
+        'Import/csv_terminated',
+        'Import/csv_enclosed',
+        'Import/csv_escaped',
+        'Import/csv_col_names',
+        ':group:end',
    ':group:' . __('CSV using LOAD DATA'),
-    'Import/ldi_replace',
-    'Import/ldi_ignore',
-    'Import/ldi_terminated',
-    'Import/ldi_enclosed',
-    'Import/ldi_escaped',
-    'Import/ldi_local_option');
+        'Import/ldi_replace',
+        'Import/ldi_ignore',
+        'Import/ldi_terminated',
+        'Import/ldi_enclosed',
+        'Import/ldi_escaped',
+        'Import/ldi_local_option');
 $forms['Import']['Microsoft_Office'] = array(
    ':group:' . __('Excel 97-2003 XLS Workbook'),
-    'Import/xls_col_names',
+        'Import/xls_col_names',
+        ':group:end',
    ':group:' . __('Excel 2007 XLSX Workbook'),
-    'Import/xlsx_col_names');
+        'Import/xlsx_col_names');
 $forms['Import']['Open_Document'] = array(
    ':group:' . __('Open Document Spreadsheet'),
-    'Import/ods_col_names',
-    'Import/ods_empty_rows',
-    'Import/ods_recognize_percentages',
-    'Import/ods_recognize_currency');
+        'Import/ods_col_names',
+        'Import/ods_empty_rows',
+        'Import/ods_recognize_percentages',
+        'Import/ods_recognize_currency');
 $forms['Export']['Export_defaults'] = array(
+    'Export/method',
    'Export/format',
    'Export/compression',
    'Export/charset',
@@ -166,89 +169,100 @@ $forms['Export']['Export_defaults'] = array(
    'Export/file_template_database',
    'Export/file_template_server');
 $forms['Export']['Sql'] = array(
-    'Export/sql_include_comments',
+    'Export/sql_include_comments' => ':group',
+        'Export/sql_dates',
+        'Export/sql_relation',
+        'Export/sql_mime',
+        ':group:end',
    'Export/sql_use_transaction',
    'Export/sql_disable_fk',
    'Export/sql_compatibility',
    ':group:' . __('Database export options'),
-    'Export/sql_drop_database',
-    'Export/sql_structure' => ':group',
-    'Export/sql_drop_table',
-    'Export/sql_if_not_exists',
-    'Export/sql_auto_increment',
-    'Export/sql_backquotes',
-    'Export/sql_procedure_function',
-    ':group:' . __('Add into comments'),
-    'Export/sql_dates',
-    'Export/sql_relation',
-    'Export/sql_mime',
-    'Export/sql_data' => ':group',
-    'Export/sql_columns',
-    'Export/sql_extended',
-    'Export/sql_max_query_size',
-    'Export/sql_delayed',
-    'Export/sql_ignore',
-    'Export/sql_hex_for_blob',
-    'Export/sql_utc_time',
-    'Export/sql_type');
+        'Export/sql_drop_database',
+        'Export/sql_structure_or_data',
+        ':group:end',
+    ':group:' . __('Structure'),
+        'Export/sql_drop_table',
+        'Export/sql_procedure_function',
+        'Export/sql_create_table_statements' => ':group',
+            'Export/sql_if_not_exists',
+            'Export/sql_auto_increment',
+            ':group:end',
+        'Export/sql_backquotes',
+        ':group:end',
+    ':group:' . __('Data'),
+        'Export/sql_delayed',
+        'Export/sql_ignore',
+        'Export/sql_type',
+        'Export/sql_insert_syntax',
+        'Export/sql_max_query_size',
+        'Export/sql_hex_for_blob',
+        'Export/sql_utc_time');
 $forms['Export']['CodeGen'] = array(
    'Export/codegen_format');
 $forms['Export']['Csv'] = array(
    ':group:' . __('CSV'),
-    'Export/csv_separator',
-    'Export/csv_enclosed',
-    'Export/csv_escaped',
-    'Export/csv_terminated',
-    'Export/csv_null',
-    'Export/csv_removeCRLF',
-    'Export/csv_columns',
+        'Export/csv_separator',
+        'Export/csv_enclosed',
+        'Export/csv_escaped',
+        'Export/csv_terminated',
+        'Export/csv_null',
+        'Export/csv_removeCRLF',
+        'Export/csv_columns',
+        ':group:end',
    ':group:' . __('CSV for MS Excel'),
-    'Export/excel_null',
-    'Export/excel_removeCRLF',
-    'Export/excel_columns',
-    'Export/excel_edition');
+        'Export/excel_null',
+        'Export/excel_removeCRLF',
+        'Export/excel_columns',
+        'Export/excel_edition');
 $forms['Export']['Latex'] = array(
    'Export/latex_caption',
-    'Export/latex_structure' => ':group',
-    'Export/latex_structure_caption',
-    'Export/latex_structure_continued_caption',
-    'Export/latex_structure_label',
-    'Export/latex_relation',
-    'Export/latex_comments',
-    'Export/latex_mime',
-    'Export/latex_data' => ':group',
-    'Export/latex_columns',
-    'Export/latex_data_caption',
-    'Export/latex_data_continued_caption',
-    'Export/latex_data_label',
-    'Export/latex_null');
+    'Export/latex_structure_or_data',
+    ':group:' . __('Structure'),
+        'Export/latex_structure_caption',
+        'Export/latex_structure_continued_caption',
+        'Export/latex_structure_label',
+        'Export/latex_relation',
+        'Export/latex_comments',
+        'Export/latex_mime',
+        ':group:end',
+    ':group:' . __('Data'),
+        'Export/latex_columns',
+        'Export/latex_data_caption',
+        'Export/latex_data_continued_caption',
+        'Export/latex_data_label',
+        'Export/latex_null');
 $forms['Export']['Microsoft_Office'] = array(
    ':group:' . __('Excel 97-2003 XLS Workbook'),
-    'Export/xls_null',
-    'Export/xls_columns',
+        'Export/xls_null',
+        'Export/xls_columns',
+        ':group:end',
    ':group:' . __('Excel 2007 XLSX Workbook'),
-    'Export/xlsx_null',
-    'Export/xlsx_columns',
+        'Export/xlsx_null',
+        'Export/xlsx_columns',
+        ':group:end',
    ':group:' . __('Microsoft Word 2000'),
-    'Export/htmlword_structure',
-    'Export/htmlword_data',
-    'Export/htmlword_null',
-    'Export/htmlword_columns');
+        'Export/htmlword_structure_or_data',
+        'Export/htmlword_null',
+        'Export/htmlword_columns');
 $forms['Export']['Open_Document'] = array(
    ':group:' . __('Open Document Spreadsheet'),
-    'Export/ods_null',
-    'Export/ods_columns',
+        'Export/ods_columns',
+        'Export/ods_null',
+        ':group:end',
    ':group:' . __('Open Document Text'),
-    'Export/odt_structure' => ':group',
-    'Export/odt_relation',
-    'Export/odt_comments',
-    'Export/odt_mime',
-    'Export/odt_data' => ':group',
-    'Export/odt_columns',
-    'Export/odt_null');
+        'Export/odt_structure_or_data',
+        ':group:' . __('Structure'),
+            'Export/odt_relation',
+            'Export/odt_comments',
+            'Export/odt_mime',
+            ':group:end',
+        ':group:' . __('Data'),
+            'Export/odt_columns',
+            'Export/odt_null');
 $forms['Export']['Texy'] = array(
-    'Export/texytext_structure',
-    'Export/texytext_data' => ':group',
-    'Export/texytext_null',
-    'Export/texytext_columns');
+    'Export/texytext_structure_or_data',
+    ':group:' . __('Data'),
+        'Export/texytext_null',
+        'Export/texytext_columns');
 ?>
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -69,7 +69,7 @@ if(isset($_GET['export_method'])) {
    $cfg['Export']['method'] = 'quick';
 }
 // The export method (quick, custom or custom-no-form)
-echo '<input type="hidden" name="export_method" value="' . $cfg['Export']['method'] . '" />';
+echo '<input type="hidden" name="export_method" value="' . htmlspecialchars($cfg['Export']['method']) . '" />';


 if(isset($_GET['sql_query'])) {
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -109,7 +109,7 @@ if (isset($plugin_list)) {
            /* begin CREATE TABLE statements*/
            $plugin_list['sql']['options'][] =
                array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'bool', 'name' => 'create_table_statements', 'text' => __('<code>CREATE TABLE</code> options:')));
-                $plugin_list['sql']['options'][] =
+            $plugin_list['sql']['options'][] =
                array('type' => 'bool', 'name' => 'if_not_exists', 'text' => '<code>IF NOT EXISTS</code>');
            $plugin_list['sql']['options'][] =
                array('type' => 'bool', 'name' => 'auto_increment', 'text' => '<code>AUTO_INCREMENT</code>');