X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmime.php;h=f3dc3ad46c4fd27ea98d735e0ce9f8496dc5b0c7;hp=2a56b561f1e0ea85c4d9adf7c20572ec7a5dd6d1;hb=472e7acbb50c8496ec9ae730bb82d785add1ed96;hpb=93f92f03a71e184e591926a56cc0525b20eb1a3f;ds=sidebyside diff --git a/functions/mime.php b/functions/mime.php index 2a56b561..f3dc3ad4 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -3,7 +3,7 @@ /** * mime.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This contains the functions necessary to detect and decode MIME @@ -12,78 +12,78 @@ * $Id$ */ -require_once('../functions/imap.php'); -require_once('../functions/attachment_common.php'); +require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . '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, $type = ''; -} - -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 */ -/* --------------------------------------------------------------------------------- */ +/* -------------------------------------------------------------------------- */ +/* 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) { - - $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); + $i = 0; + $msg = Message::parseStructure($read,$i); + if (!is_object($msg)) { + include_once(SM_PATH . 'functions/display_messages.php'); + global $color, $mailbox; + /* removed urldecode because $_GET is auto urldecoded ??? */ + displayPageHeader( $color, $mailbox ); + $errormessage = _("SquirrelMail could not decode the bodystructure of the message"); + $errormessage .= '
'._("the provided bodystructure by your imap-server").':

'; + $errormessage .= '
' . htmlspecialchars($read) . '
'; + plain_error_message( $errormessage, $color ); + echo ''; + exit; } + if (count($flags)) { + foreach ($flags as $flag) { + $char = strtoupper($flag{1}); + switch ($char) { + case 'S': + if (strtolower($flag) == '\\seen') { + $msg->is_seen = true; + } + break; + case 'A': + if (strtolower($flag) == '\\answered') { + $msg->is_answered = true; + } + break; + case 'D': + if (strtolower($flag) == '\\deleted') { + $msg->is_deleted = true; + } + break; + case 'F': + if (strtolower($flag) == '\\flagged') { + $msg->is_flagged = true; + } + break; + case 'M': + if (strtolower($flag) == '$mdnsent') { + $msg->is_mdnsent = true; + } + break; + default: + break; + } + } + } + // listEntities($msg); + return $msg; +} - $msg = mime_parse_structure ($read, 0); - $msg->header = $header; - return( $msg ); -} -/* this starts the parsing of a particular structure. It is called recursively, +/* This starts the parsing of a particular structure. It is called recursively, * so it can be passed different structures. It returns an object of type * $message. * First, it checks to see if it is a multipart message. If it is, then it @@ -91,650 +91,200 @@ function mime_structure ($imap_stream, $header) { * 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 $mailbox; - $properties = array(); - $msg = new message(); - if ($structure{0} == '(') { - $old_ent_id = $ent_id; - $ent_id = mime_new_element_level($ent_id); - $start = $end = -1; - do { - $start = $end+1; - $end = mime_match_parenthesis ($start, $structure); - - /* check if we are dealing with a new entity-level */ - $i = strrpos($ent_id,'.'); - if ($i>0) { - $ent = substr($ent_id, $i+1); - } else { - $ent = ''; - } - /* add "forgotten" parent entities (alternative and relative) */ - if ($ent == '0') { - /* new entity levels have information about the type (type1) and - * the properties. This information is situated at the end of the - * structure string like for example (example between the brackets) - * [ "RELATED" ("BOUNDARY" "myboundary" "TYPE" "plain/html") ] - */ - - /* get the involved properties for parsing to mime_get_properties */ - $startprop = strrpos($structure,'('); - $properties_str = substr($structure,$startprop); - $endprop = mime_match_parenthesis ($startprop, $structure); - $propstr = substr($structure, $startprop + 1, ($endprop - $startprop)-1); - /* cut off the used properties */ - if ($startprop) { - $structure_end = substr($structure, $endprop+2); - $structure = trim(substr($structure,0,$startprop)); - } - - /* get type1 */ - $pos = strrpos($structure,' '); - $type1 = strtolower(substr($structure, $pos+2, (count($structure)-2))); - - /* cut off type1 */ - if ($pos && $startprop) { - $structure = trim(substr($structure, 0, $pos)); - } - - /* process the found information */ - $properties = mime_get_props($properties, $properties_str); - if (count($properties)>0) { - $msg->header->entity_id = $old_ent_id; - $msg->header->type0 = 'multipart'; - $msg->header->type1 = $type1; - for ($i=0; $i < count($properties); $i++) { - $msg->header->{$properties[$i]['name']} = $properties[$i]['value']; - } - } - $structure = $structure . ' ' . $structure_end; - } - $element = substr($structure, $start+1, ($end - $start)-1); - $ent_id = mime_increment_id ($ent_id); - $newmsg = mime_parse_structure ($element, $ent_id); - /* set mailbox in case of message/rfc822 entities */ - if (isset($newmsg->header->type0) && isset($newmsg->header->type1)) { - if ($newmsg->header->type0 == 'message' && $newmsg->header->type1 == 'rfc822') { - $newmsg->header->mailbox=$mailbox; - } - } - $msg->addEntity ($newmsg); - - } while ($structure{$end+1} == '('); - } else { - // parse the elements - $msg = mime_get_element ($structure, $msg, $ent_id); - } - return $msg; -} - - -/* Increments the element ID. An element id can look like any of - * 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) { - - if (strpos($id, '.')) { - $first = substr($id, 0, strrpos($id, '.')); - $last = substr($id, strrpos($id, '.')+1); - $last++; - $new = $first . '.' .$last; - } else { - $new = $id + 1; - } - - 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 - * 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 ); -} - -function mime_get_element (&$structure, $msg, $ent_id) { - - $elem_num = 1; - $msg->header = new msg_header(); - $msg->header->entity_id = $ent_id; - $properties = array(); - while (strlen($structure) > 0) { - $structure = trim($structure); - $char = $structure{0}; - - if (strtolower(substr($structure, 0, 3)) == 'nil') { - $text = ''; - $structure = substr($structure, 3); - } else if ($char == '"') { - // loop through until we find the matching quote, and return that as a string - $pos = 1; - $text = ''; - while ( ($char = $structure{$pos} ) <> '"' && $pos < strlen($structure)) { - $text .= $char; - $pos++; - } - $structure = substr($structure, strlen($text) + 2); - } else if ($char == '{') { - /** - * loop through until we find the matching quote, - * and return that as a string - */ - $pos = 1; - $len = ''; - while (($char = $structure{$pos}) != '}' - && $pos < strlen($structure)) { - $len .= $char; - $pos++; - } - $structure = substr($structure, strlen($len) + 4); - $text = substr($structure, 0, $len); - $structure = substr($structure, $len + 1); - } else if ($char == '(') { - // comment me - $end = mime_match_parenthesis (0, $structure); - $sub = substr($structure, 1, $end-1); - $properties = mime_get_props($properties, $sub); - $structure = substr($structure, strlen($sub) + 2); - } else { - // loop through until we find a space or an end parenthesis - $pos = 0; - $char = $structure{$pos}; - $text = ''; - while ($char != ' ' && $char != ')' && $pos < strlen($structure)) { - $text .= $char; - $pos++; - $char = $structure{$pos}; - } - $structure = substr($structure, strlen($text)); - } - - // This is where all the text parts get put into the header - switch ($elem_num) { - case 1: - $msg->header->type0 = strtolower($text); - break; - case 2: - $msg->header->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; - break; - case 6: - $msg->header->encoding = strtolower($text); - break; - case 7: - $msg->header->size = $text; - break; - default: - 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; - - } 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 ( $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) != '(') - $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++) { - $msg->addEntity($m->entities[$i]); - } - } else { - $msg->addEntity($m); - } - $structure = ""; - } - } - break; - } - $elem_num++; - $text = ""; - } - // loop through the additional properties and put those in the various headers - for ($i=0; $i < count($properties); $i++) { - $msg->header->{$properties[$i]['name']} = $properties[$i]['value']; - } - - return $msg; -} - -/* - * I did most of the MIME stuff yesterday (June 20, 2000), but I couldn't - * figure out how to do this part, so I decided to go to bed. I woke up - * in the morning and had a flash of insight. I went to the white-board - * and scribbled it out, then spent a bit programming it, and this is the - * result. Nothing complicated, but I think my brain was fried yesterday. - * Funny how that happens some times. - * - * 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 - * 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) { - - while (strlen($structure) > 0) { - $structure = trim($structure); - $char = $structure{0}; - if ($char == '"') { - $pos = 1; - $tmp = ''; - while ( ( $char = $structure{$pos} ) != '"' && - $pos < strlen($structure)) { - $tmp .= $char; - $pos++; - } - $structure = trim(substr($structure, strlen($tmp) + 2)); - $char = $structure{0}; - - if ($char == '"') { - $pos = 1; - $value = ''; - while ( ( $char = $structure{$pos} ) != '"' && - $pos < strlen($structure) ) { - $value .= $char; - $pos++; - } - $structure = trim(substr($structure, strlen($value) + 2)); - $k = count($props); - $props[$k]['name'] = strtolower($tmp); - $props[$k]['value'] = $value; - if ($structure != '') { - mime_get_props($props, $structure); - } else { - return $props; - } - } else if ($char == '(') { - $end = mime_match_parenthesis (0, $structure); - $sub = substr($structure, 1, $end-1); - if (! isset($props)) - $props = array(); - $props = mime_get_props($props, $sub); - $structure = substr($structure, strlen($sub) + 2); - return $props; - } - } else if ($char == '(') { - $end = mime_match_parenthesis (0, $structure); - $sub = substr($structure, 1, $end-1); - $props = mime_get_props($props, $sub); - $structure = substr($structure, strlen($sub) + 2); - return $props; - } else { - return $props; - } - } -} - -/* - * Matches parenthesis. It will return the position of the matching - * parenthesis in $structure. For instance, if $structure was: - * ("text" "plain" ("val1name", "1") nil ... ) - * x x - * then this would return 42 to match up those two. - */ -function mime_match_parenthesis ($pos, $structure) { - - $j = strlen( $structure ); - - // ignore all extra characters - // If inside of a string, skip string -- Boundary IDs and other - // things can have ) in them. - if ( $structure{$pos} != '(' ) { - return( $j ); - } - - while ( $pos < $j ) { - $pos++; - if ($structure{$pos} == ')') { - return $pos; - } elseif ($structure{$pos} == '"') { - $pos++; - while ( $structure{$pos} != '"' && - $pos < $j ) { - if (substr($structure, $pos, 2) == '\\"') { - $pos++; - } elseif (substr($structure, $pos, 2) == '\\\\') { - $pos++; - } - $pos++; - } - } elseif ( $structure{$pos} == '(' ) { - $pos = mime_match_parenthesis ($pos, $structure); - } - } - echo _("Error decoding mime structure. Report this as a bug!") . '
'; - return( $pos ); -} - -function mime_fetch_body($imap_stream, $id, $ent_id) { - - /* - * do a bit of error correction. If we couldn't find the entity id, just guess +function mime_fetch_body($imap_stream, $id, $ent_id=1) { + global $uid_support; + /* 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; + $cmd = "FETCH $id BODY[]"; + } else { + $cmd = "FETCH $id BODY[$ent_id]"; } - $cmd = "FETCH $id BODY[$ent_id]"; - $data = sqimap_run_command ($imap_stream, $cmd, true, $response, $message); + $data = sqimap_run_command ($imap_stream, $cmd, true, $response, $message, $uid_support); do { - $topline = trim(array_shift( $data )); - } while( $topline && $topline[0] == '*' && !preg_match( '/\* [0-9]+ FETCH.*/i', $topline )) ; + $topline = trim(array_shift($data)); + } while($topline && ($topline[0] == '*') && !preg_match('/\* [0-9]+ FETCH.*/i', $topline)) ; + $wholemessage = implode('', $data); if (ereg('\\{([^\\}]*)\\}', $topline, $regs)) { - - $ret = substr( $wholemessage, 0, $regs[1] ); - /* - There is some information in the content info header that could be important - in order to parse html messages. Let's get them here. - */ - if ( $ret{0} == '<' ) { - $data = sqimap_run_command ($imap_stream, "FETCH $id BODY[$ent_id.MIME]", true, $response, $message); - /* BASE within HTML documents is illegal (see w3 spec) -* $base = ''; -* $k = 10; -* foreach( $data as $d ) { -* if ( substr( $d, 0, 13 ) == 'Content-Base:' ) { -* $j = strlen( $d ); -* $i = 13; -* $base = ''; -* while ( $i < $j && -* ( !isNoSep( $d{$i} ) || $d{$i} == '"' ) ) -* $i++; -* while ( $i < $j ) { -* if ( isNoSep( $d{$i} ) ) -* $base .= $d{$i}; -* $i++; -* } -* $k = 0; -* } elseif ( $k == 1 && !isnosep( $d{0} ) ) { -* $base .= substr( $d, 1 ); -* } -* $k++; -* } -* if ( $base <> '' ) { -* $ret = "" . $ret; -* } -* */ - } + $ret = substr($wholemessage, 0, $regs[1]); + /* There is some information in the content info header that could be important + * in order to parse html messages. Let's get them here. + */ +// if ($ret{0} == '<') { +// $data = sqimap_run_command ($imap_stream, "FETCH $id BODY[$ent_id.MIME]", true, $response, $message, $uid_support); +// } } else if (ereg('"([^"]*)"', $topline, $regs)) { $ret = $regs[1]; } else { global $where, $what, $mailbox, $passed_id, $startMessage; - $par = 'mailbox=' . urlencode($mailbox) . "&passed_id=$passed_id"; + $par = 'mailbox=' . urlencode($mailbox) . '&passed_id=' . $passed_id; if (isset($where) && isset($what)) { - $par .= '&where='. urlencode($where) . "&what=" . urlencode($what); + $par .= '&where=' . urlencode($where) . '&what=' . urlencode($what); } else { - $par .= "&startMessage=$startMessage&show_more=0"; + $par .= '&startMessage=' . $startMessage . '&show_more=0'; } $par .= '&response=' . urlencode($response) . - '&message=' . urlencode($message). - '&topline=' . urlencode($topline); + '&message=' . urlencode($message) . + '&topline=' . urlencode($topline); echo '
' . '' . '' . - '" . - '" . - '" . - '" . + '" . + '" . + '" . + '" . "
' . - _("Body retrieval error. The reason for this is most probably that the message is malformed. Please help us making future versions better by submitting this message to the developers knowledgebase!") . - "
" . - _("Submit message") . '
 ' . + _("Body retrieval error. The reason for this is most probably that the message is malformed.") . '
' . _("Command:") . "$cmd
' . _("Response:") . "$response
' . _("Message:") . "$message
' . _("FETCH line:") . "$topline
' . _("Command:") . "$cmd
' . _("Response:") . "$response
' . _("Message:") . "$message
' . _("FETCH line:") . "$topline

"; - $data = sqimap_run_command ($imap_stream, "FETCH $passed_id BODY[]", true, $response, $message); + $data = sqimap_run_command ($imap_stream, "FETCH $passed_id BODY[]", true, $response, $message, $uid_support); array_shift($data); $wholemessage = implode('', $data); $ret = $wholemessage; } - return( $ret ); + return $ret; } -function mime_print_body_lines ($imap_stream, $id, $ent_id, $encoding) { - // 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. +function mime_print_body_lines ($imap_stream, $id, $ent_id=1, $encoding) { + global $uid_support; - // don´t call set_time_limit in safe mode. - if (!ini_get("safe_mode")) { + /* Don't kill the connection if the browser is over a dialup + * and it would take over 30 seconds to download it. + * Don´t call set_time_limit in safe mode. + */ + + if (!ini_get('safe_mode')) { set_time_limit(0); } + /* in case of base64 encoded attachments, do not buffer them. + Instead, echo the decoded attachment directly to screen */ + if (strtolower($encoding) == 'base64') { + if (!$ent_id) { + $query = "FETCH $id BODY[]"; + } else { + $query = "FETCH $id BODY[$ent_id]"; + } + sqimap_run_command($imap_stream,$query,true,$response,$message,$uid_support,'sqimap_base64_decode','php://stdout',true); + } else { + $body = mime_fetch_body ($imap_stream, $id, $ent_id); + echo decodeBody($body, $encoding); + } + /* + TODO, use the same method for quoted printable. + However, I assume that quoted printable attachments aren't that large + so the performancegain / memory usage drop will be minimal. + If we decide to add that then we need to adapt sqimap_fread because + we need to split te result on \n and fread doesn't stop at \n. That + means we also should provide $results from sqimap_fread (by ref) to + te function and set $no_return to false. The $filter function for + quoted printable should handle unsetting of $results. + */ + /* + TODO 2: find out how we write to the output stream php://stdout. fwrite + doesn't work because 'php://stdout isn't a stream. + */ + + return; +/* fputs ($imap_stream, "$sid FETCH $id BODY[$ent_id]\r\n"); $cnt = 0; $continue = true; - $read = fgets ($imap_stream,4096); + $read = fgets ($imap_stream,8192); + + // 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++; + while (!ereg("^".$sid_s." (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++; +// break; } +*/ } /* -[ END MIME DECODING ]----------------------------------------------------------- */ - - -/* This is the first function called. It decides if this is a multipart - message or if it should be handled as a single entity +/* This is here for debugging purposes. It will print out a list + * of all the entity IDs that are in the $message object. */ -function decodeMime ($imap_stream, &$header) { - global $username, $key, $imapServerAddress, $imapPort; - return mime_structure ($imap_stream, $header); -} - -// 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 . '
'; - for ($i = 0; $message->entities[$i]; $i++) { - $msg = listEntities($message->entities[$i], $ent_id); - if ($msg) - return $msg; - } -} -} - - -/* returns a $message object for a particular entity id */ -function getEntity ($message, $ent_id) { if ($message) { - if ($message->header->entity_id == $ent_id && strlen($ent_id) == strlen($message->header->entity_id)) - { - return $message; - } else { - for ($i = 0; isset($message->entities[$i]); $i++) { - $msg = getEntity ($message->entities[$i], $ent_id); - if ($msg) { - return $msg; - } + echo "" . $message->entity_id . ' : ' . $message->type0 . '/' . $message->type1 . ' parent = '. $message->parent->entity_id. '
'; + for ($i = 0; isset($message->entities[$i]); $i++) { + echo "$i : "; + $msg = listEntities($message->entities[$i]); + + if ($msg) { + echo "return: "; + return $msg; } } } } -/* - * figures out what entity to display and returns the $message object - * for that entity. - */ -function findDisplayEntity ($msg, $textOnly = 1) { - global $show_html_default; - - $entity = array(); - $found = false; - if ($msg) { - $type = $msg->header->type0.'/'.$msg->header->type1; - if ( $type == 'multipart/alternative') { - $msg = findAlternativeEntity($msg); - if (count($msg->entities) == 0) { - $entity[] = $msg->header->entity_id; - } else { - $found = true; - $entity = findDisplayEntity($msg,$textOnly); - } - } else if ( $type == 'multipart/related') { - $msg = findRelatedEntity($msg); - if (count($msg->entities) == 0) { - $entity[] = $msg->header->entity_id; - } else { - $found = true; - $entity = findDisplayEntity($msg,$textOnly); - } - } else if ( count($entity) == 0 && - $msg->header->type0 == 'text' && - ( $msg->header->type1 == 'plain' || - $msg->header->type1 == 'html' ) && - isset($msg->header->entity_id) ) { - if (count($msg->entities) == 0) { - $entity[] = $msg->header->entity_id; - } - } - $i = 0; - while ( isset($msg->entities[$i]) && count($entity) == 0 && !$found ) { - $entity = findDisplayEntity($msg->entities[$i], $textOnly); - $i++; - } - } - if ( !isset($entity[0]) ) { - $entity[]=""; - } - return( $entity ); -} +function getPriorityStr($priority) { + $priority_level = substr($priority,0,1); -/* Shows the HTML version */ -function findDisplayEntityHTML ($message) { + switch($priority_level) { + /* Check for a higher then normal priority. */ + case '1': + case '2': + $priority_string = _("High"); + break; - if ( $message->header->type0 == 'text' && - $message->header->type1 == 'html' && - isset($message->header->entity_id)) { - return $message->header->entity_id; - } - for ($i = 0; isset($message->entities[$i]); $i ++) { - if ( $message->header->type0 == 'message' && - $message->header->type1 == 'rfc822' && - isset($message->header->entity_id)) { - return 0; - } - - $entity = findDisplayEntityHTML($message->entities[$i]); - if ($entity != 0) { - return $entity; - } - } + /* Check for a lower then normal priority. */ + case '4': + case '5': + $priority_string = _("Low"); + break; - return 0; -} + /* Check for a normal priority. */ + case '3': + default: + $priority_level = '3'; + $priority_string = _("Normal"); + break; -function findAlternativeEntity ($message) { - global $show_html_default; - /* if we are dealing with alternative parts then we choose the best - * viewable message supported by SM. - */ - if ($show_html_default) { - $alt_order = array ('text/plain','text/html'); - } else { - $alt_order = array ('text/plain'); } - $best_view = 0; - $k = 0; - for ($i = 0; $i < count($message->entities); $i ++) { - $type = $message->entities[$i]->header->type0.'/'.$message->entities[$i]->header->type1; - if ($type == 'multipart/related') { - $type = $message->entities[$i]->header->type; - } - for ($j = $k; $j < count($alt_order); $j++) { - if ($alt_order[$j] == $type && $j > $best_view) { - $best_view = $j; - $k = $j; - } - } - } - return $message->entities[$best_view]; + return $priority_string; } -function findRelatedEntity ($message) { - for ($i = 0; $i < count($message->entities); $i ++) { - $type = $message->entities[$i]->header->type0.'/'.$message->entities[$i]->header->type1; - if ($message->header->type == $type) { - return $message->entities[$i]; - } - } - return $message->entities[0]; -} +/* returns a $message object for a particular entity id */ +function getEntity ($message, $ent_id) { + return $message->getEntity($ent_id); +} -/* - * translateText +/* translateText * Extracted from strings.php 23/03/2002 */ function translateText(&$body, $wrap_at, $charset) { - global $where, $what; /* from searching */ - global $color; /* color theme */ + global $where, $what; /* from searching */ + global $color; /* color theme */ - require_once('../functions/url_parser.php'); + require_once(SM_PATH . 'functions/url_parser.php'); $body_ary = explode("\n", $body); - $PriorQuotes = 0; for ($i=0; $i < count($body_ary); $i++) { $line = $body_ary[$i]; if (strlen($line) - 2 >= $wrap_at) { @@ -745,339 +295,274 @@ function translateText(&$body, $wrap_at, $charset) { parseUrl ($line); - $Quotes = 0; + $quotes = 0; $pos = 0; - $j = strlen( $line ); + $j = strlen($line); - while ( $pos < $j ) { + while ($pos < $j) { if ($line[$pos] == ' ') { - $pos ++; + $pos++; } else if (strpos($line, '>', $pos) === $pos) { $pos += 4; - $Quotes ++; + $quotes++; } else { break; } } - - if ($Quotes > 1) { - if (! isset($color[14])) { - $color[14] = '#FF0000'; - } - $line = '' . $line . ''; - } elseif ($Quotes) { - if (! isset($color[13])) { + + if ($quotes % 2) { + if (!isset($color[13])) { $color[13] = '#800000'; } - $line = '' . $line . ''; + $line = '' . $line . ''; + } elseif ($quotes) { + if (!isset($color[14])) { + $color[14] = '#FF0000'; + } + $line = '' . $line . ''; } - + $body_ary[$i] = $line; } $body = '
' . implode("\n", $body_ary) . '
'; } -/* debugfunction for looping through entities and displaying correct entities */ -function listMyEntities ($message) { - -if ($message) { - if ($message->header->entity_id) { - echo "" . $message->header->entity_id . ' : ' . $message->header->type0 . '/' . $message->header->type1 . '
'; - } - if (!($message->header->type0 == 'message' && $message->header->type1 == 'rfc822')) { - if (isset($message->header->boundary) ) { - $ent_id = $message->header->entity_id; - $var = $message->header->boundary; - if ($var !='') - echo "$ent_id boundary = $var
"; - } - if (isset($message->header->type) ) { - $var = $message->header->type; - if ($var !='') - echo "$ent_id type = $var
"; - } - for ($i = 0; $message->entities[$i]; $i++) { - $msg = listMyEntities($message->entities[$i]); - } - - if ($msg ) return $msg; - } -} - -} - - - /* This returns a parsed string called $body. That string can then -be displayed as the actual message in the HTML. It contains -everything needed, including HTML Tags, Attachments at the -bottom, etc. -*/ -function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num) { - // this if statement checks for the entity to show as the - // primary message. To add more of them, just put them in the - // order that is their priority. - global $startMessage, $username, $key, $imapServerAddress, $imapPort, $body, - $show_html_default, $has_unsafe_images, $view_unsafe_images, $sort; - - $has_unsafe_images = 0; - - $id = $message->header->id; + * be displayed as the actual message in the HTML. It contains + * everything needed, including HTML Tags, Attachments at the + * bottom, etc. + */ +function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $mailbox='INBOX') { + /* This if statement checks for the entity to show as the + * primary message. To add more of them, just put them in the + * order that is their priority. + */ + global $startMessage, $username, $key, $imapServerAddress, $imapPort, + $show_html_default, $sort, $has_unsafe_images, $passed_ent_id; + global $languages, $squirrelmail_language; - $urlmailbox = urlencode($message->header->mailbox); + if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) { + $view_unsafe_images = false; + } + $body = ''; + $urlmailbox = urlencode($mailbox); $body_message = getEntity($message, $ent_num); if (($body_message->header->type0 == 'text') || ($body_message->header->type0 == 'rfc822')) { - $body = mime_fetch_body ($imap_stream, $id, $ent_num); - + $body = mime_fetch_body ($imap_stream, $id, $ent_num); $body = decodeBody($body, $body_message->header->encoding); + + if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + if (mb_detect_encoding($body) != 'ASCII') { + $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body); + } + } $hookResults = do_hook("message_body", $body); $body = $hookResults[1]; - // If there are other types that shouldn't be formatted, add - // them here + + /* If there are other types that shouldn't be formatted, add + * them here. + */ + if ($body_message->header->type1 == 'html') { - if ( $show_html_default <> 1 ) { - $body = strip_tags( $body ); - translateText($body, $wrap_at, $body_message->header->charset); + if ($show_html_default <> 1) { + $entity_conv = array(' ' => ' ', + '

' => "\n", + '
' => "\n", + '

' => "\n", + '
' => "\n", + '>' => '>', + '<' => '<'); + $body = strtr($body, $entity_conv); + $body = strip_tags($body); + $body = trim($body); + translateText($body, $wrap_at, + $body_message->header->getParameter('charset')); } else { - $body = magicHTML( $body, $id, $message ); + $body = magicHTML($body, $id, $message, $mailbox); } } else { - translateText($body, $wrap_at, $body_message->header->charset); + translateText($body, $wrap_at, + $body_message->header->getParameter('charset')); } - - $body .= "

". _("Download this as a file") ."

"; - if ($has_unsafe_images) { - if ($view_unsafe_images) { - $body .= "
". _("Hide Unsafe Images") ."

\n"; + $link = 'read_body.php?passed_id=' . $id . '&ent_id='.$ent_num. + '&mailbox=' . $urlmailbox .'&sort=' . $sort . + '&startMessage=' . $startMessage . '&show_more=0'; + if (isset($passed_ent_id)) { + $link .= '&passed_ent_id='.$passed_ent_id; + } + if ($view_unsafe_images) { + $text = _("Hide Unsafe Images"); + } else { + if (isset($has_unsafe_images) && $has_unsafe_images) { + $link .= '&view_unsafe_images=1'; + $text = _("View Unsafe Images"); } else { - $body .= "
". _("View Unsafe Images") ."

\n"; + $text = ''; } } - - /** Display the ATTACHMENTS: message if there's more than one part **/ - if (isset($message->entities[1])) { - /* Header-type alternative means we choose the best one to display - so don't show the alternatives as attachment. Header-type related - means that the attachments are already part of the related message. - */ - if ($message->header->type1 !='related' && $message->header->type1 !='alternative') { - $body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id); - } - } - } else { - $body = formatAttachments ($message, -1, $message->header->mailbox, $id); + $body .= '
'.$text. + '

' . "\n"; } - return ($body); + return $body; } -/* - * A recursive function that returns a list of attachments with links - * to where to download these attachments - */ -function formatAttachments($message, $ent_id, $mailbox, $id) { - global $where, $what; - global $startMessage, $color; + +function formatAttachments($message, $exclude_id, $mailbox, $id) { + global $where, $what, $startMessage, $color; static $ShownHTML = 0; - $body = ''; - if ($ShownHTML == 0) { - - $ShownHTML = 1; - $body .= "\n" . - "
\n" . - _("Attachments") . ':' . - "
\n" . - "\n" . - formatAttachments($message, $ent_id, $mailbox, $id) . - "
"; - - } else if ($message) { - $header = $message->header; - $type0 = strtolower($header->type0); - $type1 = strtolower($header->type1); - $name = ''; - if (isset($header->name)) { - $name = decodeHeader($header->name); - } - if ($type0 =='message' && $type1 == 'rfc822') { - - $filename = decodeHeader($message->header->filename); - if (trim($filename) == '') { - if (trim($name) == '') { - $display_filename = 'untitled-[' . $message->header->entity_id . ']' ; - } else { - $display_filename = $name; - $filename = $name; - } - } else { - $display_filename = $filename; - } + $att_ar = $message->getAttachments($exclude_id); - $urlMailbox = urlencode($mailbox); - $ent = urlencode($message->header->entity_id); + if (!count($att_ar)) return ''; - $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'] = - "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent"; - $ImageURL = ''; - - /* this executes the attachment hook with a specific MIME-type. - * if that doens't have results, it tries if there's a rule - * for a more generic type. */ - $HookResults = do_hook("attachment $type0/$type1", $Links, - $startMessage, $id, $urlMailbox, $ent, $DefaultLink, $display_filename, $where, $what); - if(count($HookResults[1]) <= 1) { - $HookResults = do_hook("attachment $type0/*", $Links, - $startMessage, $id, $urlMailbox, $ent, $DefaultLink, - $display_filename, $where, $what); - } + $attachments = ''; - $Links = $HookResults[1]; - $DefaultLink = $HookResults[6]; + $urlMailbox = urlencode($mailbox); - $body .= '  ' . - "$display_filename " . - '' . show_readable_size($message->header->size) . - '  ' . - "[ $type0/$type1 ] " . - ''; - if ($message->header->description) { - $body .= '' . htmlspecialchars(_($message->header->description)) . ''; + foreach ($att_ar as $att) { + $ent = $att->entity_id; + $header = $att->header; + $type0 = strtolower($header->type0); + $type1 = strtolower($header->type1); + $name = ''; + $links['download link']['text'] = _("download"); + $links['download link']['href'] = SM_PATH . + "src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&ent_id=$ent"; + $ImageURL = ''; + if ($type0 =='message' && $type1 == 'rfc822') { + $default_page = SM_PATH . 'src/read_body.php'; + $rfc822_header = $att->rfc822_header; + $filename = $rfc822_header->subject; + if (trim( $filename ) == '') { + $filename = 'untitled-[' . $ent . ']' ; } - $body .= ' '; - - - $SkipSpaces = 1; - foreach ($Links as $Val) { - if ($SkipSpaces) { - $SkipSpaces = 0; - } else { - $body .= '  |  '; - } - $body .= '' . $Val['text'] . ''; + $from_o = $rfc822_header->from; + if (is_object($from_o)) { + $from_name = $from_o->getAddress(false); + } else { + $from_name = _("Unknown sender"); } - - unset($Links); - - $body .= "\n"; - - return( $body ); - - } elseif (!$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) == '') { - 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; + $from_name = decodeHeader(($from_name)); + $description = $from_name; + } else { + $default_page = SM_PATH . 'src/download.php'; + if (is_object($header->disposition)) { + $filename = $header->disposition->getProperty('filename'); + if (trim($filename) == '') { + $name = decodeHeader($header->disposition->getProperty('name')); + if (trim($name) == '') { + $name = $header->getParameter('name'); + if(trim($name) == '') { + if (trim( $header->id ) == '') { + $filename = 'untitled-[' . $ent . ']' ; + } else { + $filename = 'cid: ' . $header->id; + } + } else { + $filename = $name; + } + } else { + $filename = $name; + } } } else { - $display_filename = $filename; - } - - $urlMailbox = urlencode($mailbox); - $ent = urlencode($message->header->entity_id); - - $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); + $filename = $header->getParameter('name'); + if (!trim($filename)) { + if (trim( $header->id ) == '') { + $filename = 'untitled-[' . $ent . ']' ; + } else { + $filename = 'cid: ' . $header->id; + } + } } - $Links['download link']['text'] = _("download"); - $Links['download link']['href'] = - "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent"; - $ImageURL = ''; - - /* this executes the attachment hook with a specific MIME-type. - * if that doens't have results, it tries if there's a rule - * for a more generic type. */ - $HookResults = do_hook("attachment $type0/$type1", $Links, - $startMessage, $id, $urlMailbox, $ent, $DefaultLink, - $display_filename, $where, $what); - if(count($HookResults[1]) <= 1) { - $HookResults = do_hook("attachment $type0/*", $Links, - $startMessage, $id, $urlMailbox, $ent, $DefaultLink, - $display_filename, $where, $what); + if ($header->description) { + $description = decodeHeader($header->description); + } else { + $description = ''; } + } - $Links = $HookResults[1]; - $DefaultLink = $HookResults[6]; + $display_filename = $filename; + if (isset($passed_ent_id)) { + $passed_ent_id_link = '&passed_ent_id='.$passed_ent_id; + } else { + $passed_ent_id_link = ''; + } + $defaultlink = $default_page . "?startMessage=$startMessage" + . "&passed_id=$id&mailbox=$urlMailbox" + . '&ent_id='.$ent.$passed_ent_id_link; + if ($where && $what) { + $defaultlink .= '&where='. urlencode($where).'&what='.urlencode($what); + } + /* This executes the attachment hook with a specific MIME-type. + * If that doesn't have results, it tries if there's a rule + * for a more generic type. + */ + $hookresults = do_hook("attachment $type0/$type1", $links, + $startMessage, $id, $urlMailbox, $ent, $defaultlink, + $display_filename, $where, $what); + if(count($hookresults[1]) <= 1) { + $hookresults = do_hook("attachment $type0/*", $links, + $startMessage, $id, $urlMailbox, $ent, $defaultlink, + $display_filename, $where, $what); + } + + $links = $hookresults[1]; + $defaultlink = $hookresults[6]; - $body .= '  ' . - "$display_filename " . - '' . show_readable_size($message->header->size) . + $attachments .= '' . + ''.decodeHeader($display_filename).' ' . + '' . show_readable_size($header->size) . '  ' . "[ $type0/$type1 ] " . ''; - if ($message->header->description) { - $body .= '' . htmlspecialchars(_($message->header->description)) . ''; - } - $body .= ' '; + $attachments .= '' . $description . ''; + $attachments .= ' '; - - $SkipSpaces = 1; - foreach ($Links as $Val) { - if ($SkipSpaces) { - $SkipSpaces = 0; - } else { - $body .= '  |  '; - } - $body .= '' . $Val['text'] . ''; - } - - unset($Links); - - $body .= "\n"; - } - } else { - for ($i = 0; $i < count($message->entities); $i++) { - $body .= formatAttachments($message->entities[$i], $ent_id, $mailbox, $id); + $skipspaces = 1; + foreach ($links as $val) { + if ($skipspaces) { + $skipspaces = 0; + } else { + $attachments .= '  |  '; } + $attachments .= '' . $val['text'] . ''; } + unset($links); + $attachments .= "\n"; } - return( $body ); + return $attachments; } +function sqimap_base64_decode(&$string) { + $string = str_replace("\r\n", "\n", $string); + $string = base64_decode($string); +} -/** this function decodes the body depending on the encoding type. **/ +/* This function decodes the body depending on the encoding type. */ function decodeBody($body, $encoding) { - $body = str_replace("\r\n", "\n", $body); - $encoding = strtolower($encoding); - - global $show_html_default; + global $show_html_default; - if ($encoding == 'quoted-printable' || - $encoding == 'quoted_printable') { - $body = quoted_printable_decode($body); + $body = str_replace("\r\n", "\n", $body); + $encoding = strtolower($encoding); + if ($encoding == 'quoted-printable' || + $encoding == 'quoted_printable') { + $body = quoted_printable_decode($body); - while (ereg("=\n", $body)) - $body = ereg_replace ("=\n", "", $body); + while (ereg("=\n", $body)) { + $body = ereg_replace ("=\n", '', $body); + } - } else if ($encoding == 'base64') { - $body = base64_decode($body); - } + } else if ($encoding == 'base64') { + $body = base64_decode($body); + } - // All other encodings are returned raw. - return $body; + // All other encodings are returned raw. + return $body; } /* @@ -1085,35 +570,102 @@ function decodeBody($body, $encoding) { * RFC1522 (MIME Part Two: Message Header Extensions for Non-ASCII Text). * Patched by Christian Schmidt 23/03/2002 */ -function decodeHeader ($string, $utfencode=true) { +function decodeHeader ($string, $utfencode=true,$htmlsave=true) { + global $languages, $squirrelmail_language; if (is_array($string)) { $string = implode("\n", $string); } + + if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + $string = $languages[$squirrelmail_language]['XTRA_CODE']('decodeheader', $string); + // Do we need to return at this point? + // return $string; + } $i = 0; - while (preg_match('/^(.{' . $i . '})(.*)=\?([^?]*)\?(Q|B)\?([^?]*)\?=/Ui', - $string, $res)) { - $prefix = $res[1]; - // Ignore white-space between consecutive encoded-words - if (strspn($res[2], " \t") != strlen($res[2])) { - $prefix .= $res[2]; - } + $iLastMatch = -2; + $encoded = false; - if (ucfirst($res[4]) == 'B') { - $replace = base64_decode($res[5]); - } else { - $replace = str_replace('_', ' ', $res[5]); - $replace = preg_replace('/=([0-9a-f]{2})/ie', 'chr(hexdec("\1"))', + $aString = explode(' ',$string); + $ret = ''; + foreach ($aString as $chunk) { + if ($encoded && !$chunk) { + continue; + } elseif (!$chunk) { + $ret .= ' '; + continue; + } + $encoded = false; + /* if encoded words are not separated by a linear-space-white we still catch them */ + $j = $i-1; +// if ($chunk{0} === '=') { /* performance, saves an unnessecarry preg call */ + while ($match = preg_match('/^(.*)=\?([^?]*)\?(Q|B)\?([^?]*)\?=(.*)$/Ui',$chunk,$res)) { + /* if the last chunk isn't an encoded string then put back the space, otherwise don't */ + if ($iLastMatch !== $j) { + if ($htmlsave) { + $ret .= ' '; + } else { + $ret .= ' '; + } + } + $iLastMatch = $i; + $j = $i; + $ret .= $res[1]; + $encoding = ucfirst($res[3]); + switch ($encoding) + { + case 'B': + $replace = base64_decode($res[4]); + $ret .= charset_decode($res[2],$replace); + break; + case 'Q': + $replace = str_replace('_', ' ', $res[4]); + $replace = preg_replace('/=([0-9a-f]{2})/ie', 'chr(hexdec("\1"))', $replace); - /* Only encode into entities by default. Some places - don't need the encoding, like the compose form. */ - if ($utfencode) { - $replace = charset_decode($res[3], $replace); + /* Only encode into entities by default. Some places + * don't need the encoding, like the compose form. + */ + if ($utfencode) { + $replace = charset_decode($res[2], $replace); + } else { + if ($htmlsave) { + $replace = htmlspecialchars($replace); + } + } + $ret .= $replace; + break; + default: + break; } + $chunk = $res[5]; + $encoded = true; + } +// } + if (!$encoded) { + if ($htmlsave) { + $ret .= ' '; + } else { + $ret .= ' '; + } + } + + if (!$encoded && $htmlsave) { + $ret .= htmlspecialchars($chunk); + } else { + $ret .= $chunk; + } + ++$i; + } + /* remove the first added space */ + if ($ret) { + if ($htmlsave) { + $ret = substr($ret,6); + } else { + $ret = substr($ret,1); } - $string = $prefix . $replace . substr($string, strlen($res[0])); - $i = strlen($prefix) + strlen($replace); } - return( $string ); + + return $ret; } /* @@ -1122,61 +674,153 @@ function decodeHeader ($string, $utfencode=true) { * be encoded. */ function encodeHeader ($string) { - global $default_charset; + global $default_charset, $languages, $squirrelmail_language; + + if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + return $languages[$squirrelmail_language]['XTRA_CODE']('encodeheader', $string); + } + if (strtolower($default_charset) == 'iso-8859-1') { + $string = str_replace("\240",' ',$string); + } // Encode only if the string contains 8-bit characters or =? - $j = strlen( $string ); - $l = strstr($string, '=?'); // Must be encoded ? + $j = strlen($string); + $max_l = 75 - strlen($default_charset) - 7; + $aRet = array(); $ret = ''; - for( $i=0; $i < $j; ++$i) { - switch( $string{$i} ) { - case '=': - $ret .= '=3D'; - break; + $iEncStart = $enc_init = false; + $cur_l = $iOffset = 0; + for($i = 0; $i < $j; ++$i) { + switch($string{$i}) + { + case '=': + case '<': + case '>': + case ',': case '?': - $ret .= '=3F'; - break; case '_': - $ret .= '=5F'; - break; + if ($iEncStart === false) { + $iEncStart = $i; + } + $cur_l+=3; + if ($cur_l > ($max_l-2)) { + /* if there is an stringpart that doesn't need encoding, add it */ + $aRet[] = substr($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = "=?$default_charset?Q?$ret?="; + $iOffset = $i; + $cur_l = 0; + $ret = ''; + $iEncStart = false; + } else { + $ret .= sprintf("=%02X",ord($string{$i})); + } + break; + case '(': + case ')': + if ($iEncStart !== false) { + $aRet[] = substr($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = "=?$default_charset?Q?$ret?="; + $iOffset = $i; + $cur_l = 0; + $ret = ''; + $iEncStart = false; + } + break; case ' ': - $ret .= '_'; - break; + if ($iEncStart !== false) { + $cur_l++; + if ($cur_l > $max_l) { + $aRet[] = substr($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = "=?$default_charset?Q?$ret?="; + $iOffset = $i; + $cur_l = 0; + $ret = ''; + $iEncStart = false; + } else { + $ret .= '_'; + } + } + break; default: - $k = ord( $string{$i} ); - if ( $k > 126 ) { - $ret .= sprintf("=%02X", $k); - $l = TRUE; - } else - $ret .= $string{$i}; + $k = ord($string{$i}); + if ($k > 126) { + if ($iEncStart === false) { + // do not start encoding in the middle of a string, also take the rest of the word. + $sLeadString = substr($string,0,$i); + $aLeadString = explode(' ',$sLeadString); + $sToBeEncoded = array_pop($aLeadString); + $iEncStart = $i - strlen($sToBeEncoded); + $ret .= $sToBeEncoded; + $cur_l += strlen($sToBeEncoded); + } + $cur_l += 3; + /* first we add the encoded string that reached it's max size */ + if ($cur_l > ($max_l-2)) { + $aRet[] = substr($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = "=?$default_charset?Q?$ret?= "; /* the next part is also encoded => separate by space */ + $cur_l = 3; + $ret = ''; + $iOffset = $i; + $iEncStart = $i; + } + $enc_init = true; + $ret .= sprintf("=%02X", $k); + } else { + if ($iEncStart !== false) { + $cur_l++; + if ($cur_l > $max_l) { + $aRet[] = substr($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = "=?$default_charset?Q?$ret?="; + $iEncStart = false; + $iOffset = $i; + $cur_l = 0; + $ret = ''; + } else { + $ret .= $string{$i}; + } + } + } + break; } } - if ( $l ) { - $string = "=?$default_charset?Q?$ret?="; + if ($enc_init) { + if ($iEncStart !== false) { + $aRet[] = substr($string,$iOffset,$iEncStart-$iOffset); + $aRet[] = "=?$default_charset?Q?$ret?="; + } else { + $aRet[] = substr($string,$iOffset); + } + $string = implode('',$aRet); } - - return( $string ); + return $string; } /* This function trys to locate the entity_id of a specific mime element */ - -function find_ent_id( $id, $message ) { - $ret = ''; - for ($i=0; $ret == '' && $i < count($message->entities); $i++) { - if (( $message->entities[$i]->header->type1 == 'alternative') || - ( $message->entities[$i]->header->type1 == 'related') || - ( $message->entities[$i]->header->type1 == 'mixed')) { - $ret = find_ent_id( $id, $message->entities[$i] ); +function find_ent_id($id, $message) { + for ($i = 0, $ret = ''; $ret == '' && $i < count($message->entities); $i++) { + if ($message->entities[$i]->header->type0 == 'multipart') { + $ret = find_ent_id($id, $message->entities[$i]); } else { - if ( strcasecmp( $message->entities[$i]->header->id, $id ) == 0 ) - $ret = $message->entities[$i]->header->entity_id; + if (strcasecmp($message->entities[$i]->header->id, $id) == 0) { +// if (sq_check_save_extension($message->entities[$i])) { + return $message->entities[$i]->entity_id; +// } + } } - } - return( $ret ); + return $ret; } +function sq_check_save_extension($message) { + $filename = $message->getFilename(); + $ext = substr($filename, strrpos($filename,'.')+1); + $save_extensions = array('jpg','jpeg','gif','png','bmp'); + return in_array($ext, $save_extensions); +} + + /** ** HTMLFILTER ROUTINES */ @@ -1192,7 +836,8 @@ function find_ent_id( $id, $message ) { * @return a string with the final tag representation. */ function sq_tagprint($tagname, $attary, $tagtype){ - $me = "sq_tagprint"; + $me = 'sq_tagprint'; + if ($tagtype == 2){ $fulltag = ''; } else { @@ -1205,9 +850,9 @@ function sq_tagprint($tagname, $attary, $tagtype){ $fulltag .= ' ' . join(" ", $atts); } if ($tagtype == 3){ - $fulltag .= " /"; + $fulltag .= ' /'; } - $fulltag .= ">"; + $fulltag .= '>'; } return $fulltag; } @@ -1234,8 +879,8 @@ function sq_casenormalize(&$val){ * non-whitespace char is located. */ function sq_skipspace($body, $offset){ - $me = "sq_skipspace"; - preg_match("/^(\s*)/s", substr($body, $offset), $matches); + $me = 'sq_skipspace'; + preg_match('/^(\s*)/s', substr($body, $offset), $matches); if (sizeof($matches{1})){ $count = strlen($matches{1}); $offset += $count; @@ -1255,7 +900,7 @@ function sq_skipspace($body, $offset){ * strlen($body) if needle wasn't found. */ function sq_findnxstr($body, $offset, $needle){ - $me = "sq_findnxstr"; + $me = 'sq_findnxstr'; $pos = strpos($body, $needle, $offset); if ($pos === FALSE){ $pos = strlen($body); @@ -1277,11 +922,11 @@ function sq_findnxstr($body, $offset, $needle){ * - string with whatever it is we matched */ function sq_findnxreg($body, $offset, $reg){ - $me = "sq_findnxreg"; + $me = 'sq_findnxreg'; $matches = Array(); $retarr = Array(); - preg_match("%^(.*?)($reg)%s", substr($body, $offset), $matches); - if (!$matches{0}){ + preg_match("%^(.*?)($reg)%si", substr($body, $offset), $matches); + if (!isset($matches{0}) || !$matches{0}){ $retarr = false; } else { $retarr{0} = $offset + strlen($matches{1}); @@ -1306,7 +951,7 @@ function sq_findnxreg($body, $offset, $reg){ * first three members will be false, if the tag is invalid. */ function sq_getnxtag($body, $offset){ - $me = "sq_getnxtag"; + $me = 'sq_getnxtag'; if ($offset > strlen($body)){ return false; } @@ -1334,32 +979,34 @@ function sq_getnxtag($body, $offset){ */ $tagtype = false; switch (substr($body, $pos, 1)){ - case "/": - $tagtype = 2; - $pos++; - break; - case "!": - /** - * A comment or an SGML declaration. - */ - if (substr($body, $pos+1, 2) == "--"){ - $gt = strpos($body, "-->", $pos)+2; - if ($gt === false){ - $gt = strlen($body); + case '/': + $tagtype = 2; + $pos++; + break; + case '!': + /** + * A comment or an SGML declaration. + */ + if (substr($body, $pos+1, 2) == "--"){ + $gt = strpos($body, "-->", $pos); + if ($gt === false){ + $gt = strlen($body); + } else { + $gt += 2; + } + return Array(false, false, false, $lt, $gt); + } else { + $gt = sq_findnxstr($body, $pos, ">"); + return Array(false, false, false, $lt, $gt); } - return Array(false, false, false, $lt, $gt); - } else { - $gt = sq_findnxstr($body, $pos, ">"); - return Array(false, false, false, $lt, $gt); - } - break; - default: - /** - * Assume tagtype 1 for now. If it's type 3, we'll switch values - * later. - */ - $tagtype = 1; - break; + break; + default: + /** + * Assume tagtype 1 for now. If it's type 3, we'll switch values + * later. + */ + $tagtype = 1; + break; } $tag_start = $pos; @@ -1383,37 +1030,37 @@ function sq_getnxtag($body, $offset){ * Whatever else we find there indicates an invalid tag. */ switch ($match){ - case "/": - /** - * This is an xhtml-style tag with a closing / at the - * end, like so: . Check if it's followed - * by the closing bracket. If not, then this tag is invalid - */ - if (substr($body, $pos, 2) == "/>"){ - $pos++; - $tagtype = 3; - } else { - $gt = sq_findnxstr($body, $pos, ">"); - $retary = Array(false, false, false, $lt, $gt); - return $retary; - } - case ">": - return Array($tagname, false, $tagtype, $lt, $pos); - break; - default: - /** - * Check if it's whitespace - */ - if (preg_match("/\s/", $match)){ - } else { + case '/': /** - * This is an invalid tag! Look for the next closing ">". + * This is an xhtml-style tag with a closing / at the + * end, like so: . Check if it's followed + * by the closing bracket. If not, then this tag is invalid */ - $gt = sq_findnxstr($body, $offset, ">"); - return Array(false, false, false, $lt, $gt); - } + if (substr($body, $pos, 2) == "/>"){ + $pos++; + $tagtype = 3; + } else { + $gt = sq_findnxstr($body, $pos, ">"); + $retary = Array(false, false, false, $lt, $gt); + return $retary; + } + case '>': + return Array($tagname, false, $tagtype, $lt, $pos); + break; + default: + /** + * Check if it's whitespace + */ + if (!preg_match('/\s/', $match)){ + /** + * This is an invalid tag! Look for the next closing ">". + */ + $gt = sq_findnxstr($body, $lt, ">"); + return Array(false, false, false, $lt, $gt); + } + break; } - + /** * At this point we're here: * @@ -1485,91 +1132,92 @@ function sq_getnxtag($body, $offset){ * anything else means the attribute is invalid. */ switch($match){ - case "/": - /** - * This is an xhtml-style tag with a closing / at the - * end, like so: . Check if it's followed - * by the closing bracket. If not, then this tag is invalid - */ - if (substr($body, $pos, 2) == "/>"){ - $pos++; - $tagtype = 3; - } else { - $gt = sq_findnxstr($body, $pos, ">"); - $retary = Array(false, false, false, $lt, $gt); - return $retary; - } - case ">": - $attary{$attname} = '"yes"'; - return Array($tagname, $attary, $tagtype, $lt, $pos); - break; - default: - /** - * Skip whitespace and see what we arrive at. - */ - $pos = sq_skipspace($body, $pos); - $char = substr($body, $pos, 1); - /** - * Two things are valid here: - * '=' means this is attribute type 1 2 or 3. - * \w means this was attribute type 4. - * anything else we ignore and re-loop. End of tag and - * invalid stuff will be caught by our checks at the beginning - * of the loop. - */ - if ($char == "="){ - $pos++; - $pos = sq_skipspace($body, $pos); + case '/': /** - * Here are 3 possibilities: - * "'" attribute type 1 - * '"' attribute type 2 - * everything else is the content of tag type 3 + * This is an xhtml-style tag with a closing / at the + * end, like so: . Check if it's followed + * by the closing bracket. If not, then this tag is invalid */ - $quot = substr($body, $pos, 1); - if ($quot == "'"){ - $regary = sq_findnxreg($body, $pos+1, "\'"); - if ($regary == false){ - return Array(false, false, false, $lt, strlen($body)); - } - list($pos, $attval, $match) = $regary; + if (substr($body, $pos, 2) == "/>"){ $pos++; - $attary{$attname} = "'" . $attval . "'"; - } else if ($quot == '"'){ - $regary = sq_findnxreg($body, $pos+1, '\"'); - if ($regary == false){ - return Array(false, false, false, $lt, strlen($body)); - } - list($pos, $attval, $match) = $regary; - $pos++; - $attary{$attname} = '"' . $attval . '"'; + $tagtype = 3; } else { + $gt = sq_findnxstr($body, $pos, ">"); + $retary = Array(false, false, false, $lt, $gt); + return $retary; + } + case '>': + $attary{$attname} = '"yes"'; + return Array($tagname, $attary, $tagtype, $lt, $pos); + break; + default: + /** + * Skip whitespace and see what we arrive at. + */ + $pos = sq_skipspace($body, $pos); + $char = substr($body, $pos, 1); + /** + * Two things are valid here: + * '=' means this is attribute type 1 2 or 3. + * \w means this was attribute type 4. + * anything else we ignore and re-loop. End of tag and + * invalid stuff will be caught by our checks at the beginning + * of the loop. + */ + if ($char == "="){ + $pos++; + $pos = sq_skipspace($body, $pos); /** - * These are hateful. Look for \s, or >. + * Here are 3 possibilities: + * "'" attribute type 1 + * '"' attribute type 2 + * everything else is the content of tag type 3 */ - $regary = sq_findnxreg($body, $pos, "[\s>]"); - if ($regary == false){ - return Array(false, false, false, $lt, strlen($body)); + $quot = substr($body, $pos, 1); + if ($quot == "'"){ + $regary = sq_findnxreg($body, $pos+1, "\'"); + if ($regary == false){ + return Array(false, false, false, $lt, strlen($body)); + } + list($pos, $attval, $match) = $regary; + $pos++; + $attary{$attname} = "'" . $attval . "'"; + } else if ($quot == '"'){ + $regary = sq_findnxreg($body, $pos+1, '\"'); + if ($regary == false){ + return Array(false, false, false, $lt, strlen($body)); + } + list($pos, $attval, $match) = $regary; + $pos++; + $attary{$attname} = '"' . $attval . '"'; + } else { + /** + * These are hateful. Look for \s, or >. + */ + $regary = sq_findnxreg($body, $pos, "[\s>]"); + if ($regary == false){ + return Array(false, false, false, $lt, strlen($body)); + } + list($pos, $attval, $match) = $regary; + /** + * If it's ">" it will be caught at the top. + */ + $attval = preg_replace("/\"/s", """, $attval); + $attary{$attname} = '"' . $attval . '"'; } - list($pos, $attval, $match) = $regary; + } else if (preg_match("|[\w/>]|", $char)) { /** - * If it's ">" it will be caught at the top. + * That was attribute type 4. */ - $attval = preg_replace("/\"/s", """, $attval); - $attary{$attname} = '"' . $attval . '"'; + $attary{$attname} = '"yes"'; + } else { + /** + * An illegal character. Find next '>' and return. + */ + $gt = sq_findnxstr($body, $pos, ">"); + return Array(false, false, false, $lt, $gt); } - } else if (preg_match("|[\w/>]|", $char)) { - /** - * That was attribute type 4. - */ - $attary{$attname} = '"yes"'; - } else { - /** - * An illegal character. Find next '>' and return. - */ - $gt = sq_findnxstr($body, $pos, ">"); - return Array(false, false, false, $lt, $gt); - } + break; } } /** @@ -1588,7 +1236,7 @@ function sq_getnxtag($body, $offset){ * @return Translated value. */ function sq_deent($attvalue){ - $me="sq_deent"; + $me = 'sq_deent'; /** * See if we have to run the checks first. All entities must start * with "&". @@ -1644,9 +1292,10 @@ function sq_fixatts($tagname, $bad_attvals, $add_attr_to_tag, $message, - $id + $id, + $mailbox ){ - $me = "sq_fixatts"; + $me = 'sq_fixatts'; while (list($attname, $attvalue) = each($attary)){ /** * See if this attribute should be removed. @@ -1695,7 +1344,7 @@ function sq_fixatts($tagname, * Turn cid: urls into http-friendly ones. */ if (preg_match("/^[\'\"]\s*cid:/si", $attvalue)){ - $attary{$attname} = sq_cid2http($message, $id, $attvalue); + $attary{$attname} = sq_cid2http($message, $id, $attvalue, $mailbox); } } /** @@ -1718,9 +1367,15 @@ function sq_fixatts($tagname, * @param $content a string with whatever is between * @return a string with edited content. */ -function sq_fixstyle($message, $id, $content){ +function sq_fixstyle($body, $pos, $message, $id){ global $view_unsafe_images; - $me = "sq_fixstyle"; + $me = 'sq_fixstyle'; + $ret = sq_findnxreg($body, $pos, ''); + if ($ret == FALSE){ + return array(FALSE, strlen($body)); + } + $newpos = $ret[0] + strlen($ret[2]); + $content = $ret[1]; /** * First look for general BODY style declaration, which would be * like so: @@ -1728,38 +1383,42 @@ function sq_fixstyle($message, $id, $content){ * and change it to .bodyclass so we can just assign it to a
*/ $content = preg_replace("|body(\s*\{.*?\})|si", ".bodyclass\\1", $content); - $secremoveimg = "../images/" . _("sec_remove_eng.png"); + $secremoveimg = '../images/' . _("sec_remove_eng.png"); /** * Fix url('blah') declarations. */ - $content = preg_replace("|url\(([\'\"])\s*\S+script\s*:.*?([\'\"])\)|si", + $content = preg_replace("|url\s*\(\s*([\'\"])\s*\S+script\s*:.*?([\'\"])\s*\)|si", "url(\\1$secremoveimg\\2)", $content); /** * Fix url('https*://.*) declarations but only if $view_unsafe_images * is false. */ if (!$view_unsafe_images){ - $content = preg_replace("|url\(([\'\"])\s*https*:.*?([\'\"])\)|si", + $content = preg_replace("|url\s*\(\s*([\'\"])\s*https*:.*?([\'\"])\s*\)|si", "url(\\1$secremoveimg\\2)", $content); } - + /** * Fix urls that refer to cid: */ - while (preg_match("|url\(([\'\"]\s*cid:.*?[\'\"])\)|si", $content, - $matches)){ + while (preg_match("|url\s*\(\s*([\'\"]\s*cid:.*?[\'\"])\s*\)|si", + $content, $matches)){ $cidurl = $matches{1}; $httpurl = sq_cid2http($message, $id, $cidurl); - $content = preg_replace("|url\($cidurl\)|si", + $content = preg_replace("|url\s*\(\s*$cidurl\s*\)|si", "url($httpurl)", $content); } /** - * Fix stupid expression: declarations which lead to vulnerabilities + * Fix stupid css declarations which lead to vulnerabilities * in IE. */ - $content = preg_replace("/expression\s*:/si", "idiocy:", $content); - return $content; + $match = Array('/expression/i', + '/behaviou*r/i', + '/binding/i'); + $replace = Array('idiocy', 'idiocy', 'idiocy'); + $content = preg_replace($match, $replace, $content); + return array($content, $newpos); } /** @@ -1771,16 +1430,22 @@ function sq_fixstyle($message, $id, $content){ * @param $cidurl the cid: url. * @return a string with a http-friendly url */ -function sq_cid2http($message, $id, $cidurl){ +function sq_cid2http($message, $id, $cidurl, $mailbox){ /** * Get rid of quotes. */ $quotchar = substr($cidurl, 0, 1); $cidurl = str_replace($quotchar, "", $cidurl); $cidurl = substr(trim($cidurl), 4); - $httpurl = $quotchar . "../src/download.php?absolute_dl=true&" . - "passed_id=$id&mailbox=" . urlencode($message->header->mailbox) . - "&passed_ent_id=" . find_ent_id($cidurl, $message) . $quotchar; + $linkurl = find_ent_id($cidurl, $message); + /* in case of non-save cid links $httpurl should be replaced by a sort of + unsave link image */ + $httpurl = ''; + if ($linkurl) { + $httpurl = $quotchar . SM_PATH . 'src/download.php?absolute_dl=true&' . + "passed_id=$id&mailbox=" . urlencode($mailbox) . + '&ent_id=' . $linkurl . $quotchar; + } return $httpurl; } @@ -1792,24 +1457,25 @@ function sq_cid2http($message, $id, $cidurl){ * @return a modified array of attributes to be set for
*/ function sq_body2div($attary){ - $me = "sq_body2div"; - $divattary = Array("class"=>"'bodyclass'"); - $bgcolor="#ffffff"; - $text="#000000"; - $styledef=""; + $me = 'sq_body2div'; + $divattary = Array('class' => "'bodyclass'"); + $bgcolor = '#ffffff'; + $text = '#000000'; + $styledef = ''; if (is_array($attary) && sizeof($attary) > 0){ foreach ($attary as $attname=>$attvalue){ $quotchar = substr($attvalue, 0, 1); $attvalue = str_replace($quotchar, "", $attvalue); switch ($attname){ - case "background": - $styledef .= "background-image: url('$attvalue'); "; - break; - case "bgcolor": - $styledef .= "background-color: $attvalue; "; - break; - case "text": - $styledef .= "color: $attvalue; "; + case 'background': + $styledef .= "background-image: url('$attvalue'); "; + break; + case 'bgcolor': + $styledef .= "background-color: $attvalue; "; + break; + case 'text': + $styledef .= "color: $attvalue; "; + break; } } if (strlen($styledef) > 0){ @@ -1848,13 +1514,15 @@ function sq_sanitize($body, $bad_attvals, $add_attr_to_tag, $message, - $id + $id, + $mailbox ){ - $me = "sq_sanitize"; + $me = 'sq_sanitize'; + $rm_tags = array_shift($tag_list); /** * Normalize rm_tags and rm_tags_with_content. */ - @array_walk($rm_tags, 'sq_casenormalize'); + @array_walk($tag_list, 'sq_casenormalize'); @array_walk($rm_tags_with_content, 'sq_casenormalize'); @array_walk($self_closing_tags, 'sq_casenormalize'); /** @@ -1862,28 +1530,34 @@ function sq_sanitize($body, * false means remove these tags * true means allow these tags */ - $rm_tags = array_shift($tag_list); $curpos = 0; $open_tags = Array(); $trusted = "\n"; $skip_content = false; + /** + * Take care of netscape's stupid javascript entities like + * &{alert('boo')}; + */ + $body = preg_replace("/&(\{.*?\};)/si", "&\\1", $body); - while (($curtag=sq_getnxtag($body, $curpos)) != FALSE){ + while (($curtag = sq_getnxtag($body, $curpos)) != FALSE){ list($tagname, $attary, $tagtype, $lt, $gt) = $curtag; $free_content = substr($body, $curpos, $lt-$curpos); /** * Take care of . Edit the - * content before we apply it. - */ - $free_content = sq_fixstyle($message, $id, $free_content); + if ($tagname == "style" && $tagtype == 1){ + list($free_content, $curpos) = + sq_fixstyle($body, $gt+1, $message, $id); + if ($free_content != FALSE){ + $trusted .= sq_tagprint($tagname, $attary, $tagtype); + $trusted .= $free_content; + $trusted .= sq_tagprint($tagname, false, 2); + } + continue; } if ($skip_content == false){ $trusted .= $free_content; - } else { } if ($tagname != FALSE){ if ($tagtype == 2){ @@ -1905,7 +1579,6 @@ function sq_sanitize($body, $tagname = false; } } - } else { } } } else { @@ -1952,7 +1625,8 @@ function sq_sanitize($body, $bad_attvals, $add_attr_to_tag, $message, - $id + $id, + $mailbox ); } /** @@ -1964,13 +1638,11 @@ function sq_sanitize($body, } } } - } else { } } if ($tagname != false && $skip_content == false){ $trusted .= sq_tagprint($tagname, $attary, $tagtype); } - } else { } $curpos = $gt+1; } @@ -1995,9 +1667,9 @@ function sq_sanitize($body, * @param $id the id of the message * @return a string with html safe to display in the browser. */ -function magicHTML($body, $id, $message){ +function magicHTML($body, $id, $message, $mailbox = 'INBOX') { global $attachment_common_show_images, $view_unsafe_images, - $has_unsafe_images; + $has_unsafe_images; /** * Don't display attached images in HTML mode. */ @@ -2008,7 +1680,10 @@ function magicHTML($body, $id, $message){ "meta", "html", "head", - "base" + "base", + "link", + "frame", + "iframe" ); $rm_tags_with_content = Array( @@ -2030,8 +1705,11 @@ function magicHTML($body, $id, $message){ $rm_attnames = Array( "/.*/" => Array( - "/target/si", - "/^on.*/si" + "/target/i", + "/^on.*/i", + "/^dynsrc/i", + "/^data.*/i", + "/^lowsrc.*/i" ) ); @@ -2039,65 +1717,79 @@ function magicHTML($body, $id, $message){ $bad_attvals = Array( "/.*/" => Array( - "/^src|background|href|action/i" => + "/^src|background/i" => Array( Array( "|^([\'\"])\s*\.\./.*([\'\"])|si", - "/^([\'\"])\s*\S+script\s*:.*([\'\"])/si" + "/^([\'\"])\s*\S+script\s*:.*([\'\"])/si", + "/^([\'\"])\s*mocha\s*:*.*([\'\"])/si", + "/^([\'\"])\s*about\s*:.*([\'\"])/si" ), Array( + "\\1$secremoveimg\\2", + "\\1$secremoveimg\\2", "\\1$secremoveimg\\2", "\\1$secremoveimg\\2" ) ), - "/^style/si" => + "/^href|action/i" => Array( Array( - "/expression\s*:/si", - "|url\(([\'\"])\s*\.\./.*([\'\"])\)|si", - "/url\(([\'\"])\s*\S+script:.*([\'\"])\)/si" - ), - Array( - "idiocy:", - "url(\\1$secremoveimg\\2)", - "url(\\1$secremoveimg\\2)" - ) - ) - ) - ); - if (!$view_unsafe_images){ - /** - * Remove any references to http/https if view_unsafe_images set - * to false. - */ - $addendum = Array( - "/.*/" => - Array( - "/^src|background/i" => - Array( - Array( - "/^([\'\"])\s*https*:.*([\'\"])/si" + "|^([\'\"])\s*\.\./.*([\'\"])|si", + "/^([\'\"])\s*\S+script\s*:.*([\'\"])/si", + "/^([\'\"])\s*mocha\s*:*.*([\'\"])/si", + "/^([\'\"])\s*about\s*:.*([\'\"])/si" ), Array( - "\\1$secremoveimg\\2" + "\\1#\\2", + "\\1#\\2", + "\\1#\\2", + "\\1#\\2" ) ), - "/^style/si" => + "/^style/i" => Array( Array( - "/url\(([\'\"])\s*https*:.*([\'\"])\)/si" + "/expression/i", + "/binding/i", + "/behaviou*r/i", + "|url\s*\(\s*([\'\"])\s*\.\./.*([\'\"])\s*\)|si", + "/url\s*\(\s*([\'\"])\s*\S+script\s*:.*([\'\"])\s*\)/si", + "/url\s*\(\s*([\'\"])\s*mocha\s*:.*([\'\"])\s*\)/si", + "/url\s*\(\s*([\'\"])\s*about\s*:.*([\'\"])\s*\)/si" ), Array( - "url(\\1$secremoveimg\\2)" + "idiocy", + "idiocy", + "idiocy", + "url(\\1#\\2)", + "url(\\1#\\2)", + "url(\\1#\\2)", + "url(\\1#\\2)" ) ) ) - ); - $bad_attvals = array_merge($bad_attvals, $addendum); + ); + if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) { + $view_unsafe_images = false; + } + if (!$view_unsafe_images){ + /** + * Remove any references to http/https if view_unsafe_images set + * to false. + */ + array_push($bad_attvals{'/.*/'}{'/^src|background/i'}[0], + '/^([\'\"])\s*https*:.*([\'\"])/si'); + array_push($bad_attvals{'/.*/'}{'/^src|background/i'}[1], + "\\1$secremoveimg\\2"); + array_push($bad_attvals{'/.*/'}{'/^style/i'}[0], + '/url\(([\'\"])\s*https*:.*([\'\"])\)/si'); + array_push($bad_attvals{'/.*/'}{'/^style/i'}[1], + "url(\\1$secremoveimg\\2)"); } $add_attr_to_tag = Array( - "/^a$/si" => Array('target'=>'"_new"') + "/^a$/i" => Array('target'=>'"_new"') ); $trusted = sq_sanitize($body, $tag_list, @@ -2108,11 +1800,13 @@ function magicHTML($body, $id, $message){ $bad_attvals, $add_attr_to_tag, $message, - $id + $id, + $mailbox ); - if (preg_match("|$secremoveimg|si", $trusted)){ + if (preg_match("|$secremoveimg|i", $trusted)){ $has_unsafe_images = true; - } + } return $trusted; } -?> \ No newline at end of file + +?>