Added support for RFC1522 (MIME coding of headers).
authorgustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 22 Feb 2000 13:32:38 +0000 (13:32 +0000)
committergustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Tue, 22 Feb 2000 13:32:38 +0000 (13:32 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@236 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/mailbox_display.php
functions/mime.php
src/read_body.php
src/right_main.php

index d9f52b7..27510af 100644 (file)
@@ -7,6 +7,7 @@
     **  table row that has sender, date, subject, etc...
     **
     **/
+
    function printMessageInfo($imapConnection, $t, $i, $from, $subject, $dateString, $answered, $seen, $mailbox, $sort, $startMessage) {
       require ("../config/config.php");
 
@@ -52,8 +53,8 @@
          $messages[$j]["TIME_STAMP"] = getTimeStamp($tmpdate);
          $messages[$j]["DATE_STRING"] = getDateString($messages[$j]["TIME_STAMP"]);
          $messages[$j]["ID"] = $j+1;
-         $messages[$j]["FROM"] = $from[$j];
-         $messages[$j]["SUBJECT"] = $subject[$j];
+         $messages[$j]["FROM"] = rfc1522Decode($from[$j]);
+         $messages[$j]["SUBJECT"] = rfc1522Decode($subject[$j]);
          $messages[$j]["FLAG_DELETED"] = false;
          $messages[$j]["FLAG_ANSWERED"] = false;
          $messages[$j]["FLAG_SEEN"] = false;
index dc5ef1a..bea7432 100644 (file)
       }
       return $newbody;
    }
+
+
+   // This functions decode strings that is encoded according to 
+   // RFC1522 (MIME Part Two: Message Header Extensions for Non-ASCII Text).
+   function rfc1522Decode ($string) {
+      // Recognizing only US-ASCII and ISO-8859. Other charsets should
+      // probably be recognized as well.
+      if (eregi('=\?(us-ascii|iso-8859-([0-9])+)\?(q|b)\?([^?]+)\?=', 
+                $string, $res)) {
+         if (ucfirst($res[3]) == "B") {
+            $replace = base64_decode($res[4]);
+         } else {
+            $replace = ereg_replace("_", " ", $res[4]);
+            $replace = quoted_printable_decode($replace);
+         }
+
+         // Only US-ASCII and ISO-8859-1 can be displayed without further ado
+         if ($res[2] != "" && $res[2] != "1") {
+            // This get rid of all characters with over 0x9F
+            $replace = strtr($replace, "\240\241\242\243\244\245\246\247".
+                             "\250\251\252\253\254\255\256\257".
+                             "\260\261\262\263\264\265\266\267".
+                             "\270\271\272\273\274\275\276\277".
+                             "\300\301\302\303\304\305\306\307".
+                             "\310\311\312\313\314\315\316\317".
+                             "\320\321\322\323\324\325\326\327".
+                             "\330\331\332\333\334\335\336\337".
+                             "\340\341\342\343\344\345\346\347".
+                             "\350\351\352\353\354\355\356\357".
+                             "\360\361\362\363\364\365\366\367".
+                             "\370\371\372\373\374\375\376\377", 
+                             "????????????????????????????????????????".
+                             "????????????????????????????????????????".
+                             "????????????????????????????????????????".
+                             "????????");
+         }
+
+         $string = eregi_replace
+            ('=\?(us-ascii|iso-8859-([0-9])+)\?(q|b)\?([^?]+)\?=',
+             $replace, $string);
+
+         return (rfc1522Decode($string));
+      } else         
+         return ($string);
+   }
+
 ?>
index 59c4e4c..4701fe6 100644 (file)
@@ -82,8 +82,8 @@
    }
 
    /** make sure everything will display in HTML format **/
-   $from_name = htmlspecialchars($message["HEADER"]["FROM"]);
-   $subject = htmlspecialchars(stripslashes($message["HEADER"]["SUBJECT"]));
+   $from_name = htmlspecialchars(rfc1522Decode($message["HEADER"]["FROM"]));
+   $subject = htmlspecialchars(rfc1522Decode(stripslashes($message["HEADER"]["SUBJECT"])));
 
    echo "<BR>";
    echo "<TABLE COLS=1 CELLSPACING=0 WIDTH=98% BORDER=0 ALIGN=CENTER CELLPADDING=0>\n";
index 40f01c0..ddd01e4 100644 (file)
@@ -29,6 +29,7 @@
    include("../functions/date.php");
    include("../functions/page_header.php");
    include("../functions/array.php");
+   include("../functions/mime.php");
    include("../functions/mailbox_display.php");
    include("../functions/display_messages.php");