Added basic CSS support.

[squirrelmail.git] / functions / imap_messages.php

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 8604bb876c8707a8ab3121b74d64bb12665639c9..d7f01665e22754b58daf34b04311e1b00c16589b 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -1,4 +1,4 @@
-<?
+<?php
    /**
     **  imap_messages.php
     **
@@ -33,29 +33,48 @@
    function sqimap_messages_flag ($imap_stream, $start, $end, $flag) {
       fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-      
    }
 
    /******************************************************************************
     **  Returns some general header information -- FROM, DATE, and SUBJECT
     ******************************************************************************/
-   function sqimap_get_small_header ($imap_stream, $id, &$from, &$subject, &$date) {
-      fputs ($imap_stream, "a001 FETCH $id:$id RFC822.HEADER.LINES (From Subject Date)\r\n");
+       class small_header {
+               var $from, $subject, $date;
+       }
+        
+   function sqimap_get_small_header ($imap_stream, $id, $sent) {
+      fputs ($imap_stream, "a001 FETCH $id BODY.PEEK[HEADER.FIELDS (Date To From Subject)]\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
 
       $subject = _("(no subject)");
       $from = _("Unknown Sender");
+               $g = 0;
       for ($i = 0; $i < count($read); $i++) {
-         if (strtolower(substr($read[$i], 0, 5)) == "from:") {
-            $from = sqimap_find_displayable_name(substr($read[$i], 5));
-         } else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
+                       if ($sent == true) {
+               if (eregi ("^to:", $read[$i])) {
+               $from = sqimap_find_displayable_name(substr($read[$i], 3));
+                               }       
+                       } else { 
+               if (eregi ("^from:", $read[$i])) {
+               $from = sqimap_find_displayable_name(substr($read[$i], 5));
+                               }       
+                       }
+
+         if (eregi ("^date:", $read[$i])) {
             $date = substr($read[$i], 5);
-         } else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
-            $subject = htmlspecialchars(substr($read[$i], 8));
-            if (strlen(trim($subject)) == 0)
+         } else if (eregi ("^subject:", $read[$i])) {
+            $subject = htmlspecialchars(eregi_replace ("^subject: ", "", $read[$i]));
+            if (strlen(Chop($subject)) == 0)
                $subject = _("(no subject)");
          }
-      }
+               }       
+
+               $header = new small_header;
+               $header->from = $from;
+               $header->date = $date;
+               $header->subject = $subject;
+
+               return $header;
    }
 
    /******************************************************************************
@@ -159,16 +178,8 @@
             }
 
             /** Detect the boundary of a multipart message **/
-            if (strpos(strtolower(trim($line)), "boundary=")) {
-               $pos = strpos(strtolower($line), "boundary=") + 9;
-               $bound = trim($line);
-               if (strpos($line, " ", $pos) > 0) {
-                  $bound = substr($bound, $pos, strpos($line, " ", $pos));
-               } else {
-                  $bound = substr($bound, $pos);
-               }
-               $bound = str_replace("\"", "", $bound);
-               $header["BOUNDARY"] = $bound;
+            if (eregi("boundary=\"([^\"]+)\"", $line, $regs)) {                             
+               $header["BOUNDARY"] = $regs[1];                                             
             }
 
             /** Detect the charset **/
@@ -248,7 +259,7 @@
             $pos = 0;
             $header["CC"][$pos] = trim(substr($read[$i], 4));
             $i++;
-            while ((substr($read[$i], 0, 1) == " ") && (trim($read[$i]) != "")) {
+            while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t"))  && (trim($read[$i]) != "")){
                $pos++;
                $header["CC"][$pos] = trim($read[$i]);
                $i++;
@@ -259,7 +270,7 @@
             $pos = 0;
             $header["TO"][$pos] = trim(substr($read[$i], 4));
             $i++;
-            while ((substr($read[$i], 0, 1) == " ")  && (trim($read[$i]) != "")){
+            while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t"))  && (trim($read[$i]) != "")){
                $pos++;
                $header["TO"][$pos] = trim($read[$i]);
                $i++;
@@ -274,13 +285,13 @@
 
          /** ERROR CORRECTION **/
          else if (substr($read[$i], 0, 1) == ")") {
-            if ($header["SUBJECT"] == "")
+            if (strlen(trim($header["SUBJECT"])) == 0)
                 $header["SUBJECT"] = _("(no subject)");
 
-            if ($header["FROM"] == "")
+            if (strlen(trim($header["FROM"])) == 0)
                 $header["FROM"] = _("(unknown sender)");
 
-            if ($header["DATE"] == "")
+            if (strlen(trim($header["DATE"])) == 0)
                 $header["DATE"] = time();
             $i++;
          }