X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fmime.php;h=4450529900b7abad21143a938f0db1a29a92931c;hb=5fe73b9fe94eb5de5ebcaf0e69d7e78f7ceeb946;hp=d19d6e0dcf0344ab13a8880d0552f2ab8787ad7d;hpb=e976319c39def9b07d04b41b8cf6f1918472bf9e;p=squirrelmail.git diff --git a/functions/mime.php b/functions/mime.php index d19d6e0d..44505299 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -15,31 +15,6 @@ require_once('../functions/imap.php'); require_once('../functions/attachment_common.php'); -/** Setting up the objects that have the structure for the message **/ -class msg_header { - /** msg_header contains generic variables for values that **/ - /** could be in a header. **/ - - var $type0 = '', $type1 = '', $boundary = '', $charset = '', - $encoding = '', $size = 0, $to = array(), $from = '', $date = '', - $cc = array(), $bcc = array(), $reply_to = '', $subject = '', - $id = 0, $mailbox = '', $description = '', $filename = '', - $entity_id = 0, $message_id = 0, $name = '', $priority = 3; -} - -class message { - /** message is the object that contains messages. It is a recursive - object in that through the $entities variable, it can contain - more objects of type message. See documentation in mime.txt for - a better description of how this works. - **/ - var $header = '', $entities = array(); - - function addEntity ($msg) { - $this->entities[] = $msg; - } -} - /* --------------------------------------------------------------------------------- */ /* MIME DECODING */ /* --------------------------------------------------------------------------------- */ @@ -48,41 +23,68 @@ class message { * It will return this object for use with all relevant header information and * fully parsed into the standard "message" object format. */ -function mime_structure ($imap_stream, $header) { - - $ssid = sqimap_session_id(); - $lsid = strlen( $ssid ); - $id = $header->id; - fputs ($imap_stream, "$ssid FETCH $id BODYSTRUCTURE\r\n"); - // - // This should use sqimap_read_data instead of reading it itself - // - $read = fgets ($imap_stream, 9216); - $bodystructure = ''; - while ( substr($read, 0, $lsid) <> $ssid && - !feof( $imap_stream ) ) { - $bodystructure .= $read; - $read = fgets ($imap_stream, 9216); - } - $read = $bodystructure; - // isolate the body structure and remove beginning and end parenthesis - $read = trim(substr ($read, strpos(strtolower($read), 'bodystructure') + 13)); +function mime_structure ($bodystructure, $flags=array()) { + + /* Isolate the body structure and remove beginning and end parenthesis. */ + $read = trim(substr ($bodystructure, strpos(strtolower($bodystructure), 'bodystructure') + 13)); $read = trim(substr ($read, 0, -1)); - $end = mime_match_parenthesis(0, $read); - while ($end == strlen($read)-1) { - $read = trim(substr ($read, 0, -1)); - $read = trim(substr ($read, 1)); - $end = mime_match_parenthesis(0, $read); + $msg =& new Message(); + $res = $msg->parseStructure($read); + $msg = $res[0]; + if (!is_object($msg)) { + include_once( '../functions/display_messages.php' ); + global $color, $mailbox; + displayPageHeader( $color, urldecode($mailbox) ); + echo "
\n\n" . + '' . htmlspecialchars($read) . ' |