projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix sqauth_read_password() for plugins running on the login_verified hook when the...
[squirrelmail.git]
/
functions
/
decode
/
cp866.php
diff --git
a/functions/decode/cp866.php
b/functions/decode/cp866.php
index 4493333e7650eb3f70252018eef7b0e84e62533a..8d9cafced4cc6411b87b7315fd38476826680a68 100644
(file)
--- a/
functions/decode/cp866.php
+++ b/
functions/decode/cp866.php
@@
-1,10
+1,8
@@
<?php
<?php
+
/**
* decode/cp866.php
*
/**
* decode/cp866.php
*
- * Copyright (c) 2003-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* This file contains cp866 decoding function that is needed to read
* cp866 encoded mails in non-cp866 locale.
*
* This file contains cp866 decoding function that is needed to read
* cp866 encoded mails in non-cp866 locale.
*
@@
-20,6
+18,8
@@
K.D. Chang <a-kchang@microsoft.com>
The entries are in cp866_DOSCyrillicRussian order
*
K.D. Chang <a-kchang@microsoft.com>
The entries are in cp866_DOSCyrillicRussian order
*
+ * @copyright 2003-2010 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @subpackage decode
* @version $Id$
* @package squirrelmail
* @subpackage decode
@@
-31,11
+31,6
@@
* @return string $string Decoded string
*/
function charset_decode_cp866 ($string) {
* @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;
// don't do decoding when there are no 8bit symbols
if (! sq_is8bit($string,'ibm866'))
return $string;
@@
-174,4
+169,4
@@
function charset_decode_cp866 ($string) {
$string = str_replace(array_keys($cp866), array_values($cp866), $string);
return $string;
$string = str_replace(array_keys($cp866), array_values($cp866), $string);
return $string;
-}
\ No newline at end of file
+}