X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=f008aee0b042c2593df37c53ff1c0d94db8a2bd8;hp=60ff75823fdbc2d61300d9c7af282239d278e4f7;hb=f7b1b3b1779c3665bc943b2dec65182e8c536e69;hpb=ef8703220ec8e7573417b08881f636082e4b8d58 diff --git a/src/compose.php b/src/compose.php index 60ff7582..f008aee0 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1,105 +1,143 @@ header; + if ($ent_num) + $message = getEntity($message, $ent_num); - if ($message->header->type0 == "text" || $message->header->type1 == "message") { - $body = decodeBody(mime_fetch_body($imapConnection, $id, $message->header->entity_id), $message->header->encoding); + 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 = ""; } - - if ($forward_id) - $tmp = _("-------- Original Message ---------\n"); + if ($message->header->type1 == "html") $body = strip_tags($body); - + + sqUnWordWrap($body); $body_ary = explode("\n", $body); + $i = count($body_ary) - 1; + while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) { + unset($body_ary[$i]); + $i --; + } $body = ""; - for ($i=0; $i < count($body_ary); $i++) { - $tmp = $body_ary[$i]; - - if ($forward_id) - $body = "$body$tmp\n"; - else - $body = "$body> $tmp\n"; + for ($i=0; isset($body_ary[$i]); $i++) { + if ($reply_id) + { + if (ereg('^[ >]+', $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"; + unset($body_ary[$i]); + } + 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; + } else if ($reply_id) { + $orig_from = decodeHeader($orig_header->from); + $orig_from = trim(substr($orig_from,0,strpos($orig_from,'<'))); + $orig_from = str_replace('"','',$orig_from); + $orig_from = str_replace("'",'',$orig_from); + $body = getReplyCitation($orig_from) . $body; } - + + 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 = ""; - + for ($i = 0; $i < count($sendcc); $i++) { $sendcc[$i] = trim($sendcc[$i]); if ($sendcc[$i] == "") continue; - + $sendcc[$i] = sqimap_find_email($sendcc[$i]); $whofrom = sqimap_find_displayable_name($msg["HEADER"]["FROM"]); $whoreplyto = sqimap_find_email($msg["HEADER"]["REPLYTO"]); - + if ((strtolower(trim($sendcc[$i])) != strtolower(trim($whofrom))) && (strtolower(trim($sendcc[$i])) != strtolower(trim($whoreplyto))) && (trim($sendcc[$i]) != "")) { @@ -113,11 +151,62 @@ } } // function newMail() + function getAttachments($message) { + global $mailbox, $attachments, $attachment_dir, $imapConnection, + $ent_num, $forward_id, $draft_id; + + if (isset($draft_id)) + $id = $draft_id; + else + $id = $forward_id; + + if (!$message) { + sqimap_mailbox_select($imapConnection, $mailbox); + $message = sqimap_get_message($imapConnection, $id, + $mailbox); + } + + if (count($message->entities) == 0) { + if ($message->header->entity_id != $ent_num) { + $filename = decodeHeader($message->header->filename); + + if ($filename == "") + $filename = "untitled-".$message->header->entity_id; + + $localfilename = GenerateRandomString(32, '', 7); + while (file_exists($attachment_dir . $localfilename)) + $localfilename = GenerateRandomString(32, '', 7); + + $newAttachment = array(); + $newAttachment['localfilename'] = $localfilename; + $newAttachment['remotefilename'] = $filename; + $newAttachment['type'] = strtolower($message->header->type0 . + '/' . $message->header->type1); + + // Write Attachment to file + $fp = fopen ($attachment_dir.$localfilename, 'w'); + fputs ($fp, decodeBody(mime_fetch_body($imapConnection, + $id, $message->header->entity_id), + $message->header->encoding)); + fclose ($fp); + + $attachments[] = $newAttachment; + } + } 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, $use_javascript_addr_book, - $send_to_bcc, $reply_id, $mailbox; + $passed_body, $color, $use_signature, $signature, $prefix_sig, + $editor_size, $attachments, $subject, $newmail, + $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox, + $from_htmladdr_search, $location_of_buttons, $attachment_dir, + $username, $data_dir, $identity, $draft_id; $subject = decodeHeader($subject); $reply_subj = decodeHeader($reply_subj); @@ -134,128 +223,175 @@ echo "// -->\n\n"; } - echo "\n