Further XSS improvements plus a bugfix.

[squirrelmail.git] / functions / imap_messages.php

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 5014b2ee27d29d6d84da4e73c70607ed54811c53..33b962b6f5f407aa6b1036e85452ac24bb287638 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -333,7 +333,7 @@ function elapsedTime($start) {
 
 
 function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
-    global $squirrelmail_language, $color, $data_dir, $username;
+    global $squirrelmail_language, $color, $data_dir, $username, $imap_server_type;
     $start = gettimeofday();
     /* Get the small headers for each message in $msg_list */
     $sid = sqimap_session_id();
@@ -382,13 +382,13 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
     arsort($read_list);
 
     $patterns = array (
-                       "/^To:(.*)/iA",
-                       "/^From:(.*)/iA",
-                       "/^X-Priority:(.*)/iA",
-                       "/^Cc:(.*)/iA",
-                       "/^Date:(.*)/iA",
-                       "/^Subject:(.*)/iA",
-                       "/^Content-Type:(.*)/iA"
+                       "/^To:(.*)\$/AU",
+                       "/^From:(.*)\$/AU",
+                       "/^X-Priority:(.*)\$/AU",
+                       "/^Cc:(.*)\$/AU",
+                       "/^Date:(.*)\$/AU",
+                       "/^Subject:(.*)\$/AU",
+                       "/^Content-Type:(.*)\$/AU"
                );
     $regpattern = '';          
 
@@ -419,9 +419,14 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
            
            if ($read_part{0} == '*') {
                if ($internaldate) {
-                   if (preg_match ("/^.+INTERNALDATE\s\"(.+)\"\s.+/iUA",$read_part, $reg)) {
-                       $date = $reg[1];
-                   }
+                   if (preg_match ("/^.+INTERNALDATE\s+\"(.+)\".+/iUA",$read_part, $reg)) {
+                        $tmpdate = trim($reg[1]);
+                        $tmpdate = str_replace('  ',' ',$tmpdate);
+                        $tmpdate = explode(' ',$tmpdate);
+                        $date = str_replace('-',' ',$tmpdate[0]) . " " .
+                                $tmpdate[1] . " " .
+                                $tmpdate[2];
+                    }
                }  
                if (preg_match ("/^.+RFC822.SIZE\s+(\d+).+/iA",$read_part, $reg)) {
                    $size = $reg[1];
@@ -440,9 +445,8 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
                            $flag_flagged = true;
                        }
                    }             
-               } 
+               }
            } else {
-
                $firstchar = $read_part{0};             
                if ($firstchar == 'T') {
                    $regpattern = $patterns[0];
@@ -461,7 +465,7 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
                        $regpattern = $patterns[6];
                        $id = 7;
                    }   
-               } else if ($firstchar == 'D') {
+               } else if ($firstchar == 'D' && !$internaldate ) {
                    $regpattern = $patterns[4];
                    $id = 5;
                } else if ($firstchar == 'S') {
@@ -485,9 +489,7 @@ function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) {
                              $cc = $regs[1];
                              break;
                            case 5:
-                             if (!$internaldate) {
-                               $date = $regs[1];
-                             } 
+                             $date = $regs[1];
                              break;
                            case 6:
                              $subject = htmlspecialchars(trim($regs[1]));
@@ -617,7 +619,17 @@ function sqimap_get_entity_header ($imap_stream, &$read, &$type0, &$type1, &$bou
     $charset = $header["CHARSET"];
     $filename = $header["FILENAME"];
 }
-*/
+
+/* function to get the mime headers */
+function sqimap_get_mime_ent_header ($imap_stream, $id, $mailbox, $ent) {
+    $read = sqimap_run_command ($imap_stream, "FETCH $id:$id BODY[$ent.MIME]", true, $response, $message);
+    $header = sqimap_get_header($imap_stream, $read); 
+    $header->id = $id;
+    $header->mailbox = $mailbox;
+    return $header;
+}
+
+
 /* Queries the IMAP server and gets all header information. */
 function sqimap_get_header ($imap_stream, $read) {
     global $where, $what;
@@ -630,12 +642,22 @@ function sqimap_get_header ($imap_stream, $read) {
     $hdr->type1 = "plain";
     $hdr->charset = "us-ascii";
 
+    $read_fold = array();
+
     while ($i < count($read)) {
-        //unfold multi-line headers
-        while ($i + 1 < count($read) && strspn($read[$i + 1], "\t ") > 0) {
-            $read[$i + 1] = substr($read[$i], 0, -2) . ' ' . ltrim($read[$i + 1]);
-            array_splice($read, $i, 1);
-        }
+        /* unfold multi-line headers */
+       /* remember line for to, cc and bcc */
+       $read_fold[] = $read[$i];
+       $folded = false;
+       while (($i + 1 < count($read)) && (strspn($read[$i + 1], "\t ") > 0) ) {
+           if ($read[$i+1] != '') $read_fold[] = $read[$i+1];
+           $read[$i + 1] = substr($read[$i], 0, -2) . ' ' . ltrim($read[$i+1]);
+           array_splice($read, $i, 1);
+           $folded = true;
+       }
+       if (!$folded) {
+           $read_fold = array();
+       }
 
         if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
             $hdr->mime = true;
@@ -763,35 +785,48 @@ function sqimap_get_header ($imap_stream, $read) {
         /* CC */
         else if (strtolower(substr($read[$i], 0, 3)) == "cc:") {
             $pos = 0;
-            $hdr->cc[$pos] = trim(substr($read[$i], 4));
-            $i++;
-            while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t"))  && (trim($read[$i]) != "")){
-                $pos++;
-                $hdr->cc[$pos] = trim($read[$i]);
-                $i++;
+           if (isset($read_fold[0])) {
+               $hdr->cc[$pos] = trim(substr($read_fold[0], 4));
+               $pos++;
+               while ($pos < count($read_fold)) {                  
+                   $hdr->cc[$pos] = trim($read_fold[$pos]);
+                   $pos++;
+               }
+            } else {
+               $hdr->cc[$pos] = trim(substr($read[$i], 4));
             }
+           $i++;
         }
         /* BCC */
         else if (strtolower(substr($read[$i], 0, 4)) == "bcc:") {
             $pos = 0;
-            $hdr->bcc[$pos] = trim(substr($read[$i], 5));
-            $i++;
-            while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t"))  && (trim($read[$i]) != "")){
-                $pos++;
-                $hdr->bcc[$pos] = trim($read[$i]);
-                $i++;
+           if (isset($read_fold[0])) {
+               $hdr->bcc[$pos] = trim(substr($read_fold[0], 5));
+               $pos++;
+               while ($pos < count($read_fold)) {                  
+                   $hdr->bcc[$pos] = trim($read_fold[$pos]);
+                   $pos++;
+               }
+            } else {
+               $hdr->bcc[$pos] = trim(substr($read[$i], 5));
             }
+           $i++;
         }
         /* TO */
         else if (strtolower(substr($read[$i], 0, 3)) == "to:") {
             $pos = 0;
-            $hdr->to[$pos] = trim(substr($read[$i], 4));
-            $i++;
-            while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t"))  && (trim($read[$i]) != "")){
-                $pos++;
-                $hdr->to[$pos] = trim($read[$i]);
-                $i++;
+           if (isset($read_fold[0])) {
+               $hdr->to[$pos] = trim(substr($read_fold[0], 4));
+               $pos++;
+               while ($pos < count($read_fold)) {                  
+                   $hdr->to[$pos] = trim($read_fold[$pos]);
+                   $pos++;
+               }
+            } else {
+               $hdr->to[$pos] = trim(substr($read[$i], 4));
             }
+           $i++;
+           
         }
         /* MESSAGE ID */
         else if (strtolower(substr($read[$i], 0, 11)) == "message-id:") {
@@ -819,6 +854,7 @@ function sqimap_get_header ($imap_stream, $read) {
         else {
             $i++;
         }
+       $read_fold=array();
      }
      return $hdr;
 }