X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmailbox.php;h=8f9c92ab0e5cc17595a909f639d78e245f6b9350;hb=d4467150fe5126007ae625edb14ae757dbd687a0;hp=f3ea7dbcf7bbdbe38e8681b204047d7f0de95163;hpb=b8ea4ed629e58fb57a4b110867b4e1b84c82610f;p=squirrelmail.git

diff --git a/functions/mailbox.php b/functions/mailbox.php
index f3ea7dbc..8f9c92ab 100644
--- a/functions/mailbox.php
+++ b/functions/mailbox.php
@@ -11,6 +11,7 @@
       // select mailbox
       fputs($imapConnection, "mailboxSelect SELECT \"$mailbox\"\n");
       $read = fgets($imapConnection, 1024);
+      $unseen = false;
       while ((substr($read, 0, 16) != "mailboxSelect OK") && (substr($read, 0, 17) != "mailboxSelect BAD")) {
          if (substr(Chop($read), -6) == "EXISTS") {
             $array = explode(" ", $read);
@@ -20,6 +21,25 @@
       }
    }
 
+   function unseenMessages($imapConnection, &$numUnseen) {
+      fputs($imapConnection, "1 SEARCH UNSEEN NOT DELETED\n");
+      $read = fgets($imapConnection, 1024);
+      $unseen = false;
+
+      if (strlen($read) > 10) {
+         $unseen = true;
+         $ary = explode(" ", $read);
+         $numUnseen = count($ary) - 2;
+      }
+      else {
+         $unseen = false;
+         $numUnseen = 0;
+      }
+
+      $read = fgets($imapConnection, 1024);
+      return $unseen;
+   }
+
    /**  This function sends a request to the IMAP server for headers, 50 at a time
     **  until $end is reached.  I originally had it do them all at one time, but found
     **  it slightly faster to do it this way.
@@ -42,7 +62,7 @@
          } else {
             $rel_end = $end;
          }
-         fputs($imapConnection, "messageFetch FETCH $rel_start:$rel_end RFC822.HEADER.LINES (From Subject Date)\n");
+         fputs($imapConnection, "messageFetch FETCH $rel_start:$rel_end RFC822.HEADER.LINES (From Subject Date To Cc)\n");
          $read = fgets($imapConnection, 1024);
 
          while ((substr($read, 0, 15) != "messageFetch OK") && (substr($read, 0, 16) != "messageFetch BAD")) {
@@ -116,23 +136,36 @@
       }
    }
 
+   function decodeEmailAddr($sender) {
+      $emailAddr = getEmailAddr($sender);
+      if (strpos($emailAddr, "EMAILSTART--")) {
+
+         $emailAddr = ereg_replace("EMAILSTART--", "", $emailAddr);
+         $emailAddr = ereg_replace("--EMAILEND", "", $emailAddr);
+      } else {
+         $emailAddr = $emailAddr;
+      }
+      return $emailAddr;
+   }
+
    function getEmailAddr($sender) {
       if (strpos($sender, "EMAILSTART--") == false)
-         return "";
+         return "$sender";
 
-      $start = strpos($sender, "EMAILSTART--");
-      $emailAddr = substr($sender, $start, strlen($sender));
+      $emailStart = strpos($sender, "EMAILSTART--") + 12;
+      $emailAddr = substr($sender, $emailStart, strlen($sender));
+      $emailAddr = substr($emailAddr, 0, strpos($emailAddr, "--EMAILEND"));
 
       return $emailAddr;
    }
 
    function getSender($sender) {
       if (strpos($sender, "EMAILSTART--") == false)
-         return "";
+         return "$sender";
 
       $first = substr($sender, 0, strpos($sender, "EMAILSTART--"));
       $second = substr($sender, strpos($sender, "--EMAILEND") +10, strlen($sender));
-      return "$first$second";
+      return "$first $second";
    }
 
    function getSenderName($sender) {
@@ -178,7 +211,6 @@
       }
 
       if (substr($read, 0, 15) == "mailboxStore NO") {
-         echo "ERROR... $read<BR>";
          return false;
       } else if (substr($read, 0, 15) == "mailboxStore OK") {
          return true;
@@ -203,60 +235,241 @@
       return $box;
    }
 
-   /** This function will fetch the body of a given message and format
-       it into our standard format. **/
-   function fetchBody($imapConnection, $id) {
+   /** This function gets all the information about a message.  Including Header and body **/
+   function fetchMessage($imapConnection, $id) {
+      $message["HEADER"] = fetchHeader($imapConnection, $id);
+      $message["ENTITIES"] = fetchBody($imapConnection, $message["HEADER"]["BOUNDARY"], $id, $message["HEADER"]["TYPE0"], $message["HEADER"]["TYPE1"]);
+
+      return $message;
+   }
+
+   function fetchHeader($imapConnection, $id) {
+      fputs($imapConnection, "messageFetch FETCH $id:$id RFC822.HEADER.LINES (From Subject Date To Cc Content-Type MIME-Version)\n");
+      $read = fgets($imapConnection, 1024);
+
+      /** defaults... if the don't get overwritten, it will display text **/
+      $header["TYPE0"] = "text";
+      $header["TYPE1"] = "plain";
+      $header["ENCODING"] = "us-ascii";
+      while ((substr($read, 0, 15) != "messageFetch OK") && (substr($read, 0, 16) != "messageFetch BAD")) {
+         /** MIME-VERSION **/
+         if (substr($read, 0, 17) == "MIME-Version: 1.0") {
+            $header["MIME"] = true;
+            $read = fgets($imapConnection, 1024);
+         }
+
+         /** ENCODING TYPE **/
+         else if (substr($read[$i], 0, 26) == "Content-Transfer-Encoding:") {
+            $header["ENCODING"] = strtolower(trim(substr($read[$i], 26)));
+         }
+
+         /** CONTENT-TYPE **/
+         else if (substr($read, 0, 13) == "Content-Type:") {
+            $cont = strtolower(trim(substr($read, 13)));
+            if (strpos($cont, ";"))
+               $cont = substr($cont, 0, strpos($cont, ";"));
+            $header["TYPE0"] = substr($cont, 0, strpos($cont, "/"));
+            $header["TYPE1"] = substr($cont, strpos($cont, "/")+1);
+
+            $line = $read;
+            $read = fgets($imapConnection, 1024);
+            while ( (substr(substr($read, 0, strpos($read, " ")), -1) != ":") && (trim($read) != "") && (trim($read) != ")")) {
+               str_replace("\n", "", $line);
+               str_replace("\n", "", $read);
+               $line = "$line $read";
+               $read = fgets($imapConnection, 1024);
+            }
+
+            /** Detect the boundary of a multipart message **/
+            if (strpos(strtolower(trim($line)), "boundary=")) {
+               $pos = strpos($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;
+            }
+
+            /** Detect the charset **/
+            if (strpos(strtolower(trim($line)), "charset=")) {
+               $pos = strpos($line, "charset=") + 8;
+               $charset = trim($line);
+               if (strpos($line, " ", $pos) > 0) {
+                  $charset = substr($charset, $pos, strpos($line, " ", $pos));
+               } else {
+                  $charset = substr($charset, $pos);
+               }
+               $charset = str_replace("\"", "", $charset);
+               $header["CHARSET"] = $charset;
+            } else {
+               $header["CHARSET"] = "us-ascii";
+            }
+
+         }
+         /** FROM **/
+         else if (substr($read, 0, 5) == "From:") {
+            $header["FROM"] = trim(substr($read, 5, strlen($read) - 6));
+            $read = fgets($imapConnection, 1024);
+         }
+         /** DATE **/
+         else if (substr($read, 0, 5) == "Date:") {
+            $d = substr($read, 5, strlen($read) - 6);
+            $d = trim($d);
+            $d = ereg_replace("  ", " ", $d);
+            $d = explode(" ", $d);
+            $header["DATE"] = getTimeStamp($d);
+            $read = fgets($imapConnection, 1024);
+         }
+         /** SUBJECT **/
+         else if (substr($read, 0, 8) == "Subject:") {
+            $header["SUBJECT"] = trim(substr($read, 8, strlen($read) - 9));
+            if (strlen(Chop($header["SUBJECT"])) == 0)
+               $header["SUBJECT"] = "(no subject)";
+            $read = fgets($imapConnection, 1024);
+         }
+         /** CC **/
+         else if (substr($read, 0, 3) == "CC:") {
+            $pos = 0;
+            $header["CC"][$pos] = trim(substr($read, 4));
+            $read = fgets($imapConnection, 1024);
+            while ((substr($read, 0, 1) == " ") && (trim($read) != "")) {
+               $pos++;
+               $header["CC"][$pos] = trim($read);
+               $read = fgets($imapConnection, 1024);
+            }
+         }
+         /** TO **/
+         else if (substr($read, 0, 3) == "To:") {
+            $pos = 0;
+            $header["TO"][$pos] = trim(substr($read, 4));
+            $read = fgets($imapConnection, 1024);
+            while ((substr($read, 0, 1) == " ")  && (trim($read) != "")){
+               $pos++;
+               $header["TO"][$pos] = trim($read);
+               $read = fgets($imapConnection, 1024);
+            }
+         }
+
+         /** ERROR CORRECTION **/
+         else if (substr($read, 0, 1) == ")") {
+            if ($header["SUBJECT"] == "")
+                $header["SUBJECT"] = "(no subject)";
+
+            if ($header["FROM"] == "")
+                $header["FROM"] = "(unknown sender)";
+
+            if ($header["DATE"] == "")
+                $header["DATE"] = time();
+            $read = fgets($imapConnection, 1024);
+         }
+         else {
+            $read = fgets($imapConnection, 1024);
+         }
+      }
+      return $header;
+   }
+
+   function fetchBody($imapConnection, $bound, $id, $type0, $type1) {
+      /** This first part reads in the full body of the message **/
       fputs($imapConnection, "messageFetch FETCH $id:$id BODY[TEXT]\n");
+      $read = fgets($imapConnection, 1024);
+
       $count = 0;
-      $read[$count] = fgets($imapConnection, 1024);
-      while ((substr($read[$count], 0, 15) != "messageFetch OK") && (substr($read[$count], 0, 16) != "messageFetch BAD")) {
+      while ((substr($read, 0, 15) != "messageFetch OK") && (substr($read, 0, 16) != "messageFetch BAD")) {
+         $body[$count] = $read;
          $count++;
-         $read[$count] = fgets($imapConnection, 1024);
+
+         $read = fgets($imapConnection, 1024);
       }
 
-      /** this loop removes the first line, and the last two which
-          are IMAP information that we don't need. **/
+      /** this deletes the first line, and the last two (imap stuff we ignore) **/
       $i = 0;
       $j = 0;
-      while ($i < count($read)) {
-         if (($i != 0) && ($i != count($read) - 1) && ($i != count($read) - 2)){
-            $readtmp[$j] = $read[$i];
+      while ($i < count($body)) {
+         if ( ($i != 0) && ($i != count($body) - 1) && ($i != count($body)) ) {
+            $bodytmp[$j] = $body[$i];
             $j++;
          }
          $i++;
       }
-      $read = $readtmp;
+      $body = $bodytmp;
 
-      /** This loop formats the text, creating links out of linkable stuff too **/
-      $count = 0;
-      $useHTML= false;
-      while ($count < count($read)) {
-         $read[$count] = "^^$read[$count]";
-
-         if (strpos(strtolower($read[$count]), "<html>") == true) {
-            $useHTML = true;
-         } else if (strpos(strtolower($read[$count]), "</html>") == true) {
-            $useHTML = false;
-         }
+      /** Now, lets work out the MIME stuff **/
+      /** (needs mime.php included)         **/
+      return decodeMime($body, $bound, $type0, $type1);
+   }
 
-         $read[$count] = substr($read[$count], 2, strlen($read[$count]));
+   function fetchEntityHeader($imapConnection, &$read, &$type0, &$type1, &$bound, &$encoding, &$charset) {
+      /** defaults... if the don't get overwritten, it will display text **/
+      $type0 = "text";
+      $type1 = "plain";
+      $encoding = "us-ascii";
+      $i = 0;
+      while (trim($read[$i]) != "") {
+         if (substr($read[$i], 0, 26) == "Content-Transfer-Encoding:") {
+            $encoding = strtolower(trim(substr($read[$i], 26)));
+
+         } else if (substr($read[$i], 0, 13) == "Content-Type:") {
+            $cont = strtolower(trim(substr($read[$i], 13)));
+            if (strpos($cont, ";"))
+               $cont = substr($cont, 0, strpos($cont, ";"));
+            $type0 = substr($cont, 0, strpos($cont, "/"));
+            $type1 = substr($cont, strpos($cont, "/")+1);
+
+            $line = $read[$i];
+            while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
+               str_replace("\n", "", $line);
+               str_replace("\n", "", $read[$i]);
+               $line = "$line $read[$i]";
+               $i++;
+            }
 
-         if ($useHTML == false) {
-            $read[$count] = parsePlainBodyText($read[$count]);
-         } else {
-            $read[$count] = parseHTMLBodyText($read[$count]);
+            /** Detect the boundary of a multipart message **/
+            if (strpos(strtolower(trim($line)), "boundary=")) {
+               $pos = strpos($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);
+            }
+
+            /** Detect the charset **/
+            if (strpos(strtolower(trim($line)), "charset=")) {
+               $pos = strpos($line, "charset=") + 8;
+               $charset = trim($line);
+               if (strpos($line, " ", $pos) > 0) {
+                  $charset = substr($charset, $pos, strpos($line, " ", $pos));
+               } else {
+                  $charset = substr($charset, $pos);
+               }
+               $charset = str_replace("\"", "", $charset);
+            }
          }
+         $i++;
+      }
 
-         $count++;
+      /** remove the header from the entity **/
+      $i = 0;
+      while (trim($read[$i]) != "") {
+         $i++;
       }
-      return $read;
-   }
+      $i++;
 
-   function parseHTMLBodyText($line) {
-      return $line;
+      for ($p = 0; $i < count($read); $p++) {
+         $entity[$p] = $read[$i];
+         $i++;
+      }
+
+      $read = $entity;
    }
 
-   function parsePlainBodyText($line) {
+   function parsePlainTextMessage($line) {
       $line = "^^$line";
 
       if ((strpos(strtolower($line), "<!") == false) &&
@@ -266,7 +479,7 @@
          $line = str_replace(">", "&gt;", $line);
       }
 
-      $wrap_at = 80; // Make this configurable int the config file some time
+      $wrap_at = 86; // Make this configurable int the config file some time
       if (strlen($line) - 2 >= $wrap_at) // -2 because of the ^^ at the beginning
          $line = wordWrap($line, $wrap_at);
 
@@ -289,19 +502,43 @@
       /** This translates "http://" into a link.  It could be made better to accept
           "www" and "mailto" also.  That should probably be added later. **/
       if (strpos(strtolower($line), "http://") != false) {
+         $line = ereg_replace("<BR>", "", $line);
          $start = strpos(strtolower($line), "http://");
-         $text = substr($line, $start, strlen($line));
-         $link = ereg_replace("<BR>", "", $text);
+         $link = substr($line, $start, strlen($line));
 
-         if (strpos($link, "&"))
-            $end = strpos($link, "&");
-         else if (strpos($link, "<"))
+         if (strpos($link, " ")) {
+            $end = strpos($link, " ")-1;
+         }
+         else if (strpos($link, "&nbsp;")) {
+            $end = strpos($link, "&nbsp;")-1;
+         }
+         else if (strpos($link, "<")) {
             $end = strpos($link, "<");
+         }
+         else if (strpos($link, ">")) {
+            $end = strpos($link, ">");
+         }
+         else if (strpos($link, "(")) {
+            $end = strpos($link, "(")-1;
+         }
+         else if (strpos($link, ")")) {
+            $end = strpos($link, ")")-1;
+         }
+         else if (strpos($link, "{")) {
+            $end = strpos($link, "{")-1;
+         }
+         else if (strpos($link, "}")) {
+            $end = strpos($link, "}")-1;
+         }
          else
             $end = strlen($link);
 
-         $link = substr($link, 0, $end);
-         $line = str_replace($text, "<A HREF=\"$link\" TARGET=_top>$text</A>", $line);
+         $link = substr($line, $start, $end);
+         $end = $end + $start;
+         $before = substr($line, 0, $start);
+         $after  = substr($line, $end, strlen($line));
+
+         $line = "$before<A HREF=\"$link\" TARGET=_top>$link</A>$after<BR>";
       }
 
       return $line;