[Hastymail-cvs] SF.net SVN: hastymail:[555] trunk/hastymail2/lib/imap_class.php

[<sai...@us...>]

Revision: 555
          http://hastymail.svn.sourceforge.net/hastymail/?rev=555&view=rev
Author:   sailfrog
Date:     2008-09-02 00:22:03 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
remove charset lookup in imap class (should not be needed here anyway)

Modified Paths:
--------------
    trunk/hastymail2/lib/imap_class.php

Modified: trunk/hastymail2/lib/imap_class.php
===================================================================
--- trunk/hastymail2/lib/imap_class.php	2008-08-27 22:45:08 UTC (rev 554)
+++ trunk/hastymail2/lib/imap_class.php	2008-09-02 00:22:03 UTC (rev 555)
@@ -1122,7 +1122,6 @@
     /*  get the headers for a mailbox page display. Saved in the session
         for re-use, controled by the $imap->use_header_cache setting */
     function get_mailbox_page($mailbox, $uids, $page) {
-        global $charset_codes;
         if ($page) {
             if ($this->use_header_cache) {
                 if (isset($_SESSION['header_cache'][$mailbox][$page])) {
@@ -1199,10 +1198,7 @@
                     $cset = '';
                     if (stristr($content_type, 'charset=')) {
                         if (preg_match("/charset\=([^\s]+)/", $content_type, $matches)) {
-                            $charset = trim(strtolower(str_replace(array('"', "'", ';'), '', $matches[1])));
-                            if ($charset == 'us-ascii' || in_array($charset, $charset_codes)) {
-                                $cset = $charset;
-                            }
+                            $cset = trim(strtolower(str_replace(array('"', "'", ';'), '', $matches[1])));
                         }
                     }
                     $headers[$uid] = array('uid' => $uid, 'flags' => $flags, 'internal_date' => $internal_date, 'size' => $size,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.