added folders_subscribe

[squirrelmail.git] / functions / imap_messages.php

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index fb996501d9158669df0eada5bcdd4e093294872f..8604bb876c8707a8ab3121b74d64bb12665639c9 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -33,15 +33,18 @@
    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 BODY[HEADER.FIELDS (From Subject Date)]\r\n");
+      fputs ($imap_stream, "a001 FETCH $id:$id RFC822.HEADER.LINES (From Subject Date)\r\n");
       $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
 
+      $subject = _("(no subject)");
+      $from = _("Unknown Sender");
       for ($i = 0; $i < count($read); $i++) {
          if (strtolower(substr($read[$i], 0, 5)) == "from:") {
             $from = sqimap_find_displayable_name(substr($read[$i], 5));
@@ -58,22 +61,18 @@
    /******************************************************************************
     **  Returns the flags for the specified messages 
     ******************************************************************************/
-   function sqimap_get_flags ($imap_stream, $start, $end) {
-      fputs ($imap_stream, "a001 FETCH $start:$end FLAGS\r\n");
+   function sqimap_get_flags ($imap_stream, $i) {
+      fputs ($imap_stream, "a001 FETCH $i:$i FLAGS\r\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++;
+      if (strpos($read[0], "FLAGS")) {
+         $tmp = ereg_replace("\(", "", $read[0]);
+         $tmp = ereg_replace("\)", "", $tmp);
+         $tmp = str_replace("\\", "", $tmp);
+         $tmp = substr($tmp, strpos($tmp, "FLAGS")+6, strlen($tmp));
+         $tmp = trim($tmp);
+         $flags = explode(" ", $tmp);
+      } else {
+         $flags[0] = "None";
       }
       return $flags;
    }
@@ -187,9 +186,23 @@
                $header["CHARSET"] = "us-ascii";
             }
 
+         }
+
+         else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") {   
+            /** Add better dontent-disposition support **/
+            
+            $line = $read[$i];
+            $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++;
+            }
+
             /** Detects filename if any **/
-            if (strpos(strtolower(trim($line)), "name=")) {
-               $pos = strpos($line, "name=") + 5;
+            if (strpos(strtolower(trim($line)), "filename=")) {
+               $pos = strpos($line, "filename=") + 9;
                $name = trim($line);
                if (strpos($line, " ", $pos) > 0) {
                   $name = substr($name, $pos, strpos($line, " ", $pos));