From: kink Date: Tue, 15 Jan 2013 15:58:43 +0000 (+0000) Subject: clean up code commented out since 8 y X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e2dd8640930e6c67e889006556661aeb15c7176c;p=squirrelmail.git 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 6c1148f6..2afead9c 100644 --- 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 47d7bdfb..3eca98c4 100644 --- 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 e5f9904f..8ff1430b 100644 --- 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 036581e7..32cc1681 100644 --- 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 57151e2b..9180d959 100644 --- 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 149bfdc0..6b036461 100644 --- 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 d5d12491..ad8055cd 100644 --- 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 ad65748c..9c06a7cf 100644 --- 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 139463d7..bdd209ed 100644 --- 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 b8e395af..49328c4a 100644 --- 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 52995c0f..6b6d647b 100644 --- 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 965fada9..e870b9ff 100644 --- 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 59cc51b1..16b5f93a 100644 --- 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; }