| | ' .
- "$display_filename | " .
- '' . show_readable_size($message->header->size) .
- ' | ' .
- "[ $type0/$type1 ] | " .
- '';
- if ($message->header->description)
- $body .= '' . htmlspecialchars($message->header->description) . '';
- $body .= ' | ';
-
-
- $SkipSpaces = 1;
- foreach ($Links as $Val) {
- if ($SkipSpaces) {
- $SkipSpaces = 0;
- } else {
- $body .= ' | ';
- }
- $body .= '' . $Val['text'] . '';
- }
+ $DefaultLink =
+ "../src/download.php?startMessage=$startMessage&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
+ if ($where && $what) {
+ $DefaultLink .= '&where=' . urlencode($where) . '&what=' . urlencode($what);
+ }
+ $Links['download link']['text'] = _("download");
+ $Links['download link']['href'] =
+ "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
+ $ImageURL = '';
+
+ /* this executes the attachment hook with a specific MIME-type.
+ * if that doens't have results, it tries if there's a rule
+ * for a more generic type. */
+ $HookResults = do_hook("attachment $type0/$type1", $Links,
+ $startMessage, $id, $urlMailbox, $ent, $DefaultLink,
+ $display_filename, $where, $what);
+ if(count($HookResults[1]) <= 1) {
+ $HookResults = do_hook("attachment $type0/*", $Links,
+ $startMessage, $id, $urlMailbox, $ent, $DefaultLink,
+ $display_filename, $where, $what);
+ }
- unset($Links);
+ $Links = $HookResults[1];
+ $DefaultLink = $HookResults[6];
+
+ $body .= '| | ' .
+ "$display_filename | " .
+ '' . show_readable_size($message->header->size) .
+ ' | ' .
+ "[ $type0/$type1 ] | " .
+ '';
+ if ($message->header->description) {
+ $body .= '' . htmlspecialchars(_($message->header->description)) . '';
+ }
+ $body .= ' | ';
- $body .= " | \n";
- }
- } else {
- for ($i = 0; $i < count($message->entities); $i++) {
- $body .= formatAttachments ($message->entities[$i], $ent_id, $mailbox, $id);
+
+ $SkipSpaces = 1;
+ foreach ($Links as $Val) {
+ if ($SkipSpaces) {
+ $SkipSpaces = 0;
+ } else {
+ $body .= ' | ';
+ }
+ $body .= '' . $Val['text'] . '';
+ }
+
+ unset($Links);
+
+ $body .= " |
\n";
+ }
+ } else {
+ for ($i = 0; $i < count($message->entities); $i++) {
+ $body .= formatAttachments($message->entities[$i], $ent_id, $mailbox, $id);
+ }
}
- }
- return( $body );
- }
+ }
+ return( $body );
}
@@ -762,33 +794,40 @@ function decodeBody($body, $encoding) {
* RFC1522 (MIME Part Two: Message Header Extensions for Non-ASCII Text).
*/
function decodeHeader ($string, $utfencode=true) {
- if (eregi('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=',
+
+if ( is_array( $string ) ) {
+ $string = implode("\n", $string );
+}
+
+if (eregi('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=',
$string, $res)) {
- if (ucfirst($res[2]) == "B") {
+ if (ucfirst($res[2]) == 'B') {
$replace = base64_decode($res[3]);
- } else {
- $replace = ereg_replace("_", " ", $res[3]);
- // Convert lowercase Quoted Printable to uppercase for
- // quoted_printable_decode to understand it.
- while (ereg("(=(([0-9][abcdef])|([abcdef][0-9])|([abcdef][abcdef])))", $replace, $res)) {
- $replace = str_replace($res[1], strtoupper($res[1]), $replace);
- }
+ } else {
+ $replace = str_replace('_', ' ', $res[3]);
+ // Convert lowercase Quoted Printable to uppercase for
+ // quoted_printable_decode to understand it.
+ while (ereg("(=(([0-9][abcdef])|([abcdef][0-9])|([abcdef][abcdef])))",
+ $replace, $res)) {
+ $replace = str_replace($res[1], strtoupper($res[1]), $replace);
+ }
$replace = quoted_printable_decode($replace);
- }
- /* Only encode into entities by default. Some places
+ }
+ /* Only encode into entities by default. Some places
don't need the encoding, like the compose form. */
- if ($utfencode){
- $replace = charset_decode ($res[1], $replace);
- }
+ if ($utfencode){
+ $replace = charset_decode ($res[1], $replace);
+ }
+
+ // Remove the name of the character set.
+ $string = eregi_replace ('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=',
+ $replace, $string);
- // Remove the name of the character set.
- $string = eregi_replace ('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=',
- $replace, $string);
+ // In case there should be more encoding in the string: recurse
+ $string = decodeHeader($string);
+}
- // In case there should be more encoding in the string: recurse
- return (decodeHeader($string));
- } else
- return ($string);
+return ($string);
}
/*
@@ -798,7 +837,7 @@ function decodeHeader ($string, $utfencode=true) {
*/
function encodeHeader ($string) {
global $default_charset;
-
+
// Encode only if the string contains 8-bit characters or =?
$j = strlen( $string );
$l = strstr($string, '=?'); // Must be encoded ?
@@ -826,11 +865,11 @@ function encodeHeader ($string) {
$ret .= $string{$i};
}
}
-
+
if ( $l ) {
$string = "=?$default_charset?Q?$ret?=";
}
-
+
return( $string );
}
@@ -839,8 +878,11 @@ function encodeHeader ($string) {
*/
function MagicHTML( $body, $id ) {
- global $message, $PHP_SELF, $HTTP_SERVER_VARS;
+ global $message, $HTTP_SERVER_VARS,
+ $attachment_common_show_images;
+ $attachment_common_show_images =
+ FALSE; // Don't display attached images in HTML mode
$j = strlen( $body ); // Legnth of the HTML
$ret = ''; // Returned string
$bgcolor = '#ffffff'; // Background style color (defaults to white)
@@ -854,18 +896,27 @@ function MagicHTML( $body, $id ) {
$pos = $i + 1;
$tag = '';
while ($body{$pos} == ' ' || $body{$pos} == "\t" ||
- $body{$pos} == "\n") {
+ $body{$pos} == "\n" ) {
$pos ++;
}
while (strlen($tag) < 4 && $body{$pos} != ' ' &&
- $body{$pos} != "\t" && $body{$pos} != "\n") {
+ $body{$pos} != "\t" && $body{$pos} != "\n" &&
+ $pos < $j ) {
$tag .= $body{$pos};
$pos ++;
}
+ /*
+ A comment in HTML is only three characters and isn't
+ guaranteed to have a space after it. This fudges so
+ it will be caught by the switch statement.
+ */
+ if (ereg("!--", $tag)) {
+ $tag = "!-- ";
+ }
switch( strtoupper( $tag ) ) {
// Strips the entire tag and contents
case 'APPL':
- case 'EMBB':
+ case 'EMBE':
case 'FRAM':
case 'SCRI':
case 'OBJE':
@@ -897,8 +948,8 @@ function MagicHTML( $body, $id ) {
case '/HEA':
case '!DOC':
case 'META':
- case 'DIV ':
- case '/DIV':
+ //case 'DIV ':
+ //case '/DIV':
case '!-- ':
$i += 4;
while ( $body{$i} <> '>' &&
@@ -980,8 +1031,21 @@ function MagicHTML( $body, $id ) {
$ret .= '