X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=ae21388e95c088ef82c02df6c0d4501ad315ede5;hp=85aba1815a9625b7b03d20f75de13e9de900e863;hb=00b49b9ea83959dacbe2f7fb3c391c169f9c6470;hpb=95de6c91ca2fb3b0ee48578c45d21fbc934a769f diff --git a/src/compose.php b/src/compose.php index 85aba181..ae21388e 100644 --- a/src/compose.php +++ b/src/compose.php @@ -1,5 +1,5 @@ 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 @@ -67,56 +60,78 @@ } else { $body = ""; } - + 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++) { - if ($i==0 && $forward_id) { - $tmp = "-------- " . _("Original Message") . " --------"; - $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 { - $tmp = $body_ary[$i]; + for ($i=0; isset($body_ary[$i]); $i++) { + if (! $forward_id) + { + if (ereg('^[ >]+', $body_ary[$i])) + { + $body_ary[$i] = '>' . $body_ary[$i]; + } + else + { + $body_ary[$i] = '> ' . $body_ary[$i]; + } } - if ($forward_id) - $body = "$body$tmp\n"; - else - $body = "$body> $tmp\n"; + sqWordWrap($body_ary[$i], $editor_size - 1); + $body .= $body_ary[$i] . "\n"; + unset($body_ary[$i]); } - return $body; + 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; } - $send_to = stripslashes($send_to); - if (!$send_to) { $send_to = sqimap_find_email($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]) != "")) { @@ -130,11 +145,57 @@ } } // 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 (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, + $forward_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; $subject = decodeHeader($subject); $reply_subj = decodeHeader($reply_subj); @@ -151,131 +212,167 @@ echo "// -->\n\n"; } - echo "\n
\n"; - if ($reply_id) { - echo "\n"; - } - printf("\n", htmlspecialchars($mailbox)); - echo "\n"; + echo "\n\n"; + + echo "
\n"; + + if ($location_of_buttons == 'top') showComposeButtonRow(); + + $idents = getPref($data_dir, $username, 'identities'); + if ($idents != '' && $idents > 1) { + echo " \n"; + echo " \n"; + echo " \n"; + } echo " \n"; - echo " \n"; echo " \n"; echo " \n"; - echo " \n"; echo " \n"; echo " \n"; - echo " \n"; echo " \n"; - echo " \n\n"; - echo " \n"; - echo " \n\n"; - + if ($location_of_buttons == 'between') showComposeButtonRow(); echo " \n"; - echo " \n"; echo " \n"; - echo " \n"; - + + if ($location_of_buttons == 'bottom') + showComposeButtonRow(); + else { + echo " \n"; + } + // This code is for attachments echo " \n"; - echo " \n"; echo " \n"; - if (isset($attachments) && count($attachments)>0) { - echo ""; } // End of attachment code echo "
\n"; + echo _("From:"); + echo " \n"; + echo "\n"; + echo "
\n"; + echo " \n"; echo _("To:"); - echo " \n"; + echo " \n"; printf("
\n", - htmlspecialchars($send_to)); + htmlspecialchars($send_to)); echo "
\n"; + echo " \n"; echo _("CC:"); - echo " \n"; + echo " \n"; printf("
\n", - htmlspecialchars($send_to_cc)); + htmlspecialchars($send_to_cc)); echo "
\n"; + echo " \n"; echo _("BCC:"); echo " \n"; printf("
\n", - htmlspecialchars($send_to_bcc)); + htmlspecialchars($send_to_bcc)); echo "
\n"; + echo " \n"; echo _("Subject:"); echo " \n"; if ($reply_subj) { $reply_subj = str_replace("\"", "'", $reply_subj); - $reply_subj = stripslashes($reply_subj); $reply_subj = trim($reply_subj); if (substr(strtolower($reply_subj), 0, 3) != "re:") $reply_subj = "Re: $reply_subj"; printf(" ", - htmlspecialchars($reply_subj)); + htmlspecialchars($reply_subj)); } else if ($forward_subj) { - $forward_subj = str_replace("\"", "'", $forward_subj); - $forward_subj = stripslashes($forward_subj); $forward_subj = trim($forward_subj); - if ((substr(strtolower($forward_subj), 0, 4) != "fwd:") && - (substr(strtolower($forward_subj), 0, 5) != "[fwd:") && - (substr(strtolower($forward_subj), 0, 6) != "[ fwd:")) + if ((substr(strtolower($forward_subj), 0, 4) != 'fwd:') && + (substr(strtolower($forward_subj), 0, 5) != '[fwd:') && + (substr(strtolower($forward_subj), 0, 6) != '[ fwd:')) $forward_subj = "[Fwd: $forward_subj]"; printf(" ", - htmlspecialchars($forward_subj)); + htmlspecialchars($forward_subj)); } else { - printf(" ", - htmlspecialchars($subject)); + printf(" ", + htmlspecialchars($subject)); } echo "
\n \n"; - if ($use_javascript_addr_book) { - echo " \n"; - } else { - echo " "; - } - echo "\n \n"; - - do_hook("compose_button_row"); - - echo "
\n"; + echo " \n"; echo "   
\n"; echo "
 
\n"; + echo " \n"; echo "
"._("Attach:"); - echo " 		\n"; - // echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo "   \n"; echo "
\n"; + if (count($attachments)) + { + echo "
\n"; echo " "; - echo ""; - while (list($localname, $remotename) = each($attachments)) { - echo "\n"; - echo "$remotename
\n"; + echo "		"; + foreach ($attachments as $key => $info) { + echo "\n"; + echo $info['remotefilename'] . " - " . $info['type'] . " ("; + echo show_readable_size(filesize($attachment_dir . + $info['localfilename'])) . ")
\n"; } - + echo "\n"; echo "
\n"; + if ($reply_id) { + echo "\n"; + } + printf("\n", htmlspecialchars($mailbox)); echo "
"; + do_hook("compose_bottom"); } - function showSentForm () { - echo "


Message Sent!

"; - echo "You will be automatically forwarded.
If not, click here"; - echo "
"; + function showComposeButtonRow() { + global $use_javascript_addr_book; + + echo " \n \n"; + if ($use_javascript_addr_book) { + echo " \n"; + } else { + echo " "; + } + echo "\n \n"; + + do_hook("compose_button_row"); + + echo " \n"; + echo " \n\n"; } function checkInput ($show) { @@ -285,11 +382,7 @@ error message, show=true **/ global $body, $send_to, $subject, $color; - if ($body == "" && $subject == "") { - if ($show) - plain_error_message(_("You have not entered a message body or a subject."), $color); - return false; - } else if ($send_to == "") { + if ($send_to == "") { if ($show) plain_error_message(_("You have not filled in the \"To:\" field."), $color); return false; @@ -298,94 +391,199 @@ } // function checkInput() - if (($mailbox == "") || ($mailbox == "None")) + // True if FAILURE + function saveAttachedFiles() { + global $HTTP_POST_FILES, $attachment_dir, $attachments; + + $localfilename = GenerateRandomString(32, '', 7); + while (file_exists($attachment_dir . $localfilename)) + $localfilename = GenerateRandomString(32, '', 7); + + if (!@rename($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) { + if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) { + return true; + } + } + + $newAttachment['localfilename'] = $localfilename; + $newAttachment['remotefilename'] = $HTTP_POST_FILES['attachfile']['name']; + $newAttachment['type'] = + strtolower($HTTP_POST_FILES['attachfile']['type']); + + if ($newAttachment['type'] == "") + $newAttachment['type'] = 'application/octet-stream'; + + $attachments[] = $newAttachment; + } + + if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None")) $mailbox = "INBOX"; - if(isset($send)) { - if (checkInput(false)) { - $urlMailbox = urlencode ($mailbox); - sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id); - header ("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1"); + if (isset($send)) { + if (isset($HTTP_POST_FILES['attachfile']) && + $HTTP_POST_FILES['attachfile']['tmp_name'] && + $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none') + $AttachFailure = saveAttachedFiles(); + if (checkInput(false) && !isset($AttachFailure)) { + $urlMailbox = urlencode (trim($mailbox)); + if (! isset($reply_id)) + $reply_id = 0; + // Set $default_charset to correspond with the user's selection + // of language interface. + set_my_charset(); + + // This is to change all newlines to \n + // We'll change them to \r\n later (in the sendMessage function) + $body = str_replace("\r\n", "\n", $body); + $body = str_replace("\r", "\n", $body); + + // Rewrap $body so that no line is bigger than $editor_size + // This should only really kick in the sqWordWrap function + // if the browser doesn't support "HARD" as the wrap type + // Or, in Opera's case, something goes wrong. + $body = explode("\n", $body); + $newBody = ''; + foreach ($body as $line) { + if( $line <> '-- ' ) + $line = rtrim($line); + if (strlen($line) <= $editor_size + 1) + $newBody .= $line . "\n"; + else { + sqWordWrap($line, $editor_size) . "\n"; + $newBody .= $line; + } + } + $body = $newBody; + + do_hook("compose_send"); + + if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) { + showInputForm(); + exit(); + } + Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1"); } else { - $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + //$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); displayPageHeader($color, $mailbox); + + if (isset($AttachFailure)) + plain_error_message(_("Could not move/copy file. File not attached"), $color); + checkInput(true); - + showInputForm(); - sqimap_logout($imapConnection); + //sqimap_logout($imapConnection); } - } else if ($html_addr_search_done) { - is_logged_in(); + } else if (isset($html_addr_search_done)) { displayPageHeader($color, $mailbox); - $body = stripslashes($body); - $send_to = stripslashes($send_to); - $send_to_cc = stripslashes($send_to_cc); - $send_to_bcc = stripslashes($send_to_bcc); - $subject = stripslashes($subject); - - for ($i=0; $i < count($send_to_search); $i++) { - if ($send_to) - $send_to .= ", "; - $send_to .= $send_to_search[$i]; - } - - for ($i=0; $i < count($send_to_cc_search); $i++) { - if ($send_to_cc) - $send_to_cc .= ", "; - $send_to_cc .= $send_to_cc_search[$i]; + if (isset($send_to_search) && is_array($send_to_search)) { + foreach ($send_to_search as $k => $v) { + if (substr($k, 0, 1) == 'T') { + if ($send_to) + $send_to .= ', '; + $send_to .= $v; + } + elseif (substr($k, 0, 1) == 'C') { + if ($send_to_cc) + $send_to_cc .= ', '; + $send_to_cc .= $v; + } + elseif (substr($k, 0, 1) == 'B') { + if ($send_to_bcc) + $send_to_bcc .= ', '; + $send_to_bcc .= $v; + } + } } - + showInputForm(); - } else if ($html_addr_search) { + } else if (isset($html_addr_search)) { + if (isset($HTTP_POST_FILES['attachfile']) && + $HTTP_POST_FILES['attachfile']['tmp_name'] && + $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none') + { + if (saveAttachedFiles()) + plain_error_message(_("Could not move/copy file. File not attached"), $color); + } // I am using an include so as to elminiate an extra unnecessary click. If you // can think of a better way, please implement it. - include ("addrbook_search_html.php"); + include_once('./addrbook_search_html.php'); } else if (isset($attach)) { - is_logged_in(); + if (saveAttachedFiles()) + plain_error_message(_("Could not move/copy file. File not attached"), $color); displayPageHeader($color, $mailbox); - - $localfilename = md5("$attachfile, $attachfile_name, $REMOTE_IP, $REMOTE_PORT, $UNIQUE_ID, and everything else that may add entropy"); - $localfilename = $localfilename; - - // Put the file in a better place - error_reporting(0); // Rename will produce error output if it fails - if (!rename($attachfile, $attachment_dir.$localfilename)) { - if (!copy($attachfile, $attachment_dir.$localfilename)) { - plain_error_message(_("Could not move/copy file. File not attached")); - $failed = true; - } - } - // If it still exists, PHP will remove the original file - - if (!$failed) { - // Write information about the file - $fp = fopen ($attachment_dir.$localfilename.".info", "w"); - fputs ($fp, "$attachfile_type\n$attachfile_name\n"); - fclose ($fp); - - $attachments[$localfilename] = $attachfile_name; - } - showInputForm(); } else if (isset($do_delete)) { - is_logged_in(); displayPageHeader($color, $mailbox); - while (list($key, $localname) = each($delete)) { - array_splice ($attachments, $key, 1); - unlink ($attachment_dir.$localname); - unlink ($attachment_dir.$localname.".info"); + if (isset($delete) && is_array($delete)) + { + foreach($delete as $index) + { + unlink ($attachment_dir.$attachments[$index]['localfilename']); + unset ($attachments[$index]); + } } showInputForm(); } else { - $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + // This handles the default case as well as the error case + // (they had the same code) --> if (isset($smtpErrors)) + $imapConnection = sqimap_login($username, $key, $imapServerAddress, + $imapPort, 0); displayPageHeader($color, $mailbox); $newmail = true; + + ClearAttachments(); + + if (isset($forward_id) && $forward_id && isset($ent_num) && $ent_num) + getAttachments(0); + newMail(); showInputForm(); sqimap_logout($imapConnection); } -?> + + function ClearAttachments() { + global $attachments, $attachment_dir; + + foreach ($attachments as $info) { + if (file_exists($attachment_dir . $info['localfilename'])) { + unlink($attachment_dir . $info['localfilename']); + } + } + + $attachments = array(); + } + + function getReplyCitation($orig_from) { + global $reply_citation_style, $reply_citation_start, $reply_citation_end; + + /* First, return an empty string when no citation style selected. */ + if (($reply_citation_style == '') || ($reply_citation_style == 'none')) { + return (''); + } + + /* Otherwise, try to select the desired citation style. */ + switch ($reply_citation_style) { + case 'author_said': + $start = ''; + $end = ' ' . _("said") . ':'; + break; + case 'quote_who': + $start = '<' . _("quote") . ' ' . _("who") . '="'; + $end = '">'; + break; + case 'user-defined': + $start = $reply_citation_start; + $end = $reply_citation_end; + break; + default: return (''); + } + + /* Build and return the citation string. */ + return ($start . $orig_from . $end . "\n"); + } +?> \ No newline at end of file