Remove dead code and strings relating to xls/xlsx import and export.

This code was removed in 3.4.5.0 but some strings and tests remained.

Fixes #12742

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>

ChangeLog

@@ -41,6 +41,7 @@ phpMyAdmin - ChangeLog
 - issue #12799 Allow to configure signon session parameters
 - issue #12854 Drop database is broken
 - issue #12863 Can't toggle Event Scheduler on
+- issue #12742 Finish removing dead code references to xls/xlsx import and export, which was removed some time ago.
 
 4.6.6 (not yet released)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

export.php

@@ -186,9 +186,6 @@ $export_plugin = PMA_getPlugin(
     )
 );
 
-// Backward compatibility
-$type = $what;
-
 // Check export type
 if (empty($export_plugin)) {
     PMA_fatalError(__('Bad type!'));
@@ -318,13 +315,12 @@ if ($what == 'sql') {
     $crlf = PMA\libraries\Util::whichCrlf();
 }
 
-$output_kanji_conversion = Encoding::canConvertKanji() && $type != 'xls';
+$output_kanji_conversion = Encoding::canConvertKanji();
 
 // Do we need to convert charset?
 $output_charset_conversion = $asfile
     && Encoding::isSupported()
-    && isset($charset) && $charset != 'utf-8'
-    && $type != 'xls';
+    && isset($charset) && $charset != 'utf-8';
 
 // Use on the fly compression?
 $GLOBALS['onfly_compression'] = $GLOBALS['cfg']['CompressOnFly']

libraries/config.default.php

@@ -1400,7 +1400,7 @@ $cfg['RowActionType'] = 'both';
 $cfg['Export'] = array();
 
 /**
- * codegen/csv/excel/htmlexcel/htmlword/latex/ods/odt/pdf/sql/texytext/xls/xml/yaml
+ * codegen/csv/excel/htmlexcel/htmlword/latex/ods/odt/pdf/sql/texytext/xml/yaml
  *
  * @global string $cfg['Export']['format']
  */
@@ -1616,48 +1616,6 @@ $cfg['Export']['texytext_columns'] = false;
  */
 $cfg['Export']['texytext_null'] = 'NULL';
 
-/**
- *
- *
- * @global boolean $cfg['Export']['xls_columns']
- */
-$cfg['Export']['xls_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['xls_structure_or_data']
- */
-$cfg['Export']['xls_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['xls_null']
- */
-$cfg['Export']['xls_null'] = 'NULL';
-
-/**
- *
- *
- * @global boolean $cfg['Export']['xlsx_columns']
- */
-$cfg['Export']['xlsx_columns'] = false;
-
-/**
- *
- *
- * @global string $cfg['Export']['xlsx_structure_or_data']
- */
-$cfg['Export']['xlsx_structure_or_data'] = 'data';
-
-/**
- *
- *
- * @global string $cfg['Export']['xlsx_null']
- */
-$cfg['Export']['xlsx_null'] = 'NULL';
-
 /**
  *
  *
@@ -2373,27 +2331,6 @@ $cfg['Import']['ods_recognize_percentages'] = true;
  */
 $cfg['Import']['ods_recognize_currency'] = true;
 
-/**
- *
- *
- * @global string $cfg['Import']['xml_col_names']
- */
-$cfg['Import']['xls_col_names'] = false;
-
-/**
- *
- *
- * @global string $cfg['Import']['xml_empty_rows']
- */
-$cfg['Import']['xls_empty_rows'] = true;
-
-/**
- *
- *
- * @global string $cfg['Import']['xlsx_col_names']
- */
-$cfg['Import']['xlsx_col_names'] = false;
-
 /*******************************************************************************
  * Schema export defaults
 */

libraries/config.values.php

@@ -174,7 +174,7 @@ $cfg_db['Export']['method'] = array(
 );
 $cfg_db['Export']['format'] = array(
     'codegen', 'csv', 'excel', 'htmlexcel','htmlword', 'latex', 'ods',
-    'odt', 'pdf', 'sql', 'texytext', 'xls', 'xml', 'yaml'
+    'odt', 'pdf', 'sql', 'texytext', 'xml', 'yaml'
 );
 $cfg_db['Export']['compression'] = array('none', 'zip', 'gzip');
 $cfg_db['Export']['charset'] = array_merge(
@@ -203,8 +203,6 @@ $cfg_db['Export']['sql_insert_syntax'] = array(
     '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';

libraries/config/messages.inc.php

@@ -226,10 +226,6 @@ $strConfigExport_sql_utc_time_name = __('Export time in UTC');
 $strConfigExport_texytext_columns_name = __('Put columns names in the first row');
 $strConfigExport_texytext_null_name = __('Replace NULL with');
 $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 with');
-$strConfigExport_xlsx_columns_name = __('Put columns names in the first row');
-$strConfigExport_xlsx_null_name = __('Replace NULL with');
 $strConfigForeignKeyDropdownOrder_desc = __(
     'Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is '
     . 'the referenced data, [kbd]id[/kbd] is the key value.'
@@ -402,8 +398,6 @@ $strConfigImport_sql_compatibility_name = __('SQL compatibility mode');
 $strConfigImport_sql_no_auto_value_on_zero_name
     = __('Do not use AUTO_INCREMENT for zero values');
 $strConfigImport_sql_read_as_multibytes_name = __('Read as multibytes');
-$strConfigImport_xls_col_names_name = __('Column names in first row');
-$strConfigImport_xlsx_col_names_name = __('Column names in first row');
 $strConfigInitialSlidersState_name = __('Initial state for sliders');
 $strConfigInsertRows_desc = __('How many rows can be inserted at one time.');
 $strConfigInsertRows_name = __('Number of inserted rows');