<?php
- /**
- * compose.php
- *
- * Copyright (c) 1999-2000 The SquirrelMail development team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * This code sends a mail.
- *
- * There are 4 modes of operation:
- * - Start new mail
- * - Add an attachment
- * - Send mail
- * - Save As Draft
- *
- * $Id$
- **/
-
- require_once('../src/validate.php');
- require_once('../functions/imap.php');
- require_once('../functions/date.php');
- require_once('../functions/mime.php');
- require_once('../functions/smtp.php');
- require_once('../functions/display_messages.php');
- require_once('../functions/plugin.php');
-
- if (!isset($attachments))
- {
- $attachments = array();
- session_register('attachments');
- }
-
-
- // This function is used when not sending or adding attachments
- function newMail () {
- global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
- $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size,
- $draft_id, $use_signature;
-
- $send_to = decodeHeader($send_to);
- $send_to_cc = decodeHeader($send_to_cc);
- $send_to_bcc = decodeHeader($send_to_bcc);
- if ($forward_id)
- $id = $forward_id;
- elseif ($reply_id)
- $id = $reply_id;
+/**
+ * compose.php
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * This code sends a mail.
+ *
+ * There are 4 modes of operation:
+ * - Start new mail
+ * - Add an attachment
+ * - Send mail
+ * - Save As Draft
+ *
+ * $Id$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/
+/*** + Base level indent should begin at left margin, as ***/
+/*** the require_once below looks. ***/
+/*** + All identation should consist of four space blocks ***/
+/*** + Tab characters are evil. ***/
+/*** + all comments should use "slash-star ... star-slash" ***/
+/*** style -- no pound characters, no slash-slash style ***/
+/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/
+/*** ALWAYS USE { AND } CHARACTERS!!! ***/
+/*** + Please use ' instead of ", when possible. Note " ***/
+/*** should always be used in _( ) function calls. ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+require_once('../functions/date.php');
+require_once('../functions/mime.php');
+require_once('../functions/smtp.php');
+require_once('../functions/display_messages.php');
+require_once('../functions/plugin.php');
+
+if (!isset($attachments)) {
+ $attachments = array();
+ session_register('attachments');
+}
+
+/* This function is used when not sending or adding attachments */
+function newMail () {
+ global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
+ $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size,
+ $draft_id, $use_signature;
+
+ $send_to = decodeHeader($send_to);
+ $send_to_cc = decodeHeader($send_to_cc);
+ $send_to_bcc = decodeHeader($send_to_bcc);
+
+ if ($forward_id) {
+ $id = $forward_id;
+ } elseif ($reply_id) {
+ $id = $reply_id;
+ }
- if ($draft_id){
- $id = $draft_id;
- $use_signature = FALSE;
- }
+ if ($draft_id){
+ $id = $draft_id;
+ $use_signature = FALSE;
+ }
- if (isset($id)) {
- sqimap_mailbox_select($imapConnection, $mailbox);
- $message = sqimap_get_message($imapConnection, $id, $mailbox);
- $orig_header = $message->header;
- if ($ent_num)
+ if (isset($id)) {
+ sqimap_mailbox_select($imapConnection, $mailbox);
+ $message = sqimap_get_message($imapConnection, $id, $mailbox);
+ $orig_header = $message->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 {
+ }
+ 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 ($message->header->type1 == "html")
+ 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])) {
+ 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; isset($body_ary[$i]); $i++) {
- if ($reply_id)
- {
- if (ereg('^[ >]+', $body_ary[$i]))
- {
+ }
+ $body = '';
+ for ($i=0; isset($body_ary[$i]); $i++) {
+ if ($reply_id) {
+ if (ereg('^[ >]+', $body_ary[$i])) {
$body_ary[$i] = '>' . $body_ary[$i];
- }
- else
- {
+ } else {
$body_ary[$i] = '> ' . $body_ary[$i];
}
}
}
$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 ($forward_id) {
+ $bodyTop = '-------- ' . _("Original Message") . " --------\n" .
+ _("Subject") . ': ' . $orig_header->subject . "\n" .
+ _("From") . ': ' . $orig_header->from . "\n" .
+ _("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 .= ' ' . $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) {
+ 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 = "";
+ /* 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++) {
+ for ($i = 0; $i < count($sendcc); $i++) {
$sendcc[$i] = trim($sendcc[$i]);
- if ($sendcc[$i] == "")
- continue;
+ 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"]);
+ $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]) != "")) {
- $send_to_cc .= trim($sendcc[$i]) . ", ";
+ (trim($sendcc[$i]) != '')) {
+ $send_to_cc .= trim($sendcc[$i]) . ', ';
}
- }
- $send_to_cc = trim($send_to_cc);
- if (substr($send_to_cc, -1) == ",") {
+ }
+ $send_to_cc = trim($send_to_cc);
+ if (substr($send_to_cc, -1) == ',') {
$send_to_cc = substr($send_to_cc, 0, strlen($send_to_cc) - 1);
- }
- }
- } // function newMail()
+ }
+ }
+} /* function newMail() */
+
- function getAttachments($message) {
- global $mailbox, $attachments, $attachment_dir, $imapConnection,
- $ent_num, $forward_id, $draft_id;
+function getAttachments($message) {
+ global $mailbox, $attachments, $attachment_dir, $imapConnection,
+ $ent_num, $forward_id, $draft_id, $username;
- if (isset($draft_id))
+ if (isset($draft_id)) {
$id = $draft_id;
- else
+ } 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);
+ if (!$message) {
+ sqimap_mailbox_select($imapConnection, $mailbox);
+ $message = sqimap_get_message($imapConnection, $id, $mailbox);
+ }
- $attachments[] = $newAttachment;
- }
- } else {
- for ($i = 0; $i < count($message->entities); $i++) {
- getAttachments($message->entities[$i]);
- }
- }
- return;
- }
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ if (count($message->entities) == 0) {
+ if ($message->header->entity_id != $ent_num) {
+ $filename = decodeHeader($message->header->filename);
- function showInputForm () {
- global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
- $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;
+ if ($filename == "") {
+ $filename = "untitled-".$message->header->entity_id;
+ }
- $subject = decodeHeader($subject);
- $reply_subj = decodeHeader($reply_subj);
- $forward_subj = decodeHeader($forward_subj);
+ $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";
+ }
- if ($use_javascript_addr_book) {
- echo "\n<SCRIPT LANGUAGE=JavaScript><!--\n";
- echo "function open_abook() { \n";
- echo " var nwin = window.open(\"addrbook_popup.php\",\"abookpopup\",";
- echo "\"width=670,height=300,resizable=yes,scrollbars=yes\");\n";
- echo " if((!nwin.opener) && (document.windows != null))\n";
- echo " nwin.opener = document.windows;\n";
- echo "}\n";
- echo "// --></SCRIPT>\n\n";
- }
+ $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++) {
+ getAttachments($message->entities[$i]);
+ }
+ }
+ return;
+}
+
+function showInputForm () {
+ global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
+ $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);
+
+ if ($use_javascript_addr_book) {
+ echo "\n". '<SCRIPT LANGUAGE=JavaScript><!--' . "\n" .
+ 'function open_abook() { ' . "\n" .
+ ' var nwin = window.open("addrbook_popup.php","abookpopup",' .
+ '"width=670,height=300,resizable=yes,scrollbars=yes");' . "\n" .
+ ' if((!nwin.opener) && (document.windows != null))' . "\n" .
+ ' nwin.opener = document.windows;' . "\n" .
+ "}\n" .
+ '// --></SCRIPT>' . "\n\n";
+ }
- echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\"";
- do_hook("compose_form");
- echo ">\n";
+ echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ' .
+ 'ENCTYPE="multipart/form-data"';
+ do_hook("compose_form");
+ echo ">\n";
- if (isset($draft_id)) {
- echo "<input type=\"hidden\" name=\"delete_draft\" value=\"$draft_id\">\n";
- }
- if (isset($delete_draft)) {
- echo "<input type=\"hidden\" name=\"delete_draft\" value=\"$delete_draft\">\n";
- }
+ if (isset($draft_id)) {
+ echo '<input type="hidden" name="delete_draft" value="' . $draft_id . "\">\n";
+ }
+ if (isset($delete_draft)) {
+ echo '<input type="hidden" name="delete_draft" value="' . $delete_draft. "\">\n";
+ }
- echo "<TABLE WIDTH=\"100%\" ALIGN=center CELLSPACING=0 BORDER=0>\n";
-
- if ($location_of_buttons == 'top') showComposeButtonRow();
-
- $idents = getPref($data_dir, $username, 'identities');
- if ($idents != '' && $idents > 1) {
- echo " <TR>\n";
- echo " <TD BGCOLOR=\"$color[4]\" WIDTH=\"10%\" ALIGN=RIGHT>\n";
- echo _("From:");
- echo " </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
- echo "<select name=identity>\n";
- echo "<option value=default>" .
- htmlspecialchars(getPref($data_dir, $username, 'full_name'));
- $em = getPref($data_dir, $username, 'email_address');
- if ($em != '')
+ echo '<TABLE WIDTH="100%" ALIGN=center CELLSPACING=0 BORDER=0>' . "\n";
+
+ if ($location_of_buttons == 'top') { showComposeButtonRow(); }
+
+ $idents = getPref($data_dir, $username, 'identities');
+ if ($idents != '' && $idents > 1) {
+ echo ' <TR>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' .
+ "\n" .
+ _("From:") .
+ ' </TD><TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
+ '<select name=identity>' . "\n" .
+ '<option value=default>' .
+ htmlspecialchars(getPref($data_dir, $username, 'full_name'));
+ $em = getPref($data_dir, $username, 'email_address');
+ if ($em != '') {
echo htmlspecialchars(' <' . $em . '>') . "\n";
- for ($i = 1; $i < $idents; $i ++) {
+ }
+ for ($i = 1; $i < $idents; $i ++) {
echo '<option value="' . $i . '"';
- if (isset($identity) && $identity == $i)
+ if (isset($identity) && $identity == $i) {
echo ' SELECTED';
- echo '>';
- echo htmlspecialchars(getPref($data_dir, $username, 'full_name' .
- $i));
+ }
+ echo '>' . htmlspecialchars(getPref($data_dir, $username,
+ 'full_name' . $i));
$em = getPref($data_dir, $username, 'email_address' . $i);
- if ($em != '')
+ if ($em != '') {
echo htmlspecialchars(' <' . $em . '>') . "\n";
- }
- echo "</select>\n";
- echo " </TD>\n";
- echo " </TR>\n";
- }
- echo " <TR>\n";
- echo " <TD BGCOLOR=\"$color[4]\" WIDTH=\"10%\" ALIGN=RIGHT>\n";
- echo _("To:");
- echo " </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
- printf(" <INPUT TYPE=text NAME=\"send_to\" VALUE=\"%s\" SIZE=60><BR>\n",
- htmlspecialchars($send_to));
- echo " </TD>\n";
- echo " </TR>\n";
- echo " <TR>\n";
- echo " <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
- echo _("CC:");
- echo " </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
- printf(" <INPUT TYPE=text NAME=\"send_to_cc\" SIZE=60 VALUE=\"%s\"><BR>\n",
- htmlspecialchars($send_to_cc));
- echo " </TD>\n";
- echo " </TR>\n";
- echo " <TR>\n";
- echo " <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
- echo _("BCC:");
- echo " </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
- printf(" <INPUT TYPE=text NAME=\"send_to_bcc\" VALUE=\"%s\" SIZE=60><BR>\n",
- htmlspecialchars($send_to_bcc));
- echo "</TD></TR>\n";
-
- echo " <TR>\n";
- echo " <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
- echo _("Subject:");
- echo " </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
- if ($reply_subj) {
- $reply_subj = str_replace("\"", "'", $reply_subj);
- $reply_subj = trim($reply_subj);
- if (substr(strtolower($reply_subj), 0, 3) != "re:")
- $reply_subj = "Re: $reply_subj";
- printf(" <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
- htmlspecialchars($reply_subj));
- } else if ($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:'))
- $forward_subj = "[Fwd: $forward_subj]";
- printf(" <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
- htmlspecialchars($forward_subj));
- } else {
- printf(" <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
- htmlspecialchars($subject));
- }
- echo "</td></tr>\n\n";
-
- if ($location_of_buttons == 'between') showComposeButtonRow();
-
- echo " <TR>\n";
- echo " <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
- echo " <TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>";
- echo htmlspecialchars($body);
- if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
- if ( $prefix_sig == true )
- echo "\n\n-- \n" . htmlspecialchars($signature);
- else
- echo "\n\n" . htmlspecialchars($signature);
- }
- echo "</TEXTAREA><BR>\n";
- echo " </TD>\n";
- echo " </TR>\n";
-
- if ($location_of_buttons == 'bottom')
- showComposeButtonRow();
- else {
- echo " <TR><TD> </TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT NAME=send VALUE=\""._("Send")."\"></TD></TR>\n";
- }
+ }
+ }
+ echo '</select>' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n";
+ }
+ echo ' <TR>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' . "\n" .
+ _("To:") .
+ ' </TD><TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
+ ' <INPUT TYPE=text NAME="send_to" VALUE="' .
+ htmlspecialchars($send_to) . '" SIZE=60><BR>' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n" .
+ ' <TR>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' . "\n" .
+ _("CC:") .
+ ' </TD><TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
+ ' <INPUT TYPE=text NAME="send_to_cc" SIZE=60 VALUE="' .
+ htmlspecialchars($send_to_cc) . '"><BR>' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n" .
+ ' <TR>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' . "\n" .
+ _("BCC:") .
+ ' </TD><TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
+ ' <INPUT TYPE=text NAME="send_to_bcc" VALUE="' .
+ htmlspecialchars($send_to_bcc) . '" SIZE=60><BR>' . "\n" .
+ '</TD></TR>' . "\n" .
+ ' <TR>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' . "\n" .
+ _("Subject:") .
+ ' </TD><TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n";
+ if ($reply_subj) {
+ $reply_subj = str_replace('"', "'", $reply_subj);
+ $reply_subj = trim($reply_subj);
+ if (substr(strtolower($reply_subj), 0, 3) != 're:')
+ $reply_subj = 'Re: ' . $reply_subj;
+ echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
+ htmlspecialchars($reply_subj) . '">';
+ } else if ($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:')) {
+ $forward_subj = '[Fwd: ' . $forward_subj . ']';
+ }
+ echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
+ htmlspecialchars($forward_subj) . '">';
+ } else {
+ echo ' <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
+ htmlspecialchars($subject) . '">';
+ }
+ echo '</td></tr>' . "\n\n";
+
+ if ($location_of_buttons == 'between') { showComposeButtonRow(); }
+
+ echo ' <TR>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" COLSPAN=2>' . "\n" .
+ ' <TEXTAREA NAME=body ROWS=20 COLS="' .
+ $editor_size . '" WRAP=HARD>' . htmlspecialchars($body);
+ if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
+ if ( $prefix_sig == true ) {
+ echo "\n\n-- \n" . htmlspecialchars($signature);
+ } else {
+ echo "\n\n" . htmlspecialchars($signature);
+ }
+ }
+ echo '</TEXTAREA><BR>' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n";
+
+ if ($location_of_buttons == 'bottom') {
+ showComposeButtonRow();
+ } else {
+ echo ' <TR><TD> </TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT ' .
+ 'NAME=send VALUE="' . _("Send") . '"></TD></TR>' . "\n";
+ }
+
+ /* This code is for attachments */
+ echo ' <TR>' . "\n" .
+ ' <TD VALIGN=MIDDLE ALIGN=RIGHT>' . "\n" .
+ _("Attach:") .
+ ' </TD>' . "\n" .
+ ' <TD VALIGN=MIDDLE ALIGN=LEFT>' . "\n" .
+ ' <INPUT NAME="attachfile" SIZE=48 TYPE="file">' . "\n" .
+ ' <input type="submit" name="attach"' .
+ ' value="' . _("Add") .'">' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n";
+ if (count($attachments)) {
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ echo '<tr><td bgcolor="' . $color[0] . '" align=right>' . "\n" .
+ ' ' .
+ '</td><td align=left bgcolor="' . $color[0] . '">';
+ foreach ($attachments as $key => $info) {
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ echo '<input type="checkbox" name="delete[]" value="' . $key . "\">\n" .
+ $info['remotefilename'] . ' - ' . $info['type'] . ' (' .
+ show_readable_size(filesize($attached_file)) . ")<br>\n";
+ }
+
+ echo '<input type="submit" name="do_delete" value="' .
+ _("Delete selected attachments") . "\">\n" .
+ '</td></tr>';
+ }
+ /* End of attachment code */
+
+ echo '</TABLE>' . "\n";
+ if ($reply_id) {
+ echo '<input type=hidden name=reply_id value=' . $reply_id . ">\n";
+ }
+ echo '<INPUT TYPE=hidden NAME=mailbox VALUE="' . htmlspecialchars($mailbox) .
+ "\">\n" .
+ '</FORM>';
+ do_hook("compose_bottom");
+ echo '</BODY></HTML>' . "\n";
+}
+
+
+
- // This code is for attachments
- echo " <tr>\n";
- echo " <TD BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
- echo " <SMALL><BR></SMALL>"._("Attach:");
- echo " </td><td ALIGN=left BGCOLOR=\"$color[0]\">\n";
- echo " <INPUT NAME=\"attachfile\" SIZE=48 TYPE=\"file\">\n";
- echo " <input type=\"submit\" name=\"attach\"";
- echo " value=\"" . _("Add") ."\">\n";
- echo " </td>\n";
- echo " </tr>\n";
- if (count($attachments))
- {
- echo "<tr><td bgcolor=\"$color[0]\" align=right>\n";
- echo " ";
- echo "</td><td align=left bgcolor=\"$color[0]\">";
- foreach ($attachments as $key => $info) {
- echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$key\">\n";
- echo $info['remotefilename'] . " - " . $info['type'] . " (";
- echo show_readable_size(filesize($attachment_dir .
- $info['localfilename'])) . ")<br>\n";
- }
- echo "<input type=\"submit\" name=\"do_delete\" value=\""._("Delete selected attachments")."\">\n";
- echo "</td></tr>";
- }
- // End of attachment code
- echo "</TABLE>\n";
- if ($reply_id) {
- echo "<input type=hidden name=reply_id value=$reply_id>\n";
- }
- printf("<INPUT TYPE=hidden NAME=mailbox VALUE=\"%s\">\n", htmlspecialchars($mailbox));
- echo "</FORM>";
- do_hook("compose_bottom");
- echo "</BODY></HTML>\n";
- }
function showComposeButtonRow() {
global $use_javascript_addr_book, $save_as_draft,
echo "\n <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
if ($save_as_draft) {
- echo "<input type=\"submit\" name =\"draft\" value=\"Save Draft\">\n";
+ echo '<input type="submit" name ="draft" value="' . _("Save Draft") . "\">\n";
}
if ($default_use_priority) {
if(!isset($mailprio)) {
// True if FAILURE
function saveAttachedFiles() {
- global $HTTP_POST_FILES, $attachment_dir, $attachments;
+ global $HTTP_POST_FILES, $attachment_dir, $attachments, $username;
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
$localfilename = GenerateRandomString(32, '', 7);
- while (file_exists($attachment_dir . $localfilename))
+ $full_localfilename = "$hashed_attachment_dir/$localfilename";
+ while (file_exists($full_localfilename)) {
$localfilename = GenerateRandomString(32, '', 7);
+ $full_localfilename = "$hashed_attachment_dir/$localfilename";
+ }
- if (!@rename($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) {
- if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) {
+ if (!@rename($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
+ if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $full_localfilename)) {
return true;
}
}
$attachments[] = $newAttachment;
}
- if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
+ if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None'))
$mailbox = "INBOX";
if (isset($draft)) {
do_hook("compose_send");
- if (!sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $mailprio)) {
+ if (! isset($mailprio))
+ $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,
+ $subject, $body, $reply_id);
+ else
+ $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,
+ $subject, $body, $reply_id, $mailprio);
+ if (! $Result) {
showInputForm();
exit();
}
} else if (isset($do_delete)) {
displayPageHeader($color, $mailbox);
- if (isset($delete) && is_array($delete))
- {
- foreach($delete as $index)
- {
- unlink ($attachment_dir.$attachments[$index]['localfilename']);
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ if (isset($delete) && is_array($delete)) {
+ foreach($delete as $index) {
+ $attached_file = $hashed_attachment_dir . '/'
+ . $attachments[$index]['localfilename'];
+ unlink ($attached_file);
unset ($attachments[$index]);
}
}
}
function ClearAttachments() {
- global $attachments, $attachment_dir;
+ global $username, $attachments, $attachment_dir;
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
foreach ($attachments as $info) {
- if (file_exists($attachment_dir . $info['localfilename'])) {
- unlink($attachment_dir . $info['localfilename']);
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ if (file_exists($attached_file)) {
+ unlink($attached_file);
}
}
return ('');
}
+ /* Decode the users name. */
+ $parpos = strpos($orig_from, '(');
+ if ($parpos === false) {
+ $orig_from = trim(substr($orig_from, 0, strpos($orig_from, '<')));
+ $orig_from = str_replace('"', '', $orig_from);
+ $orig_from = str_replace("'", '', $orig_from);
+ } else {
+ $end_parpos = strrpos($orig_from, ')');
+ $end_parpos -= ($end_parpos === false ? $end_parpos : $parpos + 1);
+ $orig_from = trim(substr($orig_from, $parpos + 1, $end_parpos));
+ }
+
+ /* Make sure our final value isn't an empty string. */
+ if ($orig_from == '') {
+ return ('');
+ }
+
/* Otherwise, try to select the desired citation style. */
switch ($reply_citation_style) {
case 'author_said':