$pos++;
}
$structure = substr($structure, strlen($text) + 2);
+ } else if ($char == '{') {
+ /**
+ * loop through until we find the matching quote,
+ * and return that as a string
+ */
+ $pos = 1;
+ $len = '';
+ while (($char = $structure{$pos}) != '}'
+ && $pos < strlen($structure)) {
+ $len .= $char;
+ $pos++;
+ }
+ $structure = substr($structure, strlen($len) + 4);
+ $text = substr($structure, 0, $len);
+ $structure = substr($structure, $len + 1);
} else if ($char == '(') {
// comment me
$end = mime_match_parenthesis (0, $structure);
$body = strip_tags( $body );
translateText($body, $wrap_at, $body_message->header->charset);
} else {
- $body = MagicHTML( $body, $id );
+ $body = MagicHTML( $body, $id, $message );
}
} else {
translateText($body, $wrap_at, $body_message->header->charset);
global $show_html_default;
- if ($encoding == 'quoted-printable') {
+ if ($encoding == 'quoted-printable' ||
+ $encoding == 'quoted_printable') {
$body = quoted_printable_decode($body);
$pos++;
$tagtype = 3;
} else {
- $gt = getnxstr($body, $pos, ">");
+ $gt = sq_findnxstr($body, $pos, ">");
$retary = Array(false, false, false, $lt, $gt);
return $retary;
}
* @param $id the id of the message
* @return a string with html safe to display in the browser.
*/
-function magicHTML($body, $id){
+function magicHTML($body, $id, $message){
global $attachment_common_show_images, $view_unsafe_images,
- $has_unsafe_images, $message;
+ $has_unsafe_images;
/**
* Don't display attached images in HTML mode.
*/