removing default_charset tests. code can be reused in main function and

ldap needs option that forces decoding when default charset matches

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@8377 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/decode/cp1250.php b/functions/decode/cp1250.php
index e2156c635bebf09f645f6f9b1a4c8324ceb314ce..19dd1b9cffdb60f09ad46627f4feaeb8bd3e6355 100644 (file)
--- a/functions/decode/cp1250.php
+++ b/functions/decode/cp1250.php
@@ -29,11 +29,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_cp1250 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1250')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'windows-1250'))
         return $string;

diff --git a/functions/decode/cp1251.php b/functions/decode/cp1251.php
index 3a0c3ac4aea5a305dac62bf0f3a9c9599ef4d605..c27f2fb59cee419fdab4879b6be726bdcdfb44ac 100644 (file)
--- a/functions/decode/cp1251.php
+++ b/functions/decode/cp1251.php
@@ -29,11 +29,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_cp1251 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1251')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'windows-1251'))
         return $string;

diff --git a/functions/decode/cp1252.php b/functions/decode/cp1252.php
index 382381fb1001c6cde62c1a165d3f71ce401e3da7..ccdd174a7c8e32b669101945db5230a8016428d1 100644 (file)
--- a/functions/decode/cp1252.php
+++ b/functions/decode/cp1252.php
@@ -30,11 +30,6 @@
  */
 
 function charset_decode_cp1252 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1252')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'windows-1252'))
         return $string;

diff --git a/functions/decode/cp1253.php b/functions/decode/cp1253.php
index bc852daae81a0afd17c949cd31ec3311b31fd4db..fa7978706463c6da30d5d97fed822c2e4c32cd64 100644 (file)
--- a/functions/decode/cp1253.php
+++ b/functions/decode/cp1253.php
@@ -29,11 +29,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_cp1253 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1253')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'windows-1253'))
         return $string;

diff --git a/functions/decode/cp1254.php b/functions/decode/cp1254.php
index 7cfe140fc086107aefd03c6ab788a43cee450f42..57eb6170b9152a3743795362cc055c20d69d8baa 100644 (file)
--- a/functions/decode/cp1254.php
+++ b/functions/decode/cp1254.php
@@ -29,11 +29,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_cp1254 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1254')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'windows-1254'))
         return $string;

diff --git a/functions/decode/cp1255.php b/functions/decode/cp1255.php
index f6c1c05f004a77af1e205cdecef2cd5fab4b854b..47c8e25fcf247ed0a6ff42409eb87ee9ca2ea62d 100644 (file)
--- a/functions/decode/cp1255.php
+++ b/functions/decode/cp1255.php
@@ -29,11 +29,6 @@
  * @return string $string decoded string
  */
 function charset_decode_cp1255 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1255')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'windows-1255'))
         return $string;

diff --git a/functions/decode/cp1256.php b/functions/decode/cp1256.php
index 3608263a07b19a826fb7ba22d70c91db9f120a06..91d5c4b755232a09daffd629623cd407d3b0d4b2 100644 (file)
--- a/functions/decode/cp1256.php
+++ b/functions/decode/cp1256.php
@@ -29,11 +29,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_cp1256 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1256')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'windows-1256'))
         return $string;

diff --git a/functions/decode/cp1257.php b/functions/decode/cp1257.php
index 12fc82f6f7bf1df7a1c2e805d594411044862de9..57c7f38a9ea7004e07017695270dd49ccdc0fa91 100644 (file)
--- a/functions/decode/cp1257.php
+++ b/functions/decode/cp1257.php
@@ -29,11 +29,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_cp1257 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1257')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'windows-1257'))
         return $string;

diff --git a/functions/decode/cp1258.php b/functions/decode/cp1258.php
index c9b42bd3385d703fa1eef1fe200fc9b2fa9d45cc..93c60b076ed1e1a7997fd613f013b72f4fe60a72 100644 (file)
--- a/functions/decode/cp1258.php
+++ b/functions/decode/cp1258.php
@@ -29,11 +29,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_cp1258 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'windows-1258')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'windows-1258'))
         return $string;

diff --git a/functions/decode/cp855.php b/functions/decode/cp855.php
index bfcd2b2ba12ace645777a4fc0d3d4ddb0009139f..e5f270c548cac17c9823a16f89c33294ac367c22 100644 (file)
--- a/functions/decode/cp855.php
+++ b/functions/decode/cp855.php
@@ -29,11 +29,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_cp855 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'ibm855')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'ibm855'))
         return $string;

diff --git a/functions/decode/cp866.php b/functions/decode/cp866.php
index 4493333e7650eb3f70252018eef7b0e84e62533a..549bc5e1a73aeb619c5e510af6988550db6bafa5 100644 (file)
--- a/functions/decode/cp866.php
+++ b/functions/decode/cp866.php
@@ -31,11 +31,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_cp866 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'ibm866')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'ibm866'))
         return $string;

diff --git a/functions/decode/iso_8859_1.php b/functions/decode/iso_8859_1.php
index 676122cca9cae07df77d857dec899af93472f0a1..08faf1c582d9b5afe0a91a8989a01b18a349cfaa 100644 (file)
--- a/functions/decode/iso_8859_1.php
+++ b/functions/decode/iso_8859_1.php
@@ -19,11 +19,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_1 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-1')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-1'))
         return $string;

diff --git a/functions/decode/iso_8859_10.php b/functions/decode/iso_8859_10.php
index e032d25dd8ab8fc53ce23211f068a220653a8b5c..d2a5b36c42e73b32c0b79e608bd3e9c5a5caf19c 100644 (file)
--- a/functions/decode/iso_8859_10.php
+++ b/functions/decode/iso_8859_10.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_10 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-10')
-        return $string;
-
      // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-10'))
         return $string;

diff --git a/functions/decode/iso_8859_11.php b/functions/decode/iso_8859_11.php
index 3fb9e881c3f85dfc35e567602ae75486b48d9568..ba2e887497d129cdc27d7f6790cd09d2f37b3654 100644 (file)
--- a/functions/decode/iso_8859_11.php
+++ b/functions/decode/iso_8859_11.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_11 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-11')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-11'))
         return $string;

diff --git a/functions/decode/iso_8859_13.php b/functions/decode/iso_8859_13.php
index 02459a7c959a8179dd026a880336dbcad2c551b8..4fbb916962bc6209238c427d0a40afa4a1d7e8c0 100644 (file)
--- a/functions/decode/iso_8859_13.php
+++ b/functions/decode/iso_8859_13.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_13 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-13')
-        return $string;
-
      // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-13'))
         return $string;

diff --git a/functions/decode/iso_8859_14.php b/functions/decode/iso_8859_14.php
index 4306387da2bd67ddd2fb91663b23258fa1d76b18..b9275afdfd3f27fb978f711d1fa308c77fad79bb 100644 (file)
--- a/functions/decode/iso_8859_14.php
+++ b/functions/decode/iso_8859_14.php
@@ -47,11 +47,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_14 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-14')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-14'))
         return $string;

diff --git a/functions/decode/iso_8859_15.php b/functions/decode/iso_8859_15.php
index 7b2f33577a33836cf53252013e07f009cb2ccbea..a7d8b538e92d5ee4ec305c63e512952d0230f10b 100644 (file)
--- a/functions/decode/iso_8859_15.php
+++ b/functions/decode/iso_8859_15.php
@@ -47,11 +47,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_15 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-15')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-15'))
         return $string;

diff --git a/functions/decode/iso_8859_16.php b/functions/decode/iso_8859_16.php
index 5703c31e5b03edc18bbe80043a24e19bf84380a2..6185a0f8da51cd7ad12669b205ab12d148c4fced 100644 (file)
--- a/functions/decode/iso_8859_16.php
+++ b/functions/decode/iso_8859_16.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_16 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-16')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-16'))
         return $string;

diff --git a/functions/decode/iso_8859_2.php b/functions/decode/iso_8859_2.php
index 1ef1515b6f5b33db12f1a78d0a8a1db088027f4b..7450569d98ca18eef2d7a7e4c89f47fe41bda7f6 100644 (file)
--- a/functions/decode/iso_8859_2.php
+++ b/functions/decode/iso_8859_2.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_2 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-2')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-2'))
         return $string;

diff --git a/functions/decode/iso_8859_3.php b/functions/decode/iso_8859_3.php
index b28cee66d6834853486e1be7d9565a8cf58eda24..669e4ef1c12562ecd434574fd7137ff81d7b4884 100644 (file)
--- a/functions/decode/iso_8859_3.php
+++ b/functions/decode/iso_8859_3.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_3 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-3')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-3'))
         return $string;

diff --git a/functions/decode/iso_8859_4.php b/functions/decode/iso_8859_4.php
index cdd14441a85fdf2a334a5884a8382943072560d9..ba94983919438537c05d9bbf09261fa41222d25d 100644 (file)
--- a/functions/decode/iso_8859_4.php
+++ b/functions/decode/iso_8859_4.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_4 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-4')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-4'))
         return $string;

diff --git a/functions/decode/iso_8859_5.php b/functions/decode/iso_8859_5.php
index 5d0af76a0b0dead97b8cb81f2793d8764d073077..5dedf48ee7838840e863888366bab34e713de5e3 100644 (file)
--- a/functions/decode/iso_8859_5.php
+++ b/functions/decode/iso_8859_5.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_5 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-5')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-5'))
         return $string;

diff --git a/functions/decode/iso_8859_6.php b/functions/decode/iso_8859_6.php
index a7201503968113d4b4a63ad2afc786eed2423e14..e8827e27627f891d85e8d7e8268789c8024ad8e0 100644 (file)
--- a/functions/decode/iso_8859_6.php
+++ b/functions/decode/iso_8859_6.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_6 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-6')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-6'))
         return $string;

diff --git a/functions/decode/iso_8859_7.php b/functions/decode/iso_8859_7.php
index 9e0e7017692b3e60ceb5efea40140a7011126564..655c1c3d2e22d7d6bbee234f2a37f9e8e9afcb33 100644 (file)
--- a/functions/decode/iso_8859_7.php
+++ b/functions/decode/iso_8859_7.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_7 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-7')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-7'))
         return $string;

diff --git a/functions/decode/iso_8859_8.php b/functions/decode/iso_8859_8.php
index a5668ca6335660be1e3a143d6c1ddc9b49a33ec3..e80b99072a7f0d73c9d7f2b3fd3f31c4f3e6044e 100644 (file)
--- a/functions/decode/iso_8859_8.php
+++ b/functions/decode/iso_8859_8.php
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_8 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso8859-8')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-8'))
         return $string;

diff --git a/functions/decode/iso_8859_9.php b/functions/decode/iso_8859_9.php
index 997d86338139d276039a4e05cd7dd9589301f793..d32c968eb3f9bd71c9f577be68d7ffae48c9930f 100644 (file)
--- a/functions/decode/iso_8859_9.php
+++ b/functions/decode/iso_8859_9.php
@@ -46,11 +46,6 @@
  * @return string Decoded string
  */
 function charset_decode_iso_8859_9 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso8859-9')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-9'))
         return $string;

diff --git a/functions/decode/iso_ir_111.php b/functions/decode/iso_ir_111.php
index c391214ad5dcedd0e1fd8c8452af53dcb4066d9e..025a317c1eb2a8ed243bd1ab50cbad8e13e40707 100644 (file)
--- a/functions/decode/iso_ir_111.php
+++ b/functions/decode/iso_ir_111.php
@@ -50,11 +50,6 @@
  * @return string Decoded string
  */
 function charset_decode_iso_ir_111 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-ir-111')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-ir-111'))
         return $string;

diff --git a/functions/decode/koi8_r.php b/functions/decode/koi8_r.php
index 6da341254443750a3a5b4296c9c3debbe84fd917..3a1532e03c1f826fda0f4b149b780749ccdb5dba 100644 (file)
--- a/functions/decode/koi8_r.php
+++ b/functions/decode/koi8_r.php
@@ -45,11 +45,6 @@
  * @return string Decoded string
  */
 function charset_decode_koi8_r ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'koi8-r')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'koi8-r'))
         return $string;

diff --git a/functions/decode/koi8_u.php b/functions/decode/koi8_u.php
index 37620763d88d352ecc52d7f583d642d6af397f06..821cc491dd349b149f167bcaf4c1e9564c03bb1a 100644 (file)
--- a/functions/decode/koi8_u.php
+++ b/functions/decode/koi8_u.php
@@ -49,11 +49,6 @@
  * @return string Decoded string
  */
 function charset_decode_koi8_u ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'koi8-u')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'koi8-u'))
         return $string;

diff --git a/functions/decode/tis_620.php b/functions/decode/tis_620.php
index 6596821c15bf7e53cdac26b60522343333ea6bb3..ea0697db3d8313428fb0b601a750903b5658d127 100644 (file)
--- a/functions/decode/tis_620.php
+++ b/functions/decode/tis_620.php
@@ -44,11 +44,6 @@
  * @return string Decoded string
  */
 function charset_decode_tis_620 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'tis-620')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'tis-620'))
         return $string;

diff --git a/functions/decode/us_ascii.php b/functions/decode/us_ascii.php
index ae96b3095eb8b07af8143d5cbe61aa2e79870c92..0b599f64a81bc79a11d8d6bdd5abe290c453c9da 100644 (file)
--- a/functions/decode/us_ascii.php
+++ b/functions/decode/us_ascii.php
@@ -23,11 +23,6 @@
  * @return string cleaned string
  */
 function charset_decode_us_ascii ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'us-ascii')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'us-ascii'))
         return $string;