X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=ca43a14251bbfa1e52d6862c5622657c8618d24a;hp=91d1641492bc5eb37c4b217402db52de5d96c2af;hb=1c252cc373fa9e7fc62c10d32d90e6fd336569b0;hpb=66289791f46da9f6c7e0ab95bdfff31b73898e3c diff --git a/src/compose.php b/src/compose.php index 91d16414..ca43a142 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1,66 +1,79 @@ header; if ($ent_num) $message = getEntity($message, $ent_num); - if ($message->header->type0 == "text" || $message->header->type1 == "message") { + 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 @@ -68,22 +81,22 @@ } else { $body = ""; } - + if ($message->header->type1 == "html") $body = strip_tags($body); - - sqUnWordWrap($body); + + sqUnWordWrap($body); $body_ary = explode("\n", $body); $i = count($body_ary) - 1; - while (isset($body_ary[$i]) && ereg("^[>\s]*$", $body_ary[$i])) { + while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) { unset($body_ary[$i]); $i --; } $body = ""; - for ($i=0; $i < count($body_ary); $i++) { - if (! $forward_id) + for ($i=0; isset($body_ary[$i]); $i++) { + if ($reply_id) { - if (ereg('^[\s>]+', $body_ary[$i])) + if (ereg('^[ >]+', $body_ary[$i])) { $body_ary[$i] = '>' . $body_ary[$i]; } @@ -92,16 +105,18 @@ $body_ary[$i] = '> ' . $body_ary[$i]; } } - sqWordWrap($body_ary[$i], $editor_size - 1); + if (!$draft_id) { + sqWordWrap($body_ary[$i], $editor_size - 1); + } $body .= $body_ary[$i] . "\n"; - $body_ary[$i] = ''; + 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"; + $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"; @@ -109,11 +124,11 @@ } $bodyTop .= "\n"; $body = $bodyTop . $body; + } else if ($reply_id) { + $orig_from = decodeHeader($orig_header->from); + $body = getReplyCitation($orig_from) . $body; } - - $body = ereg_replace('\\\\', '\\\\', $body); - sqimap_mailbox_close($imapConnection); return; } @@ -127,16 +142,16 @@ $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]) != "")) { @@ -152,56 +167,70 @@ function getAttachments($message) { global $mailbox, $attachments, $attachment_dir, $imapConnection, - $ent_num, $forward_id; - + $ent_num, $forward_id, $draft_id, $username; + + if (isset($draft_id)) + $id = $draft_id; + else + $id = $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)); - fgets($imapConnection, 256); - fgets($imapConnection, 256); - fclose ($fp); - - $attachments[$localfilename] = $filename; - + $message = sqimap_get_message($imapConnection, $id, + $mailbox); } + + $hashed_attachment_dir = getHashedDir($username, $attachment_dir); + 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); + $full_localfilename = "$hashed_attachment_dir/$localfilename"; + while (file_exists($full_localfilename)) { + $localfilename = GenerateRandomString(32, '', 7); + $full_localfilename = "$hashed_attachment_dir/$localfilename"; + } + + $newAttachment = array(); + $newAttachment['localfilename'] = $localfilename; + $newAttachment['remotefilename'] = $filename; + $newAttachment['type'] = strtolower($message->header->type0 . + '/' . $message->header->type1); + + // Write Attachment to file + $fp = fopen ("$hashed_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++) { + 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, $from_htmladdr_search, - $location_of_buttons; - - $subject = sqStripSlashes(decodeHeader($subject)); + $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, $delete_draft, + $mailprio; + + $subject = 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
"; do_hook("compose_bottom"); + echo "