X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_messages.php;h=98449ad9e079b567580e442a0dd9fd2b9f538364;hb=d36f3e63f3952acee3577825d9ecc5e45abcf028;hp=f80117992478c81544afc290aa05589e0e597920;hpb=8b673ac145ad6dc77796fc0c1ef48094c76b46e1;p=squirrelmail.git diff --git a/functions/imap_messages.php b/functions/imap_messages.php index f8011799..98449ad9 100755 --- a/functions/imap_messages.php +++ b/functions/imap_messages.php @@ -1,16 +1,17 @@ -"; - fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\n"); + fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\r\n"); $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message); } @@ -20,65 +21,126 @@ 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 { sqimap_messages_flag ($imap_stream, $start, $end, "Deleted"); } - if ($auto_expunge == true) - sqimap_mailbox_expunge ($imap_stream, $mailbox); } /****************************************************************************** ** Sets the specified messages with specified flag ******************************************************************************/ function sqimap_messages_flag ($imap_stream, $start, $end, $flag) { - fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\n"); + fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\r\n"); + $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 ******************************************************************************/ - function sqimap_get_small_header ($imap_stream, $id, &$from, &$subject, &$date) { - fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER.FIELDS (From Subject Date)]\n"); + 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 Cc Subject Message-Id X-Priority Content-Type)]\r\n"); $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message); + $subject = _("(no subject)"); + $from = _("Unknown Sender"); + $priority = "0"; + $messageid = "<>"; + + $g = 0; for ($i = 0; $i < count($read); $i++) { - if (strtolower(substr($read[$i], 0, 5)) == "from:") { - $from = sqimap_find_displayable_name(substr($read[$i], 5)); - } else if (strtolower(substr($read[$i], 0, 5)) == "date:") { - $date = substr($read[$i], 5); - } else if (strtolower(substr($read[$i], 0, 8)) == "subject:") { - $subject = htmlspecialchars(substr($read[$i], 8)); - if (strlen(trim($subject)) == 0) + 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 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]; + + $header = new small_header; + if ($sent == 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]; + + return $header; } /****************************************************************************** ** Returns the flags for the specified messages ******************************************************************************/ - function sqimap_get_flags ($imap_stream, $start, $end) { - fputs ($imap_stream, "a001 FETCH $start:$end FLAGS\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++; - } - return $flags; + if (ereg("FLAGS(.*)", $read[0], $regs)) + return explode(" ", trim(ereg_replace('[\(\)\\]', '', $regs[1]))); + return Array('None'); } /****************************************************************************** @@ -86,26 +148,29 @@ ** the documentation folder for more information about this array. ******************************************************************************/ function sqimap_get_message ($imap_stream, $id, $mailbox) { - $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["HEADER"]["ENCODING"]); - return $message; + $header = sqimap_get_message_header($imap_stream, $id, $mailbox); + $msg = sqimap_get_message_body($imap_stream, &$header); + return $msg; } /****************************************************************************** ** Wrapper function that reformats the header information. ******************************************************************************/ - function sqimap_get_message_header ($imap_stream, $id) { - fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\n"); + function sqimap_get_message_header ($imap_stream, $id, $mailbox) { + fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\r\n"); $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message); - return sqimap_get_header($imap_stream, $read); + $header = sqimap_get_header($imap_stream, $read); + $header->id = $id; + $header->mailbox = $mailbox; + + return $header; } /****************************************************************************** ** Wrapper function that returns entity headers for use by decodeMime ******************************************************************************/ + /* function sqimap_get_entity_header ($imap_stream, &$read, &$type0, &$type1, &$bound, &$encoding, &$charset, &$filename) { $header = sqimap_get_header($imap_stream, $read); $type0 = $header["TYPE0"]; @@ -115,37 +180,51 @@ $charset = $header["CHARSET"]; $filename = $header["FILENAME"]; } + */ /****************************************************************************** ** 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 + $hdr->type0 = "text"; + $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") { - $header["MIME"] = true; + $hdr->mime = true; $i++; } /** ENCODING TYPE **/ else if (substr(strtolower($read[$i]), 0, 26) == "content-transfer-encoding:") { - $header["ENCODING"] = strtolower(trim(substr($read[$i], 26))); + $hdr->encoding = strtolower(trim(substr($read[$i], 26))); $i++; } /** CONTENT-TYPE **/ - else if (substr($read[$i], 0, 13) == "Content-Type:") { + else if (strtolower(substr($read[$i], 0, 13)) == "content-type:") { $cont = strtolower(trim(substr($read[$i], 13))); 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); + $hdr->type0 = substr($cont, 0, strpos($cont, "/")); + $hdr->type1 = substr($cont, strpos($cont, "/")+1); } else { - $header["TYPE0"] = $cont; + $hdr->type0 = $cont; } + $line = $read[$i]; $i++; while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) { @@ -156,16 +235,8 @@ } /** Detect the boundary of a multipart message **/ - if (strpos(strtolower(trim($line)), "boundary=")) { - $pos = strpos($line, "boundary=") + 9; - $bound = trim($line); - if (strpos($line, " ", $pos) > 0) { - $bound = substr($bound, $pos, strpos($line, " ", $pos)); - } else { - $bound = substr($bound, $pos); - } - $bound = str_replace("\"", "", $bound); - $header["BOUNDARY"] = $bound; + if (eregi("boundary=\"([^\"]+)\"", $line, $regs)) { + $hdr->boundary = $regs[1]; } /** Detect the charset **/ @@ -178,14 +249,28 @@ $charset = substr($charset, $pos); } $charset = str_replace("\"", "", $charset); - $header["CHARSET"] = $charset; + $hdr->charset = $charset; } else { - $header["CHARSET"] = "us-ascii"; + $hdr->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)); @@ -193,21 +278,21 @@ $name = substr($name, $pos); } $name = str_replace("\"", "", $name); - $header["FILENAME"] = $name; + $hdr->filename = $name; } } /** REPLY-TO **/ else if (strtolower(substr($read[$i], 0, 9)) == "reply-to:") { - $header["REPLYTO"] = trim(substr($read[$i], 9, strlen($read[$i]))); + $hdr->replyto = trim(substr($read[$i], 9, strlen($read[$i]))); $i++; } /** FROM **/ else if (strtolower(substr($read[$i], 0, 5)) == "from:") { - $header["FROM"] = trim(substr($read[$i], 5, strlen($read[$i]) - 6)); - if ($header["REPLYTO"] == "") - $header["REPLYTO"] = $header["FROM"]; + $hdr->from = trim(substr($read[$i], 5, strlen($read[$i]) - 6)); + if ($hdr->replyto == "") + $hdr->replyto = $hdr->from; $i++; } /** DATE **/ @@ -216,77 +301,79 @@ $d = trim($d); $d = ereg_replace(" ", " ", $d); $d = explode(" ", $d); - $header["DATE"] = getTimeStamp($d); + $hdr->date = getTimeStamp($d); $i++; } /** SUBJECT **/ 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)"); + $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 **/ else if (strtolower(substr($read[$i], 0, 3)) == "cc:") { $pos = 0; - $header["CC"][$pos] = trim(substr($read[$i], 4)); + $hdr->cc[$pos] = trim(substr($read[$i], 4)); $i++; - while ((substr($read[$i], 0, 1) == " ") && (trim($read[$i]) != "")) { + while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){ $pos++; - $header["CC"][$pos] = trim($read[$i]); + $hdr->cc[$pos] = trim($read[$i]); $i++; } } /** TO **/ else if (strtolower(substr($read[$i], 0, 3)) == "to:") { $pos = 0; - $header["TO"][$pos] = trim(substr($read[$i], 4)); + $hdr->to[$pos] = trim(substr($read[$i], 4)); $i++; - while ((substr($read[$i], 0, 1) == " ") && (trim($read[$i]) != "")){ + while (((substr($read[$i], 0, 1) == " ") || (substr($read[$i], 0, 1) == "\t")) && (trim($read[$i]) != "")){ $pos++; - $header["TO"][$pos] = trim($read[$i]); + $hdr->to[$pos] = trim($read[$i]); $i++; } } + /** MESSAGE ID **/ + else if (strtolower(substr($read[$i], 0, 11)) == "message-id:") { + $hdr->message_id = trim(substr($read[$i], 11)); + $i++; + } + /** ERROR CORRECTION **/ else if (substr($read[$i], 0, 1) == ")") { - if ($header["SUBJECT"] == "") - $header["SUBJECT"] = _("(no subject)"); + if (strlen(trim($hdr->subject)) == 0) + $hdr->subject = _("(no subject)"); - if ($header["FROM"] == "") - $header["FROM"] = _("(unknown sender)"); + if (strlen(trim($hdr->from)) == 0) + $hdr->from = _("(unknown sender)"); - if ($header["DATE"] == "") - $header["DATE"] = time(); + if (strlen(trim($hdr->date)) == 0) + $hdr->date = time(); $i++; } else { $i++; } } - return $header; + return $hdr; } /****************************************************************************** ** Returns the body of a message. ******************************************************************************/ - 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)-1) { - if ( ($i != 0) ) { - $bodytmp[$j] = $read[$i]; - $j++; - } - $i++; - } - $body = $bodytmp; - - return decodeMime($body, $bound, $type0, $type1, $encoding); + function sqimap_get_message_body ($imap_stream, &$header) { + $id = $header->id; + return decodeMime($imap_stream, $body, &$header); } + + + /****************************************************************************** + ** Returns an array with the body structure + ******************************************************************************/ ?>