clean up code commented out since 8 y

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

diff --git a/functions/encode/cp1251.php b/functions/encode/cp1251.php
index 6c1148f6dd2d8f9cd76bab61169a8bb94f6d7061..2afead9c162bb660b102654d43308623df0992db 100644 (file)
--- a/functions/encode/cp1251.php
+++ b/functions/encode/cp1251.php
@@ -23,7 +23,6 @@ function charset_encode_cp1251 ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetocp1251('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetocp1251(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/cp1255.php b/functions/encode/cp1255.php
index 47d7bdfb912af8427385613548d31e781be2a6e2..3eca98c47583a9b215f7e26d50cb4b7e62274bba 100644 (file)
--- a/functions/encode/cp1255.php
+++ b/functions/encode/cp1255.php
@@ -23,7 +23,6 @@ function charset_encode_cp1255 ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetocp1255('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetocp1255(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/cp1256.php b/functions/encode/cp1256.php
index e5f9904f3a856418ac08eb87946f8abb4aeed86d..8ff1430bb9375647c755f8a80ee62cd85285544f 100644 (file)
--- a/functions/encode/cp1256.php
+++ b/functions/encode/cp1256.php
@@ -23,7 +23,6 @@ function charset_encode_cp1256 ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetocp1256('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetocp1256(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/iso_8859_1.php b/functions/encode/iso_8859_1.php
index 036581e79dd394047d2ddee15b0bdf6bcc65b1a8..32cc16810109d7570b5278bf9b717de7cc3077a6 100644 (file)
--- a/functions/encode/iso_8859_1.php
+++ b/functions/encode/iso_8859_1.php
@@ -23,7 +23,6 @@ function charset_encode_iso_8859_1 ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetoiso88591('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso88591(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/iso_8859_15.php b/functions/encode/iso_8859_15.php
index 57151e2b23dacda9351516388a9d4e39dac2c0b4..9180d959a15abd72e259fc5cf30817cfb1419971 100644 (file)
--- a/functions/encode/iso_8859_15.php
+++ b/functions/encode/iso_8859_15.php
@@ -23,7 +23,6 @@ function charset_encode_iso_8859_15 ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetoiso885915('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso885915(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/iso_8859_2.php b/functions/encode/iso_8859_2.php
index 149bfdc0f0b6b61d74e6d2656edc7c07e17fe8f5..6b036461a3a657d207475361bbfe8a23aa968e42 100644 (file)
--- a/functions/encode/iso_8859_2.php
+++ b/functions/encode/iso_8859_2.php
@@ -23,7 +23,6 @@ function charset_encode_iso_8859_2 ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetoiso88592('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso88592(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/iso_8859_7.php b/functions/encode/iso_8859_7.php
index d5d12491b3f84efb935e12a28074b81ec4d13705..ad8055cd01d3db1ebb71ebe23a837f5eb6f121e8 100644 (file)
--- a/functions/encode/iso_8859_7.php
+++ b/functions/encode/iso_8859_7.php
@@ -23,7 +23,6 @@ function charset_encode_iso_8859_7 ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetoiso88597('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso88597(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/iso_8859_9.php b/functions/encode/iso_8859_9.php
index ad65748c20832f16c71f4f93925bc1db131110b1..9c06a7cf274367c53015f6626ab23ad32dc33e83 100644 (file)
--- a/functions/encode/iso_8859_9.php
+++ b/functions/encode/iso_8859_9.php
@@ -23,7 +23,6 @@ function charset_encode_iso_8859_9 ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetoiso88599('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoiso88599(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/koi8_r.php b/functions/encode/koi8_r.php
index 139463d794363bb60d3ef4f32c8d9e2d975f0d35..bdd209eda11ee074a87771a04874ffc8ff3465cb 100644 (file)
--- a/functions/encode/koi8_r.php
+++ b/functions/encode/koi8_r.php
@@ -23,7 +23,6 @@ function charset_encode_koi8_r ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetokoi8r('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetokoi8r(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/koi8_u.php b/functions/encode/koi8_u.php
index b8e395af373ce880f3d176897fe530526deba074..49328c4abc99fd4e0dbb0a5fe0471f53d82d1e39 100644 (file)
--- a/functions/encode/koi8_u.php
+++ b/functions/encode/koi8_u.php
@@ -23,7 +23,6 @@ function charset_encode_koi8_u ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetokoi8u('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetokoi8u(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/tis_620.php b/functions/encode/tis_620.php
index 52995c0fff65eba19ea419d929781e06457a0927..6b6d647b15ede25567ceca72c41953ef5bd8c9a8 100644 (file)
--- a/functions/encode/tis_620.php
+++ b/functions/encode/tis_620.php
@@ -23,7 +23,6 @@ function charset_encode_tis_620 ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetotis620('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetotis620(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/us_ascii.php b/functions/encode/us_ascii.php
index 965fada9706a3bda0013659538deb9e9d57f1b86..e870b9ff9036292dc061e884ecb83a5ce02d92eb 100644 (file)
--- a/functions/encode/us_ascii.php
+++ b/functions/encode/us_ascii.php
@@ -23,7 +23,6 @@ function charset_encode_us_ascii ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetousascii('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetousascii(hexdec('\\1'))",$string);
 
     return $string;
 }

diff --git a/functions/encode/utf_8.php b/functions/encode/utf_8.php
index 59cc51b1c447f41b2e27bf98ca778dcbbaa1a1b4..16b5f93af80e561da6a283463196bd9e27dacd99 100644 (file)
--- a/functions/encode/utf_8.php
+++ b/functions/encode/utf_8.php
@@ -27,7 +27,6 @@ function charset_encode_utf_8 ($string) {
    if (! preg_match("'&#[0-9]+;'",$string) ) return $string;
 
     $string=preg_replace("/&#([0-9]+);/e","unicodetoutf8('\\1')",$string);
-    // $string=preg_replace("/&#[xX]([0-9A-F]+);/e","unicodetoutf8(hexdec('\\1'))",$string);
 
     return $string;
 }