Added partial support for iso-8859-15 to rfc1522Decode.

[squirrelmail.git] / functions / mime.php

diff --git a/functions/mime.php b/functions/mime.php
index 417f89873163b00aefc8971c636d0191ae4d627e..f891a3cdce97125482c0e6841292deb3ed016fde 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -32,7 +32,7 @@
                      $p++;
                   }
                   /** All of these values are getting passed back to us **/
-                  fetchEntityHeader($imapConnection, $entity_header, $ent_type0, $ent_type1, $ent_bound, $encoding, $charset, $filename);
+                  sqimap_get_entity_header($imapConnection, $entity_header, $ent_type0, $ent_type1, $ent_bound, $encoding, $charset, $filename);
                }
 
 
@@ -185,39 +185,67 @@
    function decodeBody($body, $encoding) {
       $encoding = strtolower($encoding);
 
-      if ($encoding == "us-ascii") {
-         $newbody = $body; // if only they all were this easy
+      if ($encoding == "quoted-printable") {
+         $body = quoted_printable_decode($body);
 
-      } else if ($encoding == "quoted-printable") {
-         $body_ary = explode("\n", $body);
+         while (ereg("=\n", $body))
+            $body = ereg_replace ("=\n", "", $body);
+      } else if ($encoding == "base64") {
+         $body = base64_decode($body);
+      }
 
-         for ($q=0; $q < count($body_ary); $q++) {
-            if (substr(trim($body_ary[$q]), -1) == "=") {
-               $body_ary[$q] = trim($body_ary[$q]);
-               $body_ary[$q] = substr($body_ary[$q], 0, strlen($body_ary[$q])-1);
-            } else if (substr(trim($body_ary[$q]), -3) == "=20") {
-               $body_ary[$q] = trim($body_ary[$q]);
-               $body_ary[$q] = substr($body_ary[$q], 0, strlen($body_ary[$q])-3);
-               $body_ary[$q] = "$body_ary[$q]\n";
-            }
-         }
+      // All other encodings are returned raw.
+      return $body;
+   }
 
-         for ($q=0;$q < count($body_ary);$q++) {
-            $body_ary[$q] = ereg_replace("=3D", "=", $body_ary[$q]);
+
+   // 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);
          }
 
-         $body = "";
-         for ($i = 0; $i < count($body_ary); $i++) {
-            $body .= "$body_ary[$i]\n";
+         if ($res[2] != "" && $res[2] == "15") {
+            // Remove all chararacters in iso-8859-15 that is not the same
+            // as in iso-8859-1
+            $replace = strtr($replace, "\244\246\250\255\264\270\274\275".
+                             "\276", "??????????");
+         } else if ($res[2] != "" && $res[2] != "1") {
+            // This gets rid of all characters with over 0x9F for other
+            // iso-8859 charsets.
+            $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", 
+                             "????????????????????????????????????????".
+                             "????????????????????????????????????????".
+                             "????????????????????????????????????????".
+                             "????????");
          }
 
-         $newbody = $body;
-      } else if ($encoding == "base64") {
-         $newbody = base64_decode($body);
+         $string = eregi_replace
+            ('=\?(us-ascii|iso-8859-([0-9])+)\?(q|b)\?([^?]+)\?=',
+             $replace, $string);
 
-      } else {
-         $newbody = $body;
-      }
-      return $newbody;
+         return (rfc1522Decode($string));
+      } else         
+         return ($string);
    }
+
 ?>