- improved date parsing

[squirrelmail.git] / functions / imap_messages.php

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 9af572e9fb907efecee8fa80428abfe3fa1cb52b..9f147d2d233bd9a28b1e32134365b0afd57a9ff7 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -21,7 +21,7 @@
    function sqimap_messages_delete ($imap_stream, $start, $end, $mailbox) {
       global $move_to_trash, $trash_folder, $auto_expunge;
 
-      if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder))) {
+      if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) {
          sqimap_messages_copy ($imap_stream, $start, $end, $trash_folder);
          sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
       } else {
@@ -92,6 +92,12 @@
          $date = implode (" ", $date_ary);
       }
 
+      fputs ($imap_stream, "a003 FETCH $id RFC822.SIZE\r\n");
+      $read = sqimap_read_data($imap_stream, "a003", true, $r, $m);
+      preg_match("/([0-9]+)\)\s*$/i", $read[0], $regs);
+      $size = $regs[1] / 1024;
+      settype($size, "integer");
+      
       $header = new small_header;
       if ($sent == true)
          $header->from = $to;
@@ -104,6 +110,7 @@
       $header->priority = $priority;
       $header->message_id = $messageid;
       $header->cc = $cc;
+      $header->size = $size;
 
       return $header;
    }
@@ -179,6 +186,9 @@
       $hdr->type1 = "plain";
       $hdr->charset = "us-ascii";
 
+      preg_match("/\{([0-9]+)\}/", $read[$i], $regs);
+      preg_match("/[0-9]+/", $regs[0], $regs);
+
       while ($i < count($read)) {
          if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
             $hdr->mime = true;