fixed login problems

[squirrelmail.git] / functions / imap_messages.php

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index ab98668843ffcefffa0ed67fbf5b787cbd202dd1..58a22869b5d97e5d4d15f5f2dbd547ca5b6806e5 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -25,8 +25,6 @@
       } else {
          sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
       }
-      if ($auto_expunge == true)
-         sqimap_mailbox_expunge ($imap_stream, $mailbox);
    }
 
    /******************************************************************************
@@ -41,18 +39,18 @@
     **  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)\n");
+      fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER.FIELDS (From Subject Date)]\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
 
       for ($i = 0; $i < count($read); $i++) {
-         if (substr($read[$i], 0, 5) == "From:") {
+         if (strtolower(substr($read[$i], 0, 5)) == "from:") {
             $from = sqimap_find_displayable_name(substr($read[$i], 5));
-         } else if (substr($read[$i], 0, 5) == "Date:") {
+         } else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
             $date = substr($read[$i], 5);
-         } else if (substr($read[$i], 0, 8) == "Subject:") {
+         } else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
             $subject = htmlspecialchars(substr($read[$i], 8));
             if (strlen(trim($subject)) == 0)
-               $subject = "(no subject)";
+               $subject = _("(no subject)");
          }
       }
    }
@@ -60,7 +58,24 @@
    /******************************************************************************
     **  Returns the flags for the specified messages 
     ******************************************************************************/
-   function sqimap_get_flags () {
+   function sqimap_get_flags ($imap_stream, $start, $end) {
+      fputs ($imap_stream, "a001 FETCH $start:$end FLAGS\n");
+      $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+      $i = 0;
+      while ($i < count($read)) {
+         if (strpos($read[$i], "FLAGS")) {
+            $tmp = ereg_replace("\(", "", $read[$i]);
+            $tmp = ereg_replace("\)", "", $tmp);
+            $tmp = str_replace("\\", "", $tmp);
+            $tmp = substr($tmp, strpos($tmp, "FLAGS")+6, strlen($tmp));
+            $tmp = trim($tmp);
+            $flags[$i] = explode(" ", $tmp);
+         } else {
+            $flags[$i][0] = "None";
+         }
+         $i++;
+      }
+      return $flags;
    }
 
    /******************************************************************************
@@ -71,7 +86,7 @@
       $message["INFO"]["ID"] = $id;
       $message["INFO"]["MAILBOX"] = $mailbox;
       $message["HEADER"] = sqimap_get_message_header($imap_stream, $id);
-      $message["ENTITIES"] = sqimap_get_message_body($imap_stream, $message["HEADER"]["BOUNDARY"], $id, $message["HEADER"]["TYPE0"], $message["HEADER"]["TYPE1"]);
+      $message["ENTITIES"] = sqimap_get_message_body($imap_stream, $message["HEADER"]["BOUNDARY"], $id, $message["HEADER"]["TYPE0"], $message["HEADER"]["TYPE1"], $message["HEADER"]["ENCODING"]);
       return $message;
    }
 
@@ -79,7 +94,7 @@
     **  Wrapper function that reformats the header information.
     ******************************************************************************/
    function sqimap_get_message_header ($imap_stream, $id) {
-      fputs ($imap_stream, "a001 FETCH $id:$id RFC822.HEADER\n");
+      fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
      
       return sqimap_get_header($imap_stream, $read); 
@@ -104,6 +119,11 @@
    function sqimap_get_header ($imap_stream, $read) {
       $i = 0;
       while ($i < count($read)) {
+         // Set up some defaults
+         $header["TYPE0"] = "text";
+         $header["TYPE1"] = "plain";
+         $header["CHARSET"] = "us-ascii";
+         
          if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
             $header["MIME"] = true;
             $i++;
@@ -121,6 +141,7 @@
             if (strpos($cont, ";"))
                $cont = substr($cont, 0, strpos($cont, ";"));
 
+
             if (strpos($cont, "/")) {
                $header["TYPE0"] = substr($cont, 0, strpos($cont, "/"));
                $header["TYPE1"] = substr($cont, strpos($cont, "/")+1);
@@ -205,7 +226,7 @@
          else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
             $header["SUBJECT"] = trim(substr($read[$i], 8, strlen($read[$i]) - 9));
             if (strlen(Chop($header["SUBJECT"])) == 0)
-               $header["SUBJECT"] = "(no subject)";
+               $header["SUBJECT"] = _("(no subject)");
             $i++;
          }
          /** CC **/
@@ -234,10 +255,10 @@
          /** ERROR CORRECTION **/
          else if (substr($read[$i], 0, 1) == ")") {
             if ($header["SUBJECT"] == "")
-                $header["SUBJECT"] = "(no subject)";
+                $header["SUBJECT"] = _("(no subject)");
 
             if ($header["FROM"] == "")
-                $header["FROM"] = "(unknown sender)";
+                $header["FROM"] = _("(unknown sender)");
 
             if ($header["DATE"] == "")
                 $header["DATE"] = time();
@@ -250,23 +271,25 @@
       return $header;
    }
 
+
    /******************************************************************************
     **  Returns the body of a message.
     ******************************************************************************/
-   function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1) {
+   function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1, $encoding) {
       fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
        
       $i = 0;
       $j = 0;
-      while ($i < count($read)) {
-         if ( ($i != 0) && ($i != count($read)-1) && ($i != count($read)) ) {
+      while ($i < count($read)-1) {
+         if ( ($i != 0) ) {
             $bodytmp[$j] = $read[$i];
             $j++;
          }
          $i++;
       }
       $body = $bodytmp;
-      return decodeMime($body, $bound, $type0, $type1);
+
+      return decodeMime($body, $bound, $type0, $type1, $encoding);
    }
-?>   
+?>