X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=7bacc8625658c2136a934e44a7b2fef7d467dc3e;hb=3b84e1b10d0800d858a68283bce298d15677ce58;hp=07cfe443d988e09c0e762165b743dc408ee58d3c;hpb=7c0ec1d81108c90f37fdab4b85520a05107fc58d;p=squirrelmail.git diff --git a/functions/mime.php b/functions/mime.php index 07cfe443..7bacc862 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -9,7 +9,7 @@ * 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 ''; @@ -137,16 +137,16 @@ 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, TRUE); array_shift($data); @@ -161,7 +161,7 @@ function mime_print_body_lines ($imap_stream, $id, $ent_id=1, $encoding) { /* Don't kill the connection if the browser is over a dialup * and it would take over 30 seconds to download it. - * Dont call set_time_limit in safe mode. + * Don't call set_time_limit in safe mode. */ if (!ini_get('safe_mode')) { @@ -233,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]); @@ -358,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); @@ -414,7 +414,7 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma if($text != '') { $body .= ' | ' . $text . ''; } - $body .= '
' . "\n"; + $body .= '
' . "\n"; } return $body; } @@ -438,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 = ''; @@ -506,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. @@ -522,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) { @@ -541,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 != '') @@ -551,18 +552,18 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) { function sqimap_base64_decode(&$string) { - // base64 enoded data goes in pairs of 4 bytes. To achieve on the + // 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 + // 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 = ''; + $sStringRem = ''; $iMod = strlen($string) % 4; if ($iMod) { $sStringRem = substr($string,-$iMod); - // check if $sStringRem contains padding characters + // Check if $sStringRem contains padding characters if (substr($sStringRem,-1) != '=') { $string = substr($string,0,-$iMod); } else { @@ -619,14 +620,14 @@ function decodeBody($body, $encoding) { * @return string decoded header string */ function decodeHeader ($string, $utfencode=true,$htmlsave=true,$decide=false) { - global $languages, $squirrelmail_language; + 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; } @@ -660,28 +661,42 @@ function decodeHeader ($string, $utfencode=true,$htmlsave=true,$decide=false) { $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); - /* 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. - */ 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); @@ -736,13 +751,9 @@ 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); + function_exists($languages[$squirrelmail_language]['XTRA_CODE'] . '_encodeheader')) { + return call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_encodeheader', $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); @@ -1071,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)){ @@ -1129,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) == "/>"){ @@ -1231,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) == "/>"){ @@ -1616,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 @@ -1973,9 +1984,9 @@ 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)); } @@ -1993,6 +2004,7 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') { // 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); @@ -2049,4 +2061,4 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX') { } // end fn SendDownloadHeaders -?> +?> \ No newline at end of file