X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=3c54d79947dfd08d2f7c0725f6b53d10a2983f67;hb=2d896bbf3b402d11c0be75a1a87b5705411efe87;hp=0d6ff0917851db96802e513d91c801978735234c;hpb=da2415c1957ede557ea8f15bdd45c4b9ae52f858;p=squirrelmail.git diff --git a/functions/mime.php b/functions/mime.php index 0d6ff091..3c54d799 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$ + * @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. */ @@ -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. */ @@ -106,7 +109,7 @@ 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]; @@ -145,7 +148,7 @@ function mime_fetch_body($imap_stream, $id, $ent_id=1, $fetch_size=0) { '' . _("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. + * Dont call set_time_limit in safe mode. */ if (!ini_get('safe_mode')) { @@ -173,7 +175,7 @@ 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); @@ -389,12 +391,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'; 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 +409,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; } @@ -577,12 +583,20 @@ 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) { +function decodeHeader ($string, $utfencode=true,$htmlsave=true,$decide=false) { global $languages, $squirrelmail_language; if (is_array($string)) { $string = implode("\n", $string); @@ -610,12 +624,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 .= ' '; } @@ -634,6 +648,13 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) { $replace = str_replace('_', ' ', $res[4]); $replace = preg_replace('/=([0-9a-f]{2})/ie', 'chr(hexdec("\1"))', $replace); + /* decide about valid decoding */ + if ($decide && is_conversion_safe($res[2])) { + $utfencode=true; + $can_be_decoded=true; + } else { + $can_be_decoded=false; + } /* Only encode into entities by default. Some places * don't need the encoding, like the compose form. */ @@ -652,10 +673,9 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) { $chunk = $res[5]; $encoded = true; } -// } if (!$encoded) { if ($htmlsave) { - $ret .= ' '; + $ret .= ' '; } else { $ret .= ' '; } @@ -671,7 +691,7 @@ 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); } @@ -680,10 +700,15 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) { 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; @@ -692,9 +717,10 @@ function encodeHeader ($string) { 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); - } + // instead of removing nbsp here, we don't add it in decodeHeader + // 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); @@ -850,6 +876,7 @@ function sq_unbackslash($attvalue){ /** * Remove any backslashes. See if there are any first. */ + if (strstr($attvalue, '\\') !== false){ $attvalue = stripslashes($attvalue); } @@ -1282,13 +1309,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 +1327,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); } } } @@ -1364,6 +1392,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, @@ -1414,9 +1448,10 @@ function sq_fixatts($tagname, * @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, ''); @@ -1453,7 +1488,7 @@ function sq_fixstyle($body, $pos, $message, $id){ 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 +1513,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){ @@ -1615,7 +1651,7 @@ function sq_sanitize($body, */ if ($tagname == "style" && $tagtype == 1){ list($free_content, $curpos) = - sq_fixstyle($body, $gt+1, $message, $id); + sq_fixstyle($body, $gt+1, $message, $id, $mailbox); if ($free_content != FALSE){ $trusted .= sq_tagprint($tagname, $attary, $tagtype); $trusted .= $free_content; @@ -1825,7 +1861,8 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') { "/include-source/i", "/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" + "/url\s*\(\s*([\'\"])\s*about\s*:.*([\'\"])\s*\)/si", + "/(.*)\s*:\s*url\s*\(\s*([\'\"]*)\s*\S+script\s*:.*([\'\"]*)\s*\)/si" ), Array( "idiocy", @@ -1835,7 +1872,8 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') { "url(\\1#\\1)", "url(\\1#\\1)", "url(\\1#\\1)", - "url(\\1#\\1)" + "url(\\1#\\1)", + "\\1:url(\\2#\\3)" ) ) ) @@ -1893,9 +1931,10 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') { * @param string $type1 second half of mime type * @param string $filename filename to tell the browser for downloaded file * @param boolean $force whether to force the download dialog to pop + * @param optional integer $filesize send the Content-Header and length to the browser * @return void */ - function SendDownloadHeaders($type0, $type1, $filename, $force) { + function SendDownloadHeaders($type0, $type1, $filename, $force, $filesize=0) { global $languages, $squirrelmail_language; $isIE = $isIE6 = 0; @@ -1914,48 +1953,78 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') { if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { $filename = - $languages[$squirrelmail_language]['XTRA_CODE']('downloadfilename', $filename, $HTTP_USER_AGENT); + $languages[$squirrelmail_language]['XTRA_CODE']('downloadfilename', $filename, $HTTP_USER_AGENT); } else { - $filename = ereg_replace('[\\/:\*\?"<>\|;]', '_', str_replace(' ', ' ', $filename)); + $filename = ereg_replace('[\\/:\*\?"<>\|;]', '_', str_replace(' ', ' ', $filename)); + } + + // A Pox on Microsoft and it's Internet Explorer! + // + // IE has lots of bugs with file downloads. + // It also has problems with SSL. Both of these cause problems + // for us in this function. + // + // See this article on Cache Control headers and SSL + // http://support.microsoft.com/default.aspx?scid=kb;en-us;323308 + // + // The best thing you can do for IE is to upgrade to the latest + // version + //set all the Cache Control Headers for IE + if ($isIE && !$isIE6) { + header ("Pragma: public"); + header ("Cache-Control: no-store, max-age=0, no-cache, must-revalidate"); # HTTP/1.1 + header ("Cache-Control: post-check=0, pre-check=0", false); + header ("Cache-control: private"); + + //set the inline header for IE, we'll add the attachment header later if we need it + header ("Content-Disposition: inline; filename=$filename"); } - // A Pox on Microsoft and it's Office! if (!$force) { // Try to show in browser window - header("Content-Disposition: inline; filename=\"$filename\""); - header("Content-Type: $type0/$type1; name=\"$filename\""); + header ("Content-Disposition: inline; filename=\"$filename\""); + header ("Content-Type: $type0/$type1; name=\"$filename\""); } else { // Try to pop up the "save as" box + // IE makes this hard. It pops up 2 save boxes, or none. // http://support.microsoft.com/support/kb/articles/Q238/5/88.ASP - // But, accordint to Microsoft, it is "RFC compliant but doesn't + // http://support.microsoft.com/default.aspx?scid=kb;EN-US;260519 + // But, according to Microsoft, it is "RFC compliant but doesn't // take into account some deviations that allowed within the // specification." Doesn't that mean RFC non-compliant? // http://support.microsoft.com/support/kb/articles/Q258/4/52.ASP - // - // The best thing you can do for IE is to upgrade to the latest - // version + + // all browsers need the application/octet-stream header for this + header ("Content-Type: application/octet-stream; name=\"$filename\""); + + // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp + // Do not have quotes around filename, but that applied to + // "attachment"... does it apply to inline too? + header ("Content-Disposition: attachment; filename=\"$filename\""); + if ($isIE && !$isIE6) { - // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp - // Do not have quotes around filename, but that applied to - // "attachment"... does it apply to inline too? - // // This combination seems to work mostly. IE 5.5 SP 1 has // known issues (see the Microsoft Knowledge Base) - header("Content-Disposition: inline; filename=$filename"); + // This works for most types, but doesn't work with Word files - header("Content-Type: application/download; name=\"$filename\""); + header ("Content-Type: application/download; name=\"$filename\""); // These are spares, just in case. :-) //header("Content-Type: $type0/$type1; name=\"$filename\""); //header("Content-Type: application/x-msdownload; name=\"$filename\""); //header("Content-Type: application/octet-stream; name=\"$filename\""); } else { - header("Content-Disposition: attachment; filename=\"$filename\""); - // application/octet-stream forces download for Netscape - header("Content-Type: application/octet-stream; name=\"$filename\""); + // another application/octet-stream forces download for Netscape + header ("Content-Type: application/octet-stream; name=\"$filename\""); } } - } + + //send the content-length header if the calling function provides it + if ($filesize > 0) { + header("Content-Length: $filesize"); + } + +} // end fn SendDownloadHeaders ?> \ No newline at end of file