X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=961e7d990394dc03e47112a66c02f6ac0082d6b2;hb=21dab2dcae048a38fcaf5b4bb7bb653bf11de4c1;hp=0f810a82af130cc014f155f6af4879cc83361475;hpb=07c49f57decba87bc96e9ad2d36a835ff818bec9;p=squirrelmail.git diff --git a/functions/mime.php b/functions/mime.php index 0f810a82..961e7d99 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -3,13 +3,13 @@ /** * 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 */ @@ -41,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 ''; @@ -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]; @@ -138,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); @@ -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); @@ -235,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]); @@ -360,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); @@ -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); @@ -393,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'; 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 { @@ -409,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; } @@ -434,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 = ''; @@ -502,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. @@ -518,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) { @@ -537,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 != '') @@ -546,10 +551,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; @@ -581,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; } @@ -619,7 +652,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 .= ' '; } @@ -628,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); - /* 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); @@ -656,40 +710,49 @@ 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,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 =? @@ -846,6 +909,7 @@ function sq_unbackslash($attvalue){ /** * Remove any backslashes. See if there are any first. */ + if (strstr($attvalue, '\\') !== false){ $attvalue = stripslashes($attvalue); } @@ -1018,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)){ @@ -1076,7 +1140,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) == "/>"){ @@ -1178,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) == "/>"){ @@ -1278,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; } /** @@ -1295,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); } } } @@ -1360,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, @@ -1556,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 @@ -1823,7 +1894,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", @@ -1833,7 +1905,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)" ) ) ) @@ -1891,7 +1964,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) { @@ -1911,56 +1984,81 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') { } if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_downloadfilename')) { $filename = - $languages[$squirrelmail_language]['XTRA_CODE']('downloadfilename', $filename, $HTTP_USER_AGENT); + call_user_func($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) { + $filename=urlencode($filename); + 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 -?> +?> \ No newline at end of file