X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fmime.php;h=7bacc8625658c2136a934e44a7b2fef7d467dc3e;hp=e8538eb918fb79c9ed0427c72edbc271742ee85a;hb=b17a8968214b532391299cc58fbf25f7a5b5cd29;hpb=4d592352b16c63c5ede7ffcc51d78fb011a82601 diff --git a/functions/mime.php b/functions/mime.php index e8538eb9..7bacc862 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -3,15 +3,17 @@ /** * mime.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team + * Copyright (c) 1999-2004 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 * messages. * - * $Id$ + * @version $Id$ + * @package squirrelmail */ +/** The typical includes... */ require_once(SM_PATH . 'functions/imap.php'); require_once(SM_PATH . 'functions/attachment_common.php'); @@ -19,11 +21,13 @@ require_once(SM_PATH . 'functions/attachment_common.php'); /* MIME DECODING */ /* -------------------------------------------------------------------------- */ -/* This function gets the structure of a message and stores it in the "message" class. +/** + * Get the MIME structure + * + * 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 ($bodystructure, $flags=array()) { /* Isolate the body structure and remove beginning and end parenthesis. */ @@ -37,7 +41,7 @@ function mime_structure ($bodystructure, $flags=array()) { /* 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 .= '
'._("the provided bodystructure by your imap-server").':

'; $errormessage .= '
' . htmlspecialchars($read) . '
'; plain_error_message( $errormessage, $color ); echo ''; @@ -93,7 +97,6 @@ function mime_structure ($bodystructure, $flags=array()) { */ function mime_fetch_body($imap_stream, $id, $ent_id=1, $fetch_size=0) { - 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. */ @@ -105,8 +108,8 @@ function mime_fetch_body($imap_stream, $id, $ent_id=1, $fetch_size=0) { } if ($fetch_size!=0) $cmd .= "<0.$fetch_size>"; - - $data = sqimap_run_command ($imap_stream, $cmd, true, $response, $message, $uid_support); + + $data = sqimap_run_command ($imap_stream, $cmd, true, $response, $message, TRUE); do { $topline = trim(array_shift($data)); } while($topline && ($topline[0] == '*') && !preg_match('/\* [0-9]+ FETCH.*/i', $topline)) ; @@ -118,7 +121,7 @@ function mime_fetch_body($imap_stream, $id, $ent_id=1, $fetch_size=0) { * 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); +// $data = sqimap_run_command ($imap_stream, "FETCH $id BODY[$ent_id.MIME]", true, $response, $message, TRUE); // } } else if (ereg('"([^"]*)"', $topline, $regs)) { $ret = $regs[1]; @@ -134,18 +137,18 @@ function mime_fetch_body($imap_stream, $id, $ent_id=1, $fetch_size=0) { '&message=' . urlencode($message) . '&topline=' . urlencode($topline); - echo '
' . + echo '
' . '' . - '' . '" . '" . '" . '" . - "
' . + '
' . _("Body retrieval error. The reason for this is most probably that the message is malformed.") . '
' . _("Command:") . "$cmd
' . _("Response:") . "$response
' . _("Message:") . "$message
' . _("FETCH line:") . "$topline

"; + "
"; - $data = sqimap_run_command ($imap_stream, "FETCH $passed_id BODY[]", true, $response, $message, $uid_support); + $data = sqimap_run_command ($imap_stream, "FETCH $passed_id BODY[]", true, $response, $message, TRUE); array_shift($data); $wholemessage = implode('', $data); @@ -155,11 +158,10 @@ function mime_fetch_body($imap_stream, $id, $ent_id=1, $fetch_size=0) { } function mime_print_body_lines ($imap_stream, $id, $ent_id=1, $encoding) { - global $uid_support; /* 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. + * Don't call set_time_limit in safe mode. */ if (!ini_get('safe_mode')) { @@ -173,23 +175,23 @@ function mime_print_body_lines ($imap_stream, $id, $ent_id=1, $encoding) { } else { $query = "FETCH $id BODY[$ent_id]"; } - sqimap_run_command($imap_stream,$query,true,$response,$message,$uid_support,'sqimap_base64_decode','php://stdout',true); + sqimap_run_command($imap_stream,$query,true,$response,$message,TRUE,'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 + 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. + 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. */ @@ -231,7 +233,7 @@ function mime_print_body_lines ($imap_stream, $id, $ent_id=1, $encoding) { */ function listEntities ($message) { if ($message) { - echo "" . $message->entity_id . ' : ' . $message->type0 . '/' . $message->type1 . ' parent = '. $message->parent->entity_id. '
'; + 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]); @@ -356,9 +358,9 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma $body = decodeBody($body, $body_message->header->encoding); if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode')) { if (mb_detect_encoding($body) != 'ASCII') { - $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body); + $body = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode',$body); } } $hookResults = do_hook("message_body", $body); @@ -372,9 +374,11 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma if ($show_html_default <> 1) { $entity_conv = array(' ' => ' ', '

' => "\n", - '
' => "\n", '

' => "\n", + '
' => "\n", '
' => "\n", + '
' => "\n", + '
' => "\n", '>' => '>', '<' => '<'); $body = strtr($body, $entity_conv); @@ -389,12 +393,14 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma translateText($body, $wrap_at, $body_message->header->getParameter('charset')); } - $link = 'read_body.php?passed_id=' . $id . '&ent_id='.$ent_num. + $link = 'passed_id=' . $id . '&ent_id='.$ent_num. '&mailbox=' . $urlmailbox .'&sort=' . $sort . - '&startMessage=' . $startMessage . '&show_more=0'; + '&startMessage=' . $startMessage . '&show_more=0'; if (isset($passed_ent_id)) { $link .= '&passed_ent_id='.$passed_ent_id; } + $body .= '

' . _("Download this as a file") . ''; if ($view_unsafe_images) { $text = _("Hide Unsafe Images"); } else { @@ -405,8 +411,10 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma $text = ''; } } - $body .= '
'.$text. - '

' . "\n"; + if($text != '') { + $body .= ' | ' . $text . ''; + } + $body .= '

' . "\n"; } return $body; } @@ -430,7 +438,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) { $type0 = strtolower($header->type0); $type1 = strtolower($header->type1); $name = ''; - $links['download link']['text'] = _("download"); + $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 = ''; @@ -498,6 +506,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) { 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. @@ -514,14 +523,14 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) { $links = $hookresults[1]; $defaultlink = $hookresults[6]; - $attachments .= '' . - ''.decodeHeader($display_filename).' ' . - '' . show_readable_size($header->size) . - '  ' . - "[ $type0/$type1 ] " . - ''; + $attachments .= '' . + ''.decodeHeader($display_filename).' ' . + '' . show_readable_size($header->size) . + '  ' . + '[ '.htmlspecialchars($type0).'/'.htmlspecialchars($type1).' ] ' . + ''; $attachments .= '' . $description . ''; - $attachments .= ' '; + $attachments .= ' '; $skipspaces = 1; foreach ($links as $val) { @@ -533,7 +542,7 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) { $attachments .= '' . $val['text'] . ''; } unset($links); - $attachments .= "\n"; + $attachments .= "\n"; } $attachmentadd = do_hook_function('attachments_bottom',$attachments); if ($attachmentadd != '') @@ -542,10 +551,30 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) { } function sqimap_base64_decode(&$string) { - $string = str_replace("\r\n", "\n", $string); + + // Base64 encoded data goes in pairs of 4 bytes. To achieve on the + // fly decoding (to reduce memory usage) you have to check if the + // data has incomplete pairs + + // Remove the noise in order to check if the 4 bytes pairs are complete + $string = str_replace(array("\r\n","\n", "\r", " "),array('','','',''),$string); + + $sStringRem = ''; + $iMod = strlen($string) % 4; + if ($iMod) { + $sStringRem = substr($string,-$iMod); + // Check if $sStringRem contains padding characters + if (substr($sStringRem,-1) != '=') { + $string = substr($string,0,-$iMod); + } else { + $sStringRem = ''; + } + } $string = base64_decode($string); + return $sStringRem; } + /* This function decodes the body depending on the encoding type. */ function decodeBody($body, $encoding) { global $show_html_default; @@ -577,20 +606,28 @@ function decodeBody($body, $encoding) { return $body; } -/* +/** + * Decodes headers + * * This functions decode strings that is encoded according to * RFC1522 (MIME Part Two: Message Header Extensions for Non-ASCII Text). * Patched by Christian Schmidt 23/03/2002 + * + * @param string $string header string that has to be made readable + * @param boolean $utfencode change message in order to be readable on user's charset. defaults to true + * @param boolean $htmlsave preserve spaces and sanitize html special characters. defaults to true + * @param boolean $decide decide if string can be utfencoded. defaults to false + * @return string decoded header string */ -function decodeHeader ($string, $utfencode=true,$htmlsave=true) { - global $languages, $squirrelmail_language; +function decodeHeader ($string, $utfencode=true,$htmlsave=true,$decide=false) { + global $languages, $squirrelmail_language,$default_charset; 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); + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_decodeheader')) { + $string = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decodeheader', $string); // Do we need to return at this point? // return $string; } @@ -610,12 +647,12 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) { $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 .= ' '; + $ret .= ' '; } else { $ret .= ' '; } @@ -624,21 +661,42 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) { $j = $i; $ret .= $res[1]; $encoding = ucfirst($res[3]); + + /* decide about valid decoding */ + if ($decide && is_conversion_safe($res[2])) { + $utfencode=true; + $can_be_encoded=true; + } else { + $can_be_encoded=false; + } switch ($encoding) { case 'B': $replace = base64_decode($res[4]); - $ret .= charset_decode($res[2],$replace); + if ($can_be_encoded) { + /* convert string to different charset, + * if functions asks for it (usually in compose) + */ + $ret .= charset_convert($res[2],$replace,$default_charset); + } else { + // convert string to html codes in order to display it + $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 = 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) { + if ($can_be_encoded) { + /* convert string to different charset, + * if functions asks for it (usually in compose) + */ + $replace = charset_convert($res[2], $replace,$default_charset); + } else { + // convert string to html codes in order to display it $replace = charset_decode($res[2], $replace); + } } else { if ($htmlsave) { $replace = htmlspecialchars($replace); @@ -652,13 +710,12 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) { $chunk = $res[5]; $encoded = true; } -// } if (!$encoded) { if ($htmlsave) { - $ret .= ' '; + $ret .= ' '; } else { $ret .= ' '; - } + } } if (!$encoded && $htmlsave) { @@ -671,29 +728,31 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) { /* remove the first added space */ if ($ret) { if ($htmlsave) { - $ret = substr($ret,6); + $ret = substr($ret,5); } else { $ret = substr($ret,1); } } - + return $ret; } -/* +/** + * Encodes header as quoted-printable + * * Encode a string according to RFC 1522 for use in headers if it * contains 8-bit characters or anything that looks like it should * be encoded. + * + * @param string $string header string, that has to be encoded + * @return string quoted-printable encoded string */ function encodeHeader ($string) { 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); + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_encodeheader')) { + return call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_encodeheader', $string); } // Encode only if the string contains 8-bit characters or =? @@ -761,7 +820,7 @@ function encodeHeader ($string) { // 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); + $sToBeEncoded = array_pop($aLeadString); $iEncStart = $i - strlen($sToBeEncoded); $ret .= $sToBeEncoded; $cur_l += strlen($sToBeEncoded); @@ -818,7 +877,7 @@ function find_ent_id($id, $message) { if (strcasecmp($message->entities[$i]->header->id, $id) == 0) { // if (sq_check_save_extension($message->entities[$i])) { return $message->entities[$i]->entity_id; -// } +// } } } } @@ -850,6 +909,7 @@ function sq_unbackslash($attvalue){ /** * Remove any backslashes. See if there are any first. */ + if (strstr($attvalue, '\\') !== false){ $attvalue = stripslashes($attvalue); } @@ -860,7 +920,7 @@ function sq_unbackslash($attvalue){ * Kill any tabs, newlines, or carriage returns. Our friends the * makers of the browser with 95% market value decided that it'd * be funny to make "java[tab]script" be just as good as "javascript". - * + * * @param attvalue The attribute value before extraneous spaces removed. * @return attvalue The attribute value after extraneous spaces removed. */ @@ -874,7 +934,7 @@ function sq_unspace($attvalue){ /** * This function returns the final tag out of the tag name, an array - * of attributes, and the type of the tag. This function is called by + * of attributes, and the type of the tag. This function is called by * sq_sanitize internally. * * @param $tagname the name of the tag. @@ -918,7 +978,7 @@ function sq_casenormalize(&$val){ /** * This function skips any whitespace from the current position within * a string and to the next non-whitespace value. - * + * * @param $body the string * @param $offset the offset within the string where we should start * looking for the next non-whitespace character. @@ -1022,7 +1082,7 @@ function sq_getnxtag($body, $offset){ * 2. Closing tag, e.g.: * * 3. XHTML-style content-less tag, e.g.: - * + * */ $tagtype = false; switch (substr($body, $pos, 1)){ @@ -1073,14 +1133,14 @@ function sq_getnxtag($body, $offset){ * '>' indicating the end of the tag entirely. * '\s' indicating the end of the tag name. * '/' indicating that this is type-3 xhtml tag. - * + * * 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 + * end, like so: . Check if it's followed * by the closing bracket. If not, then this tag is invalid */ if (substr($body, $pos, 2) == "/>"){ @@ -1182,7 +1242,7 @@ function sq_getnxtag($body, $offset){ case '/': /** * This is an xhtml-style tag with a closing / at the - * end, like so: . Check if it's followed + * end, like so: . Check if it's followed * by the closing bracket. If not, then this tag is invalid */ if (substr($body, $pos, 2) == "/>"){ @@ -1282,13 +1342,14 @@ function sq_getnxtag($body, $offset){ * @param $attvalue A string to run entity check against. * @return Translated value. */ + function sq_deent($attvalue){ $me = 'sq_deent'; /** * See if we have to run the checks first. All entities must start * with "&". */ - if (strpos($attvalue, "&") === false){ + if (strpos($attvalue, '&') === false){ return $attvalue; } /** @@ -1299,22 +1360,22 @@ function sq_deent($attvalue){ * Leave " in, as it can mess us up. */ $trans = array_flip($trans); - unset($trans{"""}); + unset($trans{'"'}); while (list($ent, $val) = each($trans)){ - $attvalue = preg_replace("/$ent*(\W)/si", "$val\\1", $attvalue); + $attvalue = preg_replace('/' . $ent . '*/si', $val, $attvalue); } /** * Now translate numbered entities from 1 to 255 if needed. */ - if (strpos($attvalue, "#") !== false){ + if (strpos($attvalue, '#') !== false){ $omit = Array(34, 39); - for ($asc=1; $asc<256; $asc++){ + for ($asc = 256; $asc >= 0; $asc--){ if (!in_array($asc, $omit)){ $chr = chr($asc); - $attvalue = preg_replace("/\�*$asc;*(\D)/si", "$chr\\1", - $attvalue); - $attvalue = preg_replace("/\�*".dechex($asc).";*(\W)/si", - "$chr\\1", $attvalue); + $octrule = '/\�*' . $asc . ';*/si'; + $hexrule = '/\�*' . dechex($asc) . ';*/si'; + $attvalue = preg_replace($octrule, $chr, $attvalue); + $attvalue = preg_replace($hexrule, $chr, $attvalue); } } } @@ -1333,8 +1394,8 @@ function sq_deent($attvalue){ * @param $id message id * @return Array with modified attributes. */ -function sq_fixatts($tagname, - $attary, +function sq_fixatts($tagname, + $attary, $rm_attnames, $bad_attvals, $add_attr_to_tag, @@ -1364,6 +1425,12 @@ function sq_fixatts($tagname, $attvalue = sq_deent($attvalue); $attvalue = sq_unspace($attvalue); + /** + * Remove \r \n \t \0 " " "\\" + */ + $attvalue = str_replace(Array("\r", "\n", "\t", "\0", " ", "\\"), + Array('', '','','','',''), $attvalue); + /** * Now let's run checks on the attvalues. * I don't expect anyone to comprehend this. If you do, @@ -1380,7 +1447,7 @@ function sq_fixatts($tagname, * Second one is replacements */ list($valmatch, $valrepl) = $valary; - $newvalue = + $newvalue = preg_replace($valmatch, $valrepl, $attvalue); if ($newvalue != $attvalue){ $attary{$attname} = $newvalue; @@ -1410,13 +1477,14 @@ function sq_fixatts($tagname, /** * This function edits the style definition to make them friendly and * usable in squirrelmail. - * + * * @param $message the message object * @param $id the message id * @param $content a string with whatever is between + * @param $mailbox the message mailbox * @return a string with edited content. */ -function sq_fixstyle($body, $pos, $message, $id){ +function sq_fixstyle($body, $pos, $message, $id, $mailbox){ global $view_unsafe_images; $me = 'sq_fixstyle'; $ret = sq_findnxreg($body, $pos, ''); @@ -1446,14 +1514,14 @@ function sq_fixstyle($body, $pos, $message, $id){ $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*\(\s*([\'\"]\s*cid:.*?[\'\"])\s*\)|si", + while (preg_match("|url\s*\(\s*([\'\"]\s*cid:.*?[\'\"])\s*\)|si", $content, $matches)){ $cidurl = $matches{1}; - $httpurl = sq_cid2http($message, $id, $cidurl); + $httpurl = sq_cid2http($message, $id, $cidurl, $mailbox); $content = preg_replace("|url\s*\(\s*$cidurl\s*\)|si", "url($httpurl)", $content); } @@ -1478,6 +1546,7 @@ function sq_fixstyle($body, $pos, $message, $id){ * @param $message the message object * @param $id the message id * @param $cidurl the cid: url. + * @param $mailbox the message mailbox * @return a string with a http-friendly url */ function sq_cid2http($message, $id, $cidurl, $mailbox){ @@ -1518,6 +1587,7 @@ function sq_body2div($attary, $mailbox, $message, $id){ $divattary = Array('class' => "'bodyclass'"); $bgcolor = '#ffffff'; $text = '#000000'; + $has_bgc_stl = $has_txt_stl = false; $styledef = ''; if (is_array($attary) && sizeof($attary) > 0){ foreach ($attary as $attname=>$attvalue){ @@ -1525,18 +1595,25 @@ function sq_body2div($attary, $mailbox, $message, $id){ $attvalue = str_replace($quotchar, "", $attvalue); switch ($attname){ case 'background': - $attvalue = sq_cid2http($message, $id, + $attvalue = sq_cid2http($message, $id, $attvalue, $mailbox); $styledef .= "background-image: url('$attvalue'); "; break; case 'bgcolor': + $has_bgc_stl = true; $styledef .= "background-color: $attvalue; "; break; case 'text': + $has_txt_stl = true; $styledef .= "color: $attvalue; "; break; } } + // Outlook defines a white bgcolor and no text color. This can lead to + // white text on a white bg with certain themes. + if ($has_bgc_stl && !$has_txt_stl) { + $styledef .= "color: $text; "; + } if (strlen($styledef) > 0){ $divattary{"style"} = "\"$styledef\""; } @@ -1550,7 +1627,7 @@ function sq_body2div($attary, $mailbox, $message, $id){ * special description. * * Since the description is quite lengthy, see it here: - * http://www.mricon.com/html/phpfilter.html + * http://linux.duke.edu/projects/mini/htmlfilter/ * * @param $body the string with HTML you wish to filter * @param $tag_list see description above @@ -1564,8 +1641,8 @@ function sq_body2div($attary, $mailbox, $message, $id){ * @param $id message id * @return sanitized html safe to show on your pages. */ -function sq_sanitize($body, - $tag_list, +function sq_sanitize($body, + $tag_list, $rm_tags_with_content, $self_closing_tags, $force_tag_closing, @@ -1606,8 +1683,8 @@ function sq_sanitize($body, * Take care of