X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=a1e43f78b0b3eccf959d9ee767b98369b8ee3c71;hb=42ac0e8456e7a714a2c2f416f8e49dcb242781d1;hp=8a67bac689618247127585de46bbbd8cbe7e2263;hpb=6c7fd6caa94f0dcfdc25863bd8e7c21d9cf30d50;p=squirrelmail.git diff --git a/src/compose.php b/src/compose.php index 8a67bac6..a1e43f78 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1,5 +1,11 @@ header; + if ($ent_num) + $message = getEntity($message, $ent_num); + + if ($message->header->type0 == "text" || $message->header->type1 == "message") { + if ($ent_num) + $body = decodeBody(mime_fetch_body($imapConnection, $id, $ent_num), $message->header->encoding); + else + $body = decodeBody(mime_fetch_body($imapConnection, $id, 1), $message->header->encoding); + } else { + $body = ""; } - $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"]; - - $tmp = _("-------- Original Message ---------\n"); + if ($message->header->type1 == "html") + $body = strip_tags($body); + $body_ary = explode("\n", $body); $body = ""; - for ($i=0;$i < count($body_ary);$i++) { - if ($type1 == "html") - $tmp .= strip_tags($body_ary[$i]); - else - $tmp .= $body_ary[$i]; - $body = "$body$tmp\n"; - $tmp = ""; - } - } - - if ($reply_id) { - sqimap_mailbox_select($imapConnection, $mailbox); - $msg = sqimap_get_message($imapConnection, $reply_id, $mailbox); - - if (containsType($msg, "text", "html", $ent_num)) { - $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false); - } else if (containsType($msg, "text", "plain", $ent_num)) { - $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false); - } - // add other primary displaying msg types here - else { - // find any type that's displayable - if (containsType($msg, "text", "any_type", $ent_num)) { - $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false); - } else if (containsType($msg, "msg", "any_type", $ent_num)) { - $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false); + for ($i=0; $i < count($body_ary); $i++) { + if ($i==0 && $forward_id) { + $tmp = "-------- " . _("Original Message") . " --------\n"; + $tmp .= _("Subject") . ": " . $orig_header->subject . "\n"; + $tmp .= " " . _("From") . ": " . $orig_header->from . "\n"; + $tmp .= " " . _("To") . ": " . $orig_header->to[0] . "\n"; + if (count($orig_header->to) > 1) { + for ($x=1; $x < count($orig_header->to); $x++) { + $tmp .= " " . $orig_header->to[$x] . "\n"; + } + } + $tmp .= "\n" . $body_ary[$i]; } else { - $body = _("No Message"); + $tmp = $body_ary[$i]; } - } - - $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"]; - - $body_ary = explode("\n", $body); - $body = ""; - for ($i=0;$i < count($body_ary);$i++) { - if ($type1 == "html") - $tmp = strip_tags($body_ary[$i]); + if ($forward_id) + $body = "$body$tmp\n"; else - $tmp = $body_ary[$i]; - $body = "$body> $tmp\n"; + $body = "$body> $tmp\n"; } + return $body; } + + $send_to = stripslashes($send_to); if (!$send_to) { $send_to = sqimap_find_email($send_to); } - $send_to = ereg_replace("\"", "", $send_to); - $send_to = stripslashes($send_to); - /** This formats a CC string if they hit "reply all" **/ if ($send_to_cc != "") { + $send_to_cc = ereg_replace( '"[^"]*"', "", $send_to_cc); $send_to_cc = ereg_replace(";", ",", $send_to_cc); $sendcc = explode(",", $send_to_cc); $send_to_cc = ""; @@ -145,7 +135,7 @@ global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body, $passed_body, $color, $use_signature, $signature, $editor_size, $attachments, $subject, $newmail, $use_javascript_addr_book, - $send_to_bcc; + $send_to_bcc, $reply_id, $mailbox; $subject = decodeHeader($subject); $reply_subj = decodeHeader($reply_subj); @@ -163,61 +153,48 @@ } echo "\n