X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=565bd923c966626e3c784dfe91f54a3360a47355;hp=018650a6b35707b5957fd1ab6128559ddcd1d49f;hb=3b5b889f6112b20ed8cf46d607b5fb7adee4206c;hpb=9f2215a1f40978a370a7538229ca2f55f55026ee diff --git a/src/compose.php b/src/compose.php index 018650a6..565bd923 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"]; + if ($message->header->type1 == "html") + $body = strip_tags($body); - $tmp = _("-------- Original Message ---------\n"); + sqUnWordWrap($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 = ""; + $i = count($body_ary) - 1; + while (isset($body_ary[$i]) && ereg("^[>\s]*$", $body_ary[$i])) { + unset($body_ary[$i]); + $i --; } - } - - 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); - } else { - $body = _("No Message"); + $body = ""; + for ($i=0; $i < count($body_ary); $i++) { + if (! $forward_id) + { + if (ereg('^[\s>]+', $body_ary[$i])) + { + $body_ary[$i] = '>' . $body_ary[$i]; + } + else + { + $body_ary[$i] = '> ' . $body_ary[$i]; + } } + sqWordWrap($body_ary[$i], $editor_size - 1); + $body .= $body_ary[$i] . "\n"; + $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]); - else - $tmp = $body_ary[$i]; - $body = "$body> $tmp\n"; + if ($forward_id) + { + $bodyTop = "-------- " . _("Original Message") . " --------\n"; + $bodyTop .= _("Subject") . ": " . $orig_header->subject . "\n"; + $bodyTop .= _("From") . ": " . $orig_header->from . "\n"; + $bodyTop .= _("To") . ": " . $orig_header->to[0] . "\n"; + if (count($orig_header->to) > 1) { + for ($x=1; $x < count($orig_header->to); $x++) { + $bodyTop .= " " . $orig_header->to[$x] . "\n"; + } + } + $bodyTop .= "\n"; + $body = $bodyTop . $body; } + + $body = ereg_replace('\\\\', '\\\\', $body); + + sqimap_mailbox_close($imapConnection); + return; } - + 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 = ""; @@ -141,122 +150,169 @@ } } // function newMail() + function getAttachments($message) { + global $mailbox, $attachments, $attachment_dir, $imapConnection, + $ent_num, $forward_id; + + if (!$message) { + sqimap_mailbox_select($imapConnection, $mailbox); + $message = sqimap_get_message($imapConnection, $forward_id, $mailbox); } + + if (!$message->entities) { + if ($message->header->entity_id != $ent_num) { + $filename = decodeHeader($message->header->filename); + + if ($filename == "") + $filename = "untitled-".$message->header->entity_id; + + $localfilename = md5($filename.", $REMOTE_IP, REMOTE_PORT, $UNIQUE_ID, extra-stuff here"); + + // Write File Info + $fp = fopen ($attachment_dir.$localfilename.".info", "w"); + fputs ($fp, strtolower($message->header->type0)."/".strtolower($message->header->type1)."\n".$filename."\n"); + fclose ($fp); + + // Write Attachment to file + $fp = fopen ($attachment_dir.$localfilename, "w"); + fputs ($fp, decodeBody(mime_fetch_body($imapConnection, $forward_id, $message->header->entity_id), $message->header->encoding)); + +// Don't know why these lines were included +// fgets($imapConnection, 256); +// fgets($imapConnection, 256); + + fclose ($fp); + + $attachments[$localfilename] = $filename; + + } + } else { + for ($i = 0; $i < count($message->entities); $i++) { + getAttachments($message->entities[$i]); + } + } + return; + } + function showInputForm () { global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body, $passed_body, $color, $use_signature, $signature, $editor_size, - $attachments, $subject, $newmail; + $attachments, $subject, $newmail, $use_javascript_addr_book, + $send_to_bcc, $reply_id, $mailbox, $from_htmladdr_search, + $location_of_buttons; - $subject = decodeHeader($subject); + $subject = sqStripSlashes(decodeHeader($subject)); $reply_subj = decodeHeader($reply_subj); $forward_subj = decodeHeader($forward_subj); + $body = sqStripSlashes($body); + + if ($use_javascript_addr_book) { + echo "\n\n\n"; + } + + echo "\n