While getting data from a stream it is possible to reach the end, so we should check...

[squirrelmail.git] / functions / mime.php

diff --git a/functions/mime.php b/functions/mime.php
index a9c22b7ae53617da8a11f5a4ced820e98fe8bc03..52a452ea6cd11ba6c8381a3971db604f0ba5d849 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -14,7 +14,7 @@
    global $debug_mime;
    $debug_mime = false;
    
-   include "../functions/imap.php";
+   require_once('../functions/imap.php');
 
    /** Setting up the objects that have the structure for the message **/
 
@@ -64,7 +64,7 @@
       $read = fgets ($imap_stream, 10000);
       $response = substr($read, 0, 4);
       $bodystructure = "";
-      while ($response != "a001") {
+      while ($response != 'a001' ) && !feof( $imap_stream ) {
          $bodystructure .= $read;
          $read = fgets ($imap_stream, 10000);
          $response = substr($read, 0, 4);
@@ -393,7 +393,7 @@
          return $regs[1];
       }
       
-      $str = "Body retrival error.  Please report this bug!\n";
+      $str = "Body retrieval error.  Please report this bug!\n";
       $str .= "Response:  $response\n";
       $str .= "Message:  $message\n";
       $str .= "FETCH line:  $topline";
@@ -535,7 +535,8 @@
       // this if statement checks for the entity to show as the
       // primary message. To add more of them, just put them in the
       // order that is their priority.
-      global $startMessage, $username, $key, $imapServerAddress, $imapPort;
+      global $startMessage, $username, $key, $imapServerAddress, $imapPort,
+          $show_html_default;
 
       $id = $message->header->id;
       $urlmailbox = urlencode($message->header->mailbox);
@@ -552,7 +553,7 @@
    
          // If there are other types that shouldn't be formatted, add
          // them here 
-         if ($body_message->header->type1 != "html") {   
+         if ($body_message->header->type1 != "html" || ! $show_html_default) {
             translateText($body, $wrap_at, $body_message->header->charset);
          }   
    
@@ -679,6 +680,8 @@
       $body = str_replace("\r\n", "\n", $body);
       $encoding = strtolower($encoding);
 
+      global $show_html_default;
+
       if ($encoding == "quoted-printable") {
          $body = quoted_printable_decode($body);
 
@@ -687,7 +690,7 @@
       } else if ($encoding == "base64") {
          $body = base64_decode($body);
       }
-
+     
       // All other encodings are returned raw.
       return $body;
    }
@@ -727,28 +730,40 @@
    // be encoded.
    function encodeHeader ($string) {
       global $default_charset;
-
-      // Encode only if the string contains 8-bit characters or =?
-      if (ereg("([\\200-\\377]|=\\?)", $string)) {
-         
-         // First the special characters
-         $string = str_replace("=", "=3D", $string);
-         $string = str_replace("?", "=3F", $string);
-         $string = str_replace("_", "=5F", $string);
-         $string = str_replace(" ", "_", $string);
-
-        for ( $ch = 127 ; $ch <= 255 ; $ch++ ) {
-           $replace = chr($ch);
-           $insert = sprintf("=%02X", $ch);
-            $string = str_replace($replace, $insert, $string);
-         }
-
-         $newstring = "=?$default_charset?Q?".$string."?=";
-         
-         return $newstring;
-      }
-
-      return $string;
-   }
+  
+     // Encode only if the string contains 8-bit characters or =?
+     $j = strlen( $string  );
+     $l = FALSE;                             // Must be encoded ?
+     $ret = '';
+     for( $i=0; $i < $j; ++$i) {
+        switch( $string{$i} ) {
+           case '=':
+             $ret .= '=3D';
+             break;
+          case '?':
+             $l = TRUE;
+             $ret .= '=3F';
+             break;
+          case '_':
+             $ret .= '=5F';
+             break;
+          case ' ':
+             $ret .= '_';
+             break;
+         default:
+             $k = ord( $string{$i} );
+             if( $k > 126 ) {
+                $ret .= sprintf("=%02X", $k);
+                $l = TRUE;
+             } else 
+                $ret .= $string{$i};
+        }
+     }
+  
+     if( $l )
+        $string = "=?$default_charset?Q?$ret?=";
+           
+     return( $string );
+ }
 
 ?>