diff --git a/functions/mime.php b/functions/mime.php index 3c8418a92..3bdfedf23 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -6,14 +6,11 @@ ** ** $Id$ **/ - + if (defined('mime_php')) return; define('mime_php', true); - global $debug_mime; - $debug_mime = false; - require_once('../functions/imap.php'); /** Setting up the objects that have the structure for the message **/ @@ -21,59 +18,56 @@ class msg_header { /** msg_header contains generic variables for values that **/ /** could be in a header. **/ - + var $type0 = '', $type1 = '', $boundary = '', $charset = ''; var $encoding = '', $size = 0, $to = array(), $from = '', $date = ''; var $cc = array(), $bcc = array(), $reply_to = '', $subject = ''; var $id = 0, $mailbox = '', $description = '', $filename = ''; var $entity_id = 0, $message_id = 0, $name = ''; } - + class message { /** message is the object that contains messages. It is a recursive - object in that through the $entities variable, it can contain + 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 = ''; var $entities = array(); - + function addEntity ($msg) { $this->entities[] = $msg; } } - - /* --------------------------------------------------------------------------------- */ /* MIME DECODING */ /* --------------------------------------------------------------------------------- */ - + // This function gets the structure of a message and stores it in the "message" class. // 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) { - global $debug_mime; - sqimap_messages_flag ($imap_stream, $header->id, $header->id, "Seen"); - + + sqimap_messages_flag ($imap_stream, $header->id, $header->id, 'Seen'); + $ssid = sqimap_session_id(); + $lsid = strlen( $ssid ); $id = $header->id; - fputs ($imap_stream, sqimap_session_id() . " FETCH $id BODYSTRUCTURE\r\n"); + fputs ($imap_stream, "$ssid FETCH $id BODYSTRUCTURE\r\n"); // // This should use sqimap_read_data instead of reading it itself // - $sid = sqimap_session_id(); - $lsid = strlen( $sid ); $read = fgets ($imap_stream, 10000); - $bodystructure = ""; - while( substr($read, 0, $lsid) <> $sid && !feof( $imap_stream ) ) { + $bodystructure = ''; + while( substr($read, 0, $lsid) <> $ssid && + !feof( $imap_stream ) ) { $bodystructure .= $read; $read = fgets ($imap_stream, 10000); } $read = $bodystructure; - if ($debug_mime) echo "$read

\n"; // isolate the body structure and remove beginning and end parenthesis - $read = trim(substr ($read, strpos(strtolower($read), "bodystructure") + 13)); + $read = trim(substr ($read, strpos(strtolower($read), 'bodystructure') + 13)); $read = trim(substr ($read, 0, -1)); $end = mime_match_parenthesis(0, $read); while ($end == strlen($read)-1) { @@ -82,8 +76,6 @@ $end = mime_match_parenthesis(0, $read); } - if ($debug_mime) echo "$read

\n"; - $msg = mime_parse_structure ($read, 0); $msg->header = $header; return $msg; @@ -97,30 +89,24 @@ // then it parses it and adds the necessary header information (by calling out // to mime_get_elements() function mime_parse_structure ($structure, $ent_id) { - global $debug_mime; - if ($debug_mime) echo "START: mime_parse_structure()
\n"; + $msg = new message(); - if (substr($structure, 0, 1) == "(") { + if ($structure{0} == '(') { $ent_id = mime_new_element_level($ent_id); $start = $end = -1; - if ($debug_mime) echo "
$structure
"; do { - if ($debug_mime) echo "Found entity...
"; $start = $end+1; $end = mime_match_parenthesis ($start, $structure); - + $element = substr($structure, $start+1, ($end - $start)-1); $ent_id = mime_increment_id ($ent_id); $newmsg = mime_parse_structure ($element, $ent_id); $msg->addEntity ($newmsg); - } while (substr($structure, $end+1, 1) == "("); + } while ($structure{$end+1} == '('); } else { // parse the elements - if ($debug_mime) echo "
$structure
"; $msg = mime_get_element ($structure, $msg, $ent_id); - if ($debug_mime) echo "
"; } - if ($debug_mime) echo "  END: mime_parse_structure()
"; return $msg; } @@ -128,7 +114,7 @@ // the following: 1, 1.2, 4.3.2.4.1, etc. This function increments // the last number of the element id, changing 1.2 to 1.3. function mime_increment_id ($id) { - global $debug_mime; + if (strpos($id, ".")) { $first = substr($id, 0, strrpos($id, ".")); $last = substr($id, strrpos($id, ".")+1); @@ -137,49 +123,51 @@ } else { $new = $id + 1; } - if ($debug_mime) echo "INCREMENT: $new
"; + return $new; } // See comment for mime_increment_id(). // This adds another level on to the entity_id changing 1.3 to 1.3.0 - // NOTE: 1.3.0 is not a valid element ID. It MUST be incremented + // NOTE: 1.3.0 is not a valid element ID. It MUST be incremented // before it can be used. I left it this way so as not to have // to make a special case if it is the first entity_id. It // always increments it, and that works fine. function mime_new_element_level ($id) { - if (!$id) $id = 0; - else $id = $id . ".0"; - return $id; + if (!$id) { + $id = 0; + } else { + $id = $id . '.0'; + } + + return( $id ); } function mime_get_element (&$structure, $msg, $ent_id) { - global $debug_mime; + $elem_num = 1; $msg->header = new msg_header(); $msg->header->entity_id = $ent_id; $properties = array(); - + while (strlen($structure) > 0) { $structure = trim($structure); - $char = substr($structure, 0, 1); + $char = $structure{0}; - if (strtolower(substr($structure, 0, 3)) == "nil") { - $text = ""; + if (strtolower(substr($structure, 0, 3)) == 'nil') { + $text = ''; $structure = substr($structure, 3); - } else if ($char == "\"") { + } else if ($char == '"') { // loop through until we find the matching quote, and return that as a string $pos = 1; - $char = substr($structure, $pos, 1); - $text = ""; - while ($char != "\"" && $pos < strlen($structure)) { + $text = ''; + while ( ($char = $structure{$pos} ) <> '"' && $pos < strlen($structure)) { $text .= $char; $pos++; - $char = substr($structure, $pos, 1); - } + } $structure = substr($structure, strlen($text) + 2); - } else if ($char == "(") { + } else if ($char == '(') { // comment me $end = mime_match_parenthesis (0, $structure); $sub = substr($structure, 1, $end-1); @@ -188,62 +176,59 @@ } else { // loop through until we find a space or an end parenthesis $pos = 0; - $char = substr($structure, $pos, 1); - $text = ""; - while ($char != " " && $char != ")" && $pos < strlen($structure)) { + $char = $structure{$pos}; + $text = ''; + while ($char != ' ' && $char != ')' && $pos < strlen($structure)) { $text .= $char; $pos++; - $char = substr($structure, $pos, 1); + $char = $structure{$pos}; } $structure = substr($structure, strlen($text)); } - if ($debug_mime) echo "$elem_num : $text
"; // This is where all the text parts get put into the header switch ($elem_num) { - case 1: + case 1: $msg->header->type0 = strtolower($text); - if ($debug_mime) echo "type0 = ".strtolower($text)."
"; break; - case 2: + case 2: $msg->header->type1 = strtolower($text); - if ($debug_mime) echo "type1 = ".strtolower($text)."
"; break; + case 4: // Id + // Invisimail enclose images with <> + $msg->header->id = str_replace( '<', '', str_replace( '>', '', $text ) ); + break; case 5: $msg->header->description = $text; - if ($debug_mime) echo "description = $text
"; break; case 6: $msg->header->encoding = strtolower($text); - if ($debug_mime) echo "encoding = ".strtolower($text)."
"; break; case 7: $msg->header->size = $text; - if ($debug_mime) echo "size = $text
"; break; default: - if ($msg->header->type0 == "text" && $elem_num == 8) { + if ($msg->header->type0 == 'text' && $elem_num == 8) { // This is a plain text message, so lets get the number of lines // that it contains. $msg->header->num_lines = $text; - if ($debug_mime) echo "num_lines = $text
"; - } else if ($msg->header->type0 == "message" && $msg->header->type1 == "rfc822" && $elem_num == 8) { - // This is an encapsulated message, so lets start all over again and + } else if ($msg->header->type0 == 'message' && $msg->header->type1 == 'rfc822' && $elem_num == 8) { + // This is an encapsulated message, so lets start all over again and // parse this message adding it on to the existing one. $structure = trim($structure); - if (substr($structure, 0, 1) == "(") { + if ( $structure{0} == '(' ) { $e = mime_match_parenthesis (0, $structure); $structure = substr($structure, 0, $e); $structure = substr($structure, 1); $m = mime_parse_structure($structure, $msg->header->entity_id); - + // the following conditional is there to correct a bug that wasn't // incrementing the entity IDs correctly because of the special case // that message/rfc822 is. This fixes it fine. - if (substr($structure, 1, 1) != "(") + if (substr($structure, 1, 1) != '(') $m->header->entity_id = mime_increment_id(mime_new_element_level($ent_id)); - + // Now we'll go through and reformat the results. if ($m->entities) { for ($i=0; $i < count($m->entities); $i++) { @@ -252,7 +237,7 @@ } else { $msg->addEntity($m); } - $structure = ""; + $structure = ""; } } break; @@ -261,10 +246,9 @@ $text = ""; } // loop through the additional properties and put those in the various headers - if ($msg->header->type0 != "message") { + if ($msg->header->type0 != 'message') { for ($i=0; $i < count($properties); $i++) { - $msg->header->{$properties[$i]["name"]} = $properties[$i]["value"]; - if ($debug_mime) echo "".$properties[$i]["name"]." = " . $properties[$i]["value"] . "
"; + $msg->header->{$properties[$i]['name']} = $properties[$i]['value']; } } @@ -281,52 +265,50 @@ // This gets properties in a nested parenthesisized list. For example, // this would get passed something like: ("attachment" ("filename" "luke.tar.gz")) // This returns an array called $props with all paired up properties. - // It ignores the "attachment" for now, maybe that should change later + // It ignores the "attachment" for now, maybe that should change later // down the road. In this case, what is returned is: // $props[0]["name"] = "filename"; // $props[0]["value"] = "luke.tar.gz"; function mime_get_props ($props, $structure) { - global $debug_mime; + while (strlen($structure) > 0) { $structure = trim($structure); - $char = substr($structure, 0, 1); + $char = $structure{0}; - if ($char == "\"") { + if ($char == '"') { $pos = 1; - $char = substr($structure, $pos, 1); - $tmp = ""; - while ($char != "\"" && $pos < strlen($structure)) { + $tmp = ''; + while ( ( $char = $structure{$pos} ) != '"' && + $pos < strlen($structure)) { $tmp .= $char; $pos++; - $char = substr($structure, $pos, 1); - } + } $structure = trim(substr($structure, strlen($tmp) + 2)); - $char = substr($structure, 0, 1); + $char = $structure{0}; - if ($char == "\"") { + if ($char == '"') { $pos = 1; - $char = substr($structure, $pos, 1); - $value = ""; - while ($char != "\"" && $pos < strlen($structure)) { + $value = ''; + while ( ( $char = $structure{$pos} ) != '"' && + $pos < strlen($structure) ) { $value .= $char; $pos++; - $char = substr($structure, $pos, 1); - } + } $structure = trim(substr($structure, strlen($tmp) + 2)); - + $k = count($props); - $props[$k]["name"] = strtolower($tmp); - $props[$k]["value"] = $value; - } else if ($char == "(") { + $props[$k]['name'] = strtolower($tmp); + $props[$k]['value'] = $value; + } else if ($char == '(') { $end = mime_match_parenthesis (0, $structure); $sub = substr($structure, 1, $end-1); - if (! isset($props)) - $props = array(); + if (! isset($props)) + $props = array(); $props = mime_get_props($props, $sub); $structure = substr($structure, strlen($sub) + 2); } return $props; - } else if ($char == "(") { + } else if ($char == '(') { $end = mime_match_parenthesis (0, $structure); $sub = substr($structure, 1, $end-1); $props = mime_get_props($props, $sub); @@ -344,34 +326,35 @@ // x x // then this would return 42 to match up those two. function mime_match_parenthesis ($pos, $structure) { - $char = substr($structure, $pos, 1); + + $j = strlen( $structure ); // ignore all extra characters // If inside of a string, skip string -- Boundary IDs and other // things can have ) in them. - if ($char != '(') - return strlen($structure); - while ($pos < strlen($structure)) { + if( $structure{$pos} != '(' ) + return( $j ); + + while( $pos < $j ) { $pos++; - $char = substr($structure, $pos, 1); - if ($char == ")") { + if ($structure{$pos} == ')') { return $pos; - } else if ($char == '"') { - $pos ++; - while (substr($structure, $pos, 1) != '"' && - $pos < strlen($structure)) { - if (substr($structure, $pos, 2) == '\\"') - $pos ++; - elseif (substr($structure, $pos, 2) == '\\\\') - $pos ++; - $pos ++; + } elseif ($structure{$pos} == '"') { + $pos++; + while( $structure{$pos} != '"' && + $pos < $j ) { + if (substr($structure, $pos, 2) == '\\"') + $pos++; + elseif (substr($structure, $pos, 2) == '\\\\') + $pos++; + $pos++; } - } else if ($char == "(") { + } elseif ( $structure{$pos} == '(' ) { $pos = mime_match_parenthesis ($pos, $structure); } } echo "Error decoding mime structure. Report this as a bug!
\n"; - return $pos; + return( $pos ); } function mime_fetch_body ($imap_stream, $id, $ent_id) { @@ -392,7 +375,7 @@ else if (ereg('"([^"]*)"', $topline, $regs)) { return $regs[1]; } - + $str = "Body retrieval error. Please report this bug!\n" . "Response: $response\n" . "Message: $message\n" . @@ -408,33 +391,33 @@ // do a bit of error correction. If we couldn't find the entity id, just guess // that it is the first one. That is usually the case anyway. if (!$ent_id) $ent_id = 1; - + $sid = sqimap_session_id(); // Don't kill the connection if the browser is over a dialup // and it would take over 30 seconds to download it. set_time_limit(0); - fputs ($imap_stream, sqimap_session_id() . " FETCH $id BODY[$ent_id]\r\n"); - $cnt = 0; - $continue = true; - $read = fgets ($imap_stream,4096); - // This could be bad -- if the section has sqimap_session_id() . ' OK' - // or similar, it will kill the download. - while (!ereg("^" . sqimap_session_id() . " (OK|BAD|NO)(.*)$", $read, $regs)) { - if (trim($read) == ")==") { - $read1 = $read; - $read = fgets ($imap_stream,4096); - if (ereg("^" . sqimap_session_id() . " (OK|BAD|NO)(.*)$", $read, $regs)) { - return; - } else { - echo decodeBody($read1, $encoding) . - decodeBody($read, $encoding); - } - } else if ($cnt) { - echo decodeBody($read, $encoding); - } - $read = fgets ($imap_stream,4096); - $cnt++; - } + fputs ($imap_stream, "$sid FETCH $id BODY[$ent_id]\r\n"); + $cnt = 0; + $continue = true; + $read = fgets ($imap_stream,4096); + // This could be bad -- if the section has sqimap_session_id() . ' OK' + // or similar, it will kill the download. + while (!ereg("^".$sid." (OK|BAD|NO)(.*)$", $read, $regs)) { + if (trim($read) == ')==') { + $read1 = $read; + $read = fgets ($imap_stream,4096); + if (ereg("^".$sid." (OK|BAD|NO)(.*)$", $read, $regs)) { + return; + } else { + echo decodeBody($read1, $encoding) . + decodeBody($read, $encoding); + } + } else if ($cnt) { + echo decodeBody($read, $encoding); + } + $read = fgets ($imap_stream,4096); + $cnt++; + } } /* -[ END MIME DECODING ]----------------------------------------------------------- */ @@ -451,10 +434,11 @@ // This is here for debugging purposese. It will print out a list // of all the entity IDs that are in the $message object. + /* function listEntities ($message) { if ($message) { if ($message->header->entity_id) - echo "" . $message->header->entity_id . " : " . $message->header->type0 . "/" . $message->header->type1 . "
"; + echo "" . $message->header->entity_id . ' : ' . $message->header->type0 . '/' . $message->header->type1 . '
'; for ($i = 0; $message->entities[$i]; $i++) { $msg = listEntities($message->entities[$i], $ent_id); if ($msg) @@ -462,6 +446,7 @@ } } } + */ // returns a $message object for a particular entity id function getEntity ($message, $ent_id) { @@ -474,7 +459,7 @@ if ($msg) return $msg; } - } + } } } @@ -483,44 +468,44 @@ function findDisplayEntity ($message, $textOnly = 1) { global $show_html_default; - - if (! $message) - return 0; - if ($message->header->type0 == "multipart" && - $message->header->type1 == "alternative" && - $show_html_default && ! $textOnly) { - $entity = findDisplayEntityHTML($message); - if ($entity != 0) - return $entity; + if (! $message) + return 0; + + if ($message->header->type0 == 'multipart' && + $message->header->type1 == 'alternative' && + $show_html_default && ! $textOnly) { + $entity = findDisplayEntityHTML($message); + if ($entity != 0) + return $entity; } - + // Show text/plain or text/html -- the first one we find. - if ($message->header->type0 == 'text' && - ($message->header->type1 == 'plain' || - $message->header->type1 == 'html') && - isset($message->header->entity_id)) - return $message->header->entity_id; + if ( $message->header->type0 == 'text' && + ( $message->header->type1 == 'plain' || + $message->header->type1 == 'html' ) && + isset($message->header->entity_id) ) + return $message->header->entity_id; for ($i=0; isset($message->entities[$i]); $i++) { $entity = findDisplayEntity($message->entities[$i], $textOnly); if ($entity != 0) return $entity; } - + return 0; } - + // Shows the HTML version function findDisplayEntityHTML ($message) { - if ($message->header->type0 == 'text' && + if ($message->header->type0 == 'text' && $message->header->type1 == 'html' && - isset($message->header->entity_id)) - return $message->header->entity_id; + isset($message->header->entity_id)) + return $message->header->entity_id; for ($i = 0; isset($message->entities[$i]); $i ++) { $entity = findDisplayEntityHTML($message->entities[$i]); - if ($entity != 0) - return $entity; + if ($entity != 0) + return $entity; } return 0; } @@ -544,32 +529,32 @@ // Pass the 0 to mean that we want the 'best' viewable one $ent_num = findDisplayEntity ($message, 0); $body_message = getEntity($message, $ent_num); - if (($body_message->header->type0 == "text") || - ($body_message->header->type0 == "rfc822")) { - + if (($body_message->header->type0 == 'text') || + ($body_message->header->type0 == 'rfc822')) { + $body = mime_fetch_body ($imap_stream, $id, $ent_num); $body = decodeBody($body, $body_message->header->encoding); - $hookResults = do_hook("message_body", $body); - $body = $hookResults[1]; + $hookResults = do_hook("message_body", $body); + $body = $hookResults[1]; // If there are other types that shouldn't be formatted, add - // them here + // them here if ($body_message->header->type1 != "html" || ! $show_html_default) { translateText($body, $wrap_at, $body_message->header->charset); - } - + } + $body .= "
". _("Download this as a file") ."

"; - + /** Display the ATTACHMENTS: message if there's more than one part **/ $body .= ""; if (isset($message->entities[0])) { $body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id); } - $body .= ""; + $body .= ""; } else { $body = formatAttachments ($message, -1, $message->header->mailbox, $id); } - return $body; + return( $body ); } // A recursive function that returns a list of attachments with links @@ -578,100 +563,95 @@ global $where, $what; global $startMessage, $color; static $ShownHTML = 0; - - $body = ""; - if ($ShownHTML == 0) - { + + $body = ""; + if ($ShownHTML == 0) { $ShownHTML = 1; - - $body .= "\n"; - $body .= "
\n"; - $body .= _("Attachments") . ':'; - $body .= "
\n"; - - $body .= "\n"; - - $body .= formatAttachments ($message, $ent_id, $mailbox, $id); - - $body .= "
"; - - return $body; + + $body .= "\n" . + "
\n" . + _("Attachments") . ':' . + "
\n" . + "\n" . + formatAttachments ($message, $ent_id, $mailbox, $id) . + "
"; + + return( $body ); } - + if ($message) { if (!$message->entities) { $type0 = strtolower($message->header->type0); $type1 = strtolower($message->header->type1); $name = decodeHeader($message->header->name); - + if ($message->header->entity_id != $ent_id) { $filename = decodeHeader($message->header->filename); - if (trim($filename) == "") { - if (trim($name) == "") { - $display_filename = "untitled-".$message->header->entity_id; - } else { - $display_filename = $name; - $filename = $name; - } + if (trim($filename) == '') { + if (trim($name) == '') { + if( trim( $message->header->id ) == '' ) + $display_filename = 'untitled-[' . $message->header->entity_id . ']' ; + else + $display_filename = 'cid: ' . $message->header->id; + // $display_filename = 'untitled-[' . $message->header->entity_id . ']' ; + } else { + $display_filename = $name; + $filename = $name; + } } else { $display_filename = $filename; } - + $urlMailbox = urlencode($mailbox); $ent = urlencode($message->header->entity_id); - - $DefaultLink = + + $DefaultLink = "../src/download.php?startMessage=$startMessage&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent"; if ($where && $what) $DefaultLink .= '&where=' . urlencode($where) . '&what=' . urlencode($what); $Links['download link']['text'] = _("download"); - $Links['download link']['href'] = + $Links['download link']['href'] = "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent"; $ImageURL = ''; - + $HookResults = do_hook("attachment $type0/$type1", $Links, - $startMessage, $id, $urlMailbox, $ent, $DefaultLink, + $startMessage, $id, $urlMailbox, $ent, $DefaultLink, $display_filename, $where, $what); $Links = $HookResults[1]; $DefaultLink = $HookResults[6]; - $body .= '  '; - $body .= "$display_filename "; - $body .= '' . show_readable_size($message->header->size) . - '  '; - $body .= "[ $type0/$type1 ] "; - $body .= ''; + $body .= '  ' . + "$display_filename " . + '' . show_readable_size($message->header->size) . + '  ' . + "[ $type0/$type1 ] " . + ''; if ($message->header->description) $body .= '' . htmlspecialchars($message->header->description) . ''; $body .= ' '; - - + + $SkipSpaces = 1; - foreach ($Links as $Val) - { - if ($SkipSpaces) - { + foreach ($Links as $Val) { + if ($SkipSpaces) { $SkipSpaces = 0; - } - else - { + } else { $body .= '  |  '; } $body .= '' . $Val['text'] . ''; } - + unset($Links); - + $body .= "\n"; } - return $body; } else { for ($i = 0; $i < count($message->entities); $i++) { $body .= formatAttachments ($message->entities[$i], $ent_id, $mailbox, $id); } - return $body; } + return( $body ); } } @@ -683,34 +663,40 @@ global $show_html_default; - if ($encoding == "quoted-printable") { + if ($encoding == 'quoted-printable') { $body = quoted_printable_decode($body); - + + + /* + Following code has been comented as I see no reason for it. + If there is any please tell me a mingo@rotedic.com + while (ereg("=\n", $body)) $body = ereg_replace ("=\n", "", $body); - } else if ($encoding == "base64") { + */ + } else if ($encoding == 'base64') { $body = base64_decode($body); } - + // All other encodings are returned raw. return $body; } - // This functions decode strings that is encoded according to + // This functions decode strings that is encoded according to // RFC1522 (MIME Part Two: Message Header Extensions for Non-ASCII Text). function decodeHeader ($string) { - if (eregi('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=', + if (eregi('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=', $string, $res)) { if (ucfirst($res[2]) == "B") { $replace = base64_decode($res[3]); } else { $replace = ereg_replace("_", " ", $res[3]); - // Convert lowercase Quoted Printable to uppercase for - // quoted_printable_decode to understand it. - while (ereg("(=(([0-9][abcdef])|([abcdef][0-9])|([abcdef][abcdef])))", $replace, $res)) { - $replace = str_replace($res[1], strtoupper($res[1]), $replace); - } + // Convert lowercase Quoted Printable to uppercase for + // quoted_printable_decode to understand it. + while (ereg("(=(([0-9][abcdef])|([abcdef][0-9])|([abcdef][abcdef])))", $replace, $res)) { + $replace = str_replace($res[1], strtoupper($res[1]), $replace); + } $replace = quoted_printable_decode($replace); } @@ -722,7 +708,7 @@ // In case there should be more encoding in the string: recurse return (decodeHeader($string)); - } else + } else return ($string); } @@ -731,7 +717,7 @@ // be encoded. function encodeHeader ($string) { global $default_charset; - + // Encode only if the string contains 8-bit characters or =? $j = strlen( $string ); $l = FALSE; // Must be encoded ? @@ -739,31 +725,31 @@ for( $i=0; $i < $j; ++$i) { switch( $string{$i} ) { case '=': - $ret .= '=3D'; - break; - case '?': - $l = TRUE; - $ret .= '=3F'; - break; - case '_': - $ret .= '=5F'; - break; - case ' ': - $ret .= '_'; - break; - default: - $k = ord( $string{$i} ); - if( $k > 126 ) { - $ret .= sprintf("=%02X", $k); - $l = TRUE; - } else - $ret .= $string{$i}; + $ret .= '=3D'; + break; + case '?': + $l = TRUE; + $ret .= '=3F'; + break; + case '_': + $ret .= '=5F'; + break; + case ' ': + $ret .= '_'; + break; + default: + $k = ord( $string{$i} ); + if( $k > 126 ) { + $ret .= sprintf("=%02X", $k); + $l = TRUE; + } else + $ret .= $string{$i}; } } - + if( $l ) $string = "=?$default_charset?Q?$ret?="; - + return( $string ); }