X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=07cfe443d988e09c0e762165b743dc408ee58d3c;hb=7c0ec1d81108c90f37fdab4b85520a05107fc58d;hp=a65e5619b0b42ba1baed4ee70c7114ed8398dfa8;hpb=fd81e884c200a3e6e2933c6c810adaf35cd8448b;p=squirrelmail.git diff --git a/functions/mime.php b/functions/mime.php index a65e5619..07cfe443 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -3,7 +3,7 @@ /** * 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 @@ -97,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. */ @@ -110,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)) ; @@ -122,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]; @@ -149,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); @@ -159,7 +158,6 @@ 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. @@ -177,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); @@ -376,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); @@ -399,7 +399,7 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma 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"); @@ -550,10 +550,30 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) { } function sqimap_base64_decode(&$string) { - $string = str_replace("\r\n", "\n", $string); + + // base64 enoded 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; @@ -585,12 +605,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); @@ -623,7 +651,7 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) { /* 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 .= ' '; } @@ -642,6 +670,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. */ @@ -660,26 +695,25 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true) { $chunk = $res[5]; $encoded = true; } - - if (!$encoded && $htmlsave) { - $ret .= htmlspecialchars($chunk); - } else { - $ret .= $chunk; - } - if (!$encoded) { if ($htmlsave) { - $ret .= ' '; + $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); + $ret = substr($ret,5); } else { $ret = substr($ret,1); } @@ -688,10 +722,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; @@ -700,9 +739,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); @@ -1374,6 +1414,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, @@ -1837,7 +1883,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", @@ -1847,7 +1894,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)" ) ) ) @@ -1905,7 +1953,7 @@ 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 integer $filesize optional, send the Content-Header and length to the browser + * @param optional integer $filesize send the Content-Header and length to the browser * @return void */ function SendDownloadHeaders($type0, $type1, $filename, $force, $filesize=0) { @@ -1927,54 +1975,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) { + 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"); + header("Content-Length: $filesize"); } - } // end fn SendDownlaodHeaders +} // end fn SendDownloadHeaders ?>