X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_messages.php;h=00ca7ef83582f04704bf87e34ea0394fce9b5578;hb=cd2b718266525681ee78a3f4eaa77fc30b79180e;hp=9af572e9fb907efecee8fa80428abfe3fa1cb52b;hpb=8fca0a655858da407d32d6d165c326a1c8738f73;p=squirrelmail.git diff --git a/functions/imap_messages.php b/functions/imap_messages.php index 9af572e9..00ca7ef8 100755 --- a/functions/imap_messages.php +++ b/functions/imap_messages.php @@ -2,10 +2,14 @@ /** ** imap_messages.php ** - ** This implements functions that manipulate messages + ** This implements functions that manipulate messages + ** + ** $Id$ **/ - if (!isset($mime_php)) include "../functions/mime.php"; + if (defined ('imap_messages_php')) + return; + define ('imap_messages_php', true); /****************************************************************************** ** Copies specified messages to specified folder @@ -21,7 +25,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 { @@ -37,75 +41,196 @@ $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message); } + + /****************************************************************************** + ** Remove specified flag from specified messages + ******************************************************************************/ + function sqimap_messages_remove_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 ******************************************************************************/ class small_header { - var $from, $subject, $date, $to, $priority, $message_id; + var $from = '', $subject = '', $date = '', $to = '', + $priority = 0, $message_id = 0, $cc = ''; } function sqimap_get_small_header ($imap_stream, $id, $sent) { + $res = sqimap_get_small_header_list($imap_stream, array($id), $sent); + return $res[0]; + } + + // Sort the message list and crunch to be as small as possible + // (overflow could happen, so make it small if possible) + function sqimap_message_list_squisher($messages_array) { + sort($messages_array, SORT_NUMERIC); + $msgs_str = ''; + while ($messages_array) { + $start = array_shift($messages_array); + $end = $start; + while (isset($messages_array[0]) && $messages_array[0] == $end + 1) + $end = array_shift($messages_array); + if ($msgs_str != '') + $msgs_str .= ','; + $msgs_str .= $start; + if ($start != $end) + $msgs_str .= ':' . $end; + } + + return $msgs_str; + } - 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); + function sqimap_get_small_header_list ($imap_stream, $msg_list, $issent) { + global $squirrelmail_language, $color; - $subject = _("(no subject)"); - $from = _("Unknown Sender"); - $priority = "0"; - $messageid = "<>"; - - $g = 0; - for ($i = 0; $i < count($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 (trim($subject) == "") - $subject = _("(no subject)"); - } - } + /* Get the small headers for each message in $msg_list */ + + $maxmsg = sizeof($msg_list); + $msgs_str = sqimap_message_list_squisher($msg_list); + $results = array(); + $read_list = array(); + $sizes_list = array(); - // 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); + /* We need to return the data in the same order as the caller supplied + in $msg_list, but IMAP servers are free to return responses in + whatever order they wish... So we need to re-sort manually */ + + for ($i = 0; $i < sizeof($msg_list); $i++) { + $id2index[$msg_list[$i]] = $i; } - $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; + $query = "a001 FETCH $msgs_str BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject Message-Id X-Priority Content-Type)]\r\n"; + fputs ($imap_stream, $query); + $readin_list = sqimap_read_data_list($imap_stream, "a001", true, $response, $message); - return $header; + + foreach ($readin_list as $r) { + if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) { + set_up_language($squirrelmail_language); + echo "
\n"; + echo _("ERROR : Could not complete request."); + echo "
\n"; + echo _("Unknown response from IMAP server: "); + echo $r[0] . "
\n"; + exit; + } + if (! isset($id2index[$regs[1]]) || !count($id2index[$regs[1]])) { + set_up_language($squirrelmail_language); + echo "
\n"; + echo _("ERROR : Could not complete request."); + echo "
\n"; + echo _("Unknown message number in reply from server: "); + echo $regs[1] . "
\n"; + exit; + } + $read_list[$id2index[$regs[1]]] = $r; + } + arsort($read_list); + + $query = "a002 FETCH $msgs_str RFC822.SIZE\r\n"; + fputs ($imap_stream, $query); + $sizesin_list = sqimap_read_data_list($imap_stream, "a002", true, $response, $message); + + foreach ($sizesin_list as $r) { + if (!eregi("^\\* ([0-9]+) FETCH", $r[0], $regs)) { + set_up_language($squirrelmail_language); + echo "
\n"; + echo _("ERROR : Could not complete request."); + echo "
\n"; + echo _("Unknown response from IMAP server: "); + echo $r[0] . "
\n"; + exit; + } + if (!count($id2index[$regs[1]])) { + set_up_language($squirrelmail_language); + echo "
\n"; + echo _("ERROR : Could not complete request."); + echo "
\n"; + echo _("Unknown messagenumber in reply from server: "); + echo $regs[1] . "
\n"; + exit; + } + $sizes_list[$id2index[$regs[1]]] = $r; + } + arsort($sizes_list); + + for ($msgi = 0; $msgi < $maxmsg; $msgi++) { + $subject = _("(no subject)"); + $from = _("Unknown Sender"); + $priority = 0; + $messageid = "<>"; + $cc = ""; + $to = ""; + $date = ""; + $type[0] = ""; + $type[1] = ""; + $read = $read_list[$msgi]; + + for ($i = 0; $i < count($read); $i++) { + if (eregi ("^to:(.*)$", $read[$i], $regs)) { + //$to = sqimap_find_displayable_name(substr($read[$i], 3)); + $to = $regs[1]; + } else if (eregi ("^from:(.*)$", $read[$i], $regs)) { + //$from = sqimap_find_displayable_name(substr($read[$i], 5)); + $from = $regs[1]; + } else if (eregi ("^x-priority:(.*)$", $read[$i], $regs)) { + $priority = trim($regs[1]); + } else if (eregi ("^message-id:(.*)$", $read[$i], $regs)) { + $messageid = trim($regs[1]); + } else if (eregi ("^cc:(.*)$", $read[$i], $regs)) { + $cc = $regs[1]; + } else if (eregi ("^date:(.*)$", $read[$i], $regs)) { + $date = $regs[1]; + } else if (eregi ("^subject:(.*)$", $read[$i], $regs)) { + $subject = htmlspecialchars(trim($regs[1])); + if ($subject == "") + $subject = _("(no subject)"); + } else if (eregi ("^content-type:(.*)$", $read[$i], $regs)) { + $type = strtolower(trim($regs[1])); + if ($pos = strpos($type, ";")) + $type = substr($type, 0, $pos); + $type = explode("/", $type); + if (! isset($type[1])) + $type[1] = ''; + } + + } + if (trim($date) == "") { + fputs($imap_stream, "a002 FETCH $msg_list[$msgi] INTERNALDATE\r\n"); + $readdate = sqimap_read_data($imap_stream, "a002", true, $response, $message); + if (eregi(".*INTERNALDATE \"(.*)\".*", $readdate[0], $regs)) { + $date_list = explode(" ", trim($regs[1])); + $date_list[0] = str_replace("-", " ", $date_list[0]); + $date = implode(" ", $date_list); + } + } + eregi("([0-9]+)[^0-9]*$", $sizes_list[$msgi][0], $regs); + $size = $regs[1]; + + $header = new small_header; + if ($issent == true) + $header->from = (trim($to) != '')? $to : _("(only Cc/Bcc)"); + 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; + $header->type0 = $type[0]; + $header->type1 = $type[1]; + + $result[] = $header; + } + return $result; } /****************************************************************************** @@ -114,17 +239,36 @@ 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); - 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"; + if (ereg("FLAGS(.*)", $read[0], $regs)) + return explode(" ", trim(ereg_replace('[\\(\\)\\\\]', '', $regs[1]))); + return Array('None'); + } + + function sqimap_get_flags_list ($imap_stream, $msg_list) { + $msgs_str = sqimap_message_list_squisher($msg_list); + for ($i = 0; $i < sizeof($msg_list); $i++) { + $id2index[$msg_list[$i]] = $i; + } + fputs ($imap_stream, "a001 FETCH $msgs_str FLAGS\r\n"); + $result_list = sqimap_read_data_list ($imap_stream, "a001", true, $response, $message); + $result_flags = array(); + + for ($i = 0; $i < sizeof($result_list); $i++) { + if (eregi("^\\* ([0-9]+).*FETCH.*FLAGS(.*)", $result_list[$i][0], $regs) + && isset($id2index[$regs[1]]) && count($id2index[$regs[1]])) { + $result_flags[$id2index[$regs[1]]] = explode(" ", trim(ereg_replace('[\\(\\)\\\\]', '', $regs[2]))); + } else { + set_up_language($squirrelmail_language); + echo "
\n"; + echo _("ERROR : Could not complete request."); + echo "
\n"; + echo _("Unknown response from IMAP server: "); + echo $result_list[$i][0] . "
\n"; + exit; + } } - return $flags; + arsort($result_flags); + return $result_flags; } /****************************************************************************** @@ -133,8 +277,7 @@ ******************************************************************************/ 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; + return sqimap_get_message_body($imap_stream, $header); } /****************************************************************************** @@ -216,7 +359,7 @@ } /** Detect the boundary of a multipart message **/ - if (eregi("boundary=\"([^\"]+)\"", $line, $regs)) { + if (eregi('boundary="([^"]+)"', $line, $regs)) { $hdr->boundary = $regs[1]; } @@ -224,8 +367,8 @@ 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)); + if (strpos($line, ";", $pos) > 0) { + $charset = substr($charset, $pos, strpos($line, ";", $pos)-$pos); } else { $charset = substr($charset, $pos); } @@ -237,7 +380,7 @@ } - else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") { + else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") { /** Add better dontent-disposition support **/ $line = $read[$i]; @@ -272,7 +415,7 @@ /** FROM **/ else if (strtolower(substr($read[$i], 0, 5)) == "from:") { $hdr->from = trim(substr($read[$i], 5, strlen($read[$i]) - 6)); - if ($hdr->replyto == "") + if (! isset($hdr->replyto) || $hdr->replyto == "") $hdr->replyto = $hdr->from; $i++; } @@ -280,8 +423,8 @@ else if (strtolower(substr($read[$i], 0, 5)) == "date:") { $d = substr($read[$i], 5); $d = trim($d); - $d = ereg_replace(" ", " ", $d); - $d = explode(" ", $d); + $d = strtr($d, array(' ' => ' ')); + $d = explode(' ', $d); $hdr->date = getTimeStamp($d); $i++; } @@ -350,7 +493,7 @@ ******************************************************************************/ function sqimap_get_message_body ($imap_stream, &$header) { $id = $header->id; - return decodeMime($imap_stream, $body, &$header); + return decodeMime($imap_stream, $header); }