no longer useful since all lang files are UTF-8

export.php

@@ -206,8 +206,7 @@ if ($what == 'sql') {
 $output_kanji_conversion = function_exists('PMA_kanji_str_conv') && $type != 'xls';
 
 // Do we need to convert charset?
-$output_charset_conversion = $asfile &&
+$output_charset_conversion = $asfile && $cfg['AllowAnywhereRecoding']
-    $cfg['AllowAnywhereRecoding'] && $allow_recoding
     && isset($charset_of_file) && $charset_of_file != $charset
     && $type != 'xls';
 
@@ -262,7 +261,7 @@ if ($asfile) {
     }
 
     // convert filename to iso-8859-1, it is safer
-    if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)) {
+    if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] )) {
         $filename = PMA_convert_string($charset, 'iso-8859-1', $filename);
     } else {
         $filename = PMA_convert_string($convcharset, 'iso-8859-1', $filename);

import.php

@@ -316,8 +316,7 @@ if ($import_file != 'none' && !$error) {
 }
 
 // Convert the file's charset if necessary
-if ($cfg['AllowAnywhereRecoding'] && $allow_recoding
+if ($cfg['AllowAnywhereRecoding'] && isset($charset_of_file)) {
-    && isset($charset_of_file)) {
     if ($charset_of_file != $charset) {
         $charset_conversion = TRUE;
     }

lang/afrikaans-utf-8.inc.php

@@ -9,7 +9,6 @@ Laat weet my asb. as jy aan beter taalgebruik kan dink.
 */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/albanian-utf-8.inc.php

@@ -6,7 +6,6 @@
 */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/arabic-utf-8.inc.php

@@ -8,7 +8,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'rtl'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/azerbaijani-utf-8.inc.php

@@ -5,7 +5,6 @@
 // Şehriyar İmanov 30 Avqust 2003... Shehi
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/bangla-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/basque-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/belarusian_cyrillic-utf-8.inc.php

@@ -8,8 +8,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/belarusian_latin-utf-8.inc.php

@@ -8,8 +8,6 @@
 */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/bosnian-utf-8.inc.php

@@ -8,7 +8,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/brazilian_portuguese-utf-8.inc.php

@@ -3,7 +3,6 @@
 /* translated by: Airon Luis Pereira <airon(dot)pereira(at)gmail(dot)com> */ 
 
 $charset = 'utf-8'; 
-$allow_recoding = TRUE;
 $text_dir = 'ltr';  // ('ltr' da esquerda para direita, 'rtl' da direita para esquerda)
 $number_thousands_separator = ','; 
 $number_decimal_separator = '.'; 

lang/bulgarian-utf-8.inc.php

@@ -7,7 +7,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/catalan-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' d'esquerra a dreta, 'rtl' de dreta a esquerra)
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/chinese_simplified-utf-8.inc.php

@@ -7,7 +7,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/chinese_traditional-utf-8.inc.php

@@ -7,7 +7,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/croatian-utf-8.inc.php

@@ -7,7 +7,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/czech-utf-8.inc.php

@@ -7,7 +7,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ' ';
 $number_decimal_separator = '.';

lang/danish-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */ /* danish - Dansk v 2.20 (based on english rev. 10226) 2007/04/03 01:23:45 - oversætter AlleyKat kan kontaktes på < phpmyadmin (at) phpbb2.dk > */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/dutch-utf-8.inc.php

@@ -6,7 +6,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/english-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/estonian-utf-8.inc.php

@@ -9,7 +9,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/finnish-utf-8.inc.php

@@ -7,7 +7,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ' ';
 $number_decimal_separator = ',';

lang/french-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ' ';
 $number_decimal_separator = ',';

lang/galician-utf-8.inc.php

@@ -6,7 +6,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/georgian-utf-8.inc.php

@@ -10,7 +10,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ' ';
 $number_decimal_separator = ',';

lang/german-utf-8.inc.php

@@ -12,7 +12,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/greek-utf-8.inc.php

@@ -4,7 +4,6 @@
 /* Translated by Kyriakos Xagoraris <theremon at users.sourceforge.net> */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/hebrew-utf-8.inc.php

@@ -3,7 +3,6 @@
  * Translated by Hadar Porat <hadar at banner.co.il> */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'rtl'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/hindi-utf-8.inc.php

@@ -9,7 +9,6 @@
 // 5th updates   :   by Girish Nair <girishn2003_@_yahoo_._co_._in(latest), www.girishn.com> : 25-Nov-2003
 
 $charset = 'utf-8';
-$allow_recoding = FALSE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/hungarian-utf-8.inc.php

@@ -5,7 +5,6 @@
 // József Tamás Herczeg <localicer @NOSPAM@ gmail.com>
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr': balról jobbra, 'rtl': jobbról balra)
 $number_thousands_separator = ' ';
 $number_decimal_separator = '.';

lang/indonesian-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/italian-utf-8.inc.php

@@ -8,7 +8,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/korean-utf-8.inc.php

@@ -4,7 +4,6 @@
 /* Translated by WooSuhan <kjh@unews.NOSPAM.co.kr> */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/latvian-utf-8.inc.php

@@ -6,7 +6,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ' ';
 $number_decimal_separator = '.';

lang/lithuanian-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ' ';
 $number_decimal_separator = ',';

lang/macedonian_cyrillic-utf-8.inc.php

@@ -7,7 +7,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/malay-utf-8.inc.php

@@ -22,7 +22,6 @@ redkod - r3dkod@yahoo.com
 */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/mongolian-utf-8.inc.php

@@ -6,7 +6,6 @@
 */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/norwegian-utf-8.inc.php

@@ -6,7 +6,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/persian-utf-8.inc.php

@@ -7,7 +7,6 @@ www.BornisGroup.com
 info@BornisGroup.com
 */
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'rtl'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/polish-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ' ';
 $number_decimal_separator = ',';

lang/portuguese-utf-8.inc.php

@@ -8,7 +8,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/romanian-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/russian-utf-8.inc.php

@@ -9,7 +9,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/serbian_cyrillic-utf-8.inc.php

@@ -8,7 +8,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/serbian_latin-utf-8.inc.php

@@ -8,7 +8,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/sinhala-utf-8.inc.php

@@ -4,7 +4,6 @@
 // by malindahs
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/slovak-utf-8.inc.php

@@ -6,7 +6,6 @@
    and Tomas Tatransky <tomas.tatransky@centrum.sk> */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ' ';
 $number_decimal_separator = ',';

lang/slovenian-utf-8.inc.php

@@ -4,7 +4,6 @@
 /* By: urska.colner, agenda d.o.o. <urska.colner@agenda.si>, uros kositer, agenda d.o.o. <urosh@agenda.si> */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = '.';
 $number_decimal_separator = ',';

lang/spanish-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/swedish-utf-8.inc.php

@@ -6,7 +6,6 @@
  */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ' ';
 $number_decimal_separator = ',';

lang/tatarish-utf-8.inc.php

@@ -2,8 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/thai-utf-8.inc.php

@@ -5,7 +5,6 @@
 // last modified 2004/08/22 Arthit Suriyawongkul
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/turkish-utf-8.inc.php

@@ -8,7 +8,6 @@
 // Çeviri sürümü phpMyAdmin 2.10.1.0
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

lang/ukrainian-utf-8.inc.php

@@ -2,7 +2,6 @@
 /* $Id$ */
 
 $charset = 'utf-8';
-$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $number_thousands_separator = ',';
 $number_decimal_separator = '.';

libraries/charset_conversion.lib.php

@@ -13,8 +13,7 @@ if (! defined('PHPMYADMIN')) {
  * Loads the recode or iconv extensions if any of it is not loaded yet
  */
 if (isset($cfg['AllowAnywhereRecoding'])
-    && $cfg['AllowAnywhereRecoding']
+    && $cfg['AllowAnywhereRecoding']) {
-    && $allow_recoding) {
 
     if ($cfg['RecodingEngine'] == 'recode') {
         if (!@extension_loaded('recode')) {
@@ -52,8 +51,7 @@ if (!isset($cfg['IconvExtraParams'])) {
 
 // Finally detect which function we will use:
 if (isset($cfg['AllowAnywhereRecoding'])
-    && $cfg['AllowAnywhereRecoding']
+    && $cfg['AllowAnywhereRecoding']) {
-    && $allow_recoding) {
 
     if (!isset($PMA_recoding_engine)) {
         $PMA_recoding_engine = $cfg['RecodingEngine'];
@@ -134,9 +132,9 @@ if ($PMA_recoding_engine == PMA_CHARSET_ICONV_AIX) {
  * @author  nijel
  */
 function PMA_convert_charset($what) {
-    global $cfg, $allow_recoding, $charset, $convcharset;
+    global $cfg, $charset, $convcharset;
 
-    if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] && $allow_recoding)
+    if (!(isset($cfg['AllowAnywhereRecoding']) && $cfg['AllowAnywhereRecoding'] )
         || $convcharset == $charset) { // rabus: if input and output charset are the same, we don't have to do anything...
         return $what;
     } else {

libraries/display_export.lib.php

@@ -203,7 +203,7 @@ echo PMA_pluginGetJavascript($export_list);
     <div class="formelementrow">
     <?php
     // charset of file
-    if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
+    if ($cfg['AllowAnywhereRecoding']) {
         echo '        <label for="select_charset_of_file">'
             . $strCharsetOfFile . '</label>' . "\n";
 

libraries/display_import.lib.php

@@ -82,7 +82,7 @@ if (!empty($cfg['UploadDir'])) {
 
 // charset of file
 echo '<div class="formelementrow">' . "\n";
-if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
+if ($cfg['AllowAnywhereRecoding']) {
     echo '<label for="charset_of_file">' . $strCharsetOfFile . '</label>';
     reset($cfg['AvailableCharsets']);
     echo '<select id="charset_of_file" name="charset_of_file" size="1">';

libraries/select_lang.lib.php

@@ -348,10 +348,6 @@ $GLOBALS['mysql_charset_map'] = array(
  * Do the work!
  */
 
-/**
- * @global boolean whether charset recoding should be allowed or not
- */
-$GLOBALS['allow_recoding'] = false;
 if (empty($GLOBALS['convcharset'])) {
     if (isset($_COOKIE['pma_charset'])) {
         $GLOBALS['convcharset'] = $_COOKIE['pma_charset'];

libraries/sql_query_form.lib.php

@@ -483,7 +483,6 @@ function PMA_sqlQueryFormBookmark()
  * @uses    $GLOBALS['strLocationTextfile']
  * @uses    $GLOBALS['strWebServerUploadDirectory']
  * @uses    $GLOBALS['strWebServerUploadDirectoryError']
- * @uses    $GLOBALS['allow_recoding']
  * @uses    $GLOBALS['charset']
  * @uses    $GLOBALS['max_upload_size']
  * @uses    PMA_supportedDecompressions()