X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_messages.php;h=9f147d2d233bd9a28b1e32134365b0afd57a9ff7;hb=fde32e3fc4afc7038da1ccfc9bea91be85efdb17;hp=8e4be59fa766abaa1a6667b1258faddd56ea1243;hpb=8beafbbc32f58365b2d541d42d6c81ebf8f8f74e;p=squirrelmail.git diff --git a/functions/imap_messages.php b/functions/imap_messages.php index 8e4be59f..9f147d2d 100755 --- a/functions/imap_messages.php +++ b/functions/imap_messages.php @@ -5,7 +5,7 @@ ** This implements functions that manipulate messages **/ - if (!$mime_php) include "../functions/mime.php"; + if (!isset($mime_php)) include "../functions/mime.php"; /****************************************************************************** ** Copies specified messages to specified folder @@ -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 { @@ -40,43 +40,79 @@ /****************************************************************************** ** Returns some general header information -- FROM, DATE, and SUBJECT ******************************************************************************/ - class small_header { - var $from, $subject, $date; - } + class small_header { + var $from, $subject, $date, $to, $priority, $message_id; + } function sqimap_get_small_header ($imap_stream, $id, $sent) { - fputs ($imap_stream, "a001 FETCH $id BODY.PEEK[HEADER.FIELDS (Date To From Subject)]\r\n"); + + fputs ($imap_stream, "a001 FETCH $id BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority)]\r\n"); $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message); $subject = _("(no subject)"); $from = _("Unknown Sender"); - $g = 0; + $priority = "0"; + $messageid = "<>"; + + $g = 0; for ($i = 0; $i < count($read); $i++) { - if ($sent == true) { - if (eregi ("^to:", $read[$i])) { - $from = sqimap_find_displayable_name(substr($read[$i], 3)); - } - } else { - if (eregi ("^from:", $read[$i])) { - $from = sqimap_find_displayable_name(substr($read[$i], 5)); - } - } - - if (eregi ("^date:", $read[$i])) { + if (eregi ("^to:", $read[$i])) { + //$to = sqimap_find_displayable_name(substr($read[$i], 3)); + $to = substr($read[$i], 3); + } else if (eregi ("^from:", $read[$i])) { + //$from = sqimap_find_displayable_name(substr($read[$i], 5)); + $from = substr($read[$i], 5); + } else if (eregi ("^x-priority:", $read[$i])) { + $priority = trim(substr($read[$i], 11)); + } else if (eregi ("^message-id:", $read[$i])) { + $messageid = trim(substr($read[$i], 11)); + } else if (eregi ("^cc:", $read[$i])) { + $cc = substr($read[$i], 3); + } else if (eregi ("^date:", $read[$i])) { $date = substr($read[$i], 5); } else if (eregi ("^subject:", $read[$i])) { $subject = htmlspecialchars(eregi_replace ("^subject: ", "", $read[$i])); - if (strlen(Chop($subject)) == 0) + if (trim($subject) == "") $subject = _("(no subject)"); } - } + } - $header = new small_header; - $header->from = $from; - $header->date = $date; - $header->subject = $subject; + // If there isn't a date, it takes the internal date and uses + // that as the normal date. + if (trim($date) == "") { + fputs ($imap_stream, "a002 FETCH $id INTERNALDATE\r\n"); + $internal_read = sqimap_read_data ($imap_stream, "a002", true, $r, $m); + + // * 22 FETCH (INTERNALDATE " 8-Sep-2000 13:17:07 -0500") + $date = $internal_read[0]; + $date = eregi_replace(".*internaldate \"", "", $date); + $date = eregi_replace("\".*", "", $date); + $date_ary = explode(" ", trim($date)); + $date_ary[0] = str_replace("-", " ", $date_ary[0]); + $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; + else + $header->from = $from; + + $header->date = $date; + $header->subject = $subject; + $header->to = $to; + $header->priority = $priority; + $header->message_id = $messageid; + $header->cc = $cc; + $header->size = $size; - return $header; + return $header; } /****************************************************************************** @@ -103,7 +139,6 @@ ** the documentation folder for more information about this array. ******************************************************************************/ function sqimap_get_message ($imap_stream, $id, $mailbox) { - $header = sqimap_get_message_header($imap_stream, $id, $mailbox); $msg = sqimap_get_message_body($imap_stream, &$header); return $msg; @@ -142,6 +177,8 @@ ** Queries the IMAP server and gets all header information. ******************************************************************************/ function sqimap_get_header ($imap_stream, $read) { + global $where, $what; + $hdr = new msg_header(); $i = 0; // Set up some defaults @@ -149,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; @@ -260,6 +300,10 @@ $hdr->subject = trim(substr($read[$i], 8, strlen($read[$i]) - 9)); if (strlen(Chop($hdr->subject)) == 0) $hdr->subject = _("(no subject)"); + + if ($where == "SUBJECT") { + $hdr->subject = eregi_replace($what, "\\0", $hdr->subject); + } $i++; } /** CC **/ @@ -316,19 +360,7 @@ ******************************************************************************/ function sqimap_get_message_body ($imap_stream, &$header) { $id = $header->id; - //fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\r\n"); - //$read = sqimap_read_data ($imap_stream, "a001", true, $response, $message); - - $i = 0; - $j = 0; - while ($i < count($read)-1) { - if ( ($i != 0) ) { - $body[$j] = $read[$i]; - $j++; - } - $i++; - } - return decodeMime($body, &$header); + return decodeMime($imap_stream, $body, &$header); }