X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=f008aee0b042c2593df37c53ff1c0d94db8a2bd8;hp=91d1641492bc5eb37c4b217402db52de5d96c2af;hb=f7b1b3b1779c3665bc943b2dec65182e8c536e69;hpb=66289791f46da9f6c7e0ab95bdfff31b73898e3c
diff --git a/src/compose.php b/src/compose.php
index 91d16414..f008aee0 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1,66 +1,64 @@
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 +66,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];
}
@@ -94,14 +92,14 @@
}
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 +107,14 @@
}
$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;
}
-
- $body = ereg_replace('\\\\', '\\\\', $body);
- sqimap_mailbox_close($imapConnection);
return;
}
@@ -127,16 +128,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 +153,65 @@
function getAttachments($message) {
global $mailbox, $attachments, $attachment_dir, $imapConnection,
- $ent_num, $forward_id;
-
+ $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, $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);
}
+
+ 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++) {
+ 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;
+ $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 = sqStripSlashes(decodeHeader($subject));
+ $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");
}
-
+
function showComposeButtonRow() {
- global $use_javascript_addr_book;
+ global $use_javascript_addr_book, $save_as_draft;
+
echo " \n | \n";
if ($use_javascript_addr_book) {
echo " \n";
- } else {
+ } else {
echo " ";
- }
+ }
echo "\n \n";
-
+
+ if ($save_as_draft) {
+ echo "\n";
+ }
+
do_hook("compose_button_row");
echo " | \n";
echo "
\n\n";
}
- function showSentForm () {
- echo "
Message Sent!
";
- echo "You will be automatically forwarded.
If not, click here";
- echo "";
- }
-
function checkInput ($show) {
/** I implemented the $show variable because the error messages
were getting sent before the page header. So, I check once
@@ -370,111 +413,216 @@
// True if FAILURE
function saveAttachedFiles() {
global $HTTP_POST_FILES, $attachment_dir, $attachments;
-
- is_logged_in();
+
$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;
}
}
-
- if (!$failed) {
- // Write information about the file
- $fp = fopen ($attachment_dir.$localfilename.".info", "w");
- fputs ($fp, $HTTP_POST_FILES['attachfile']['type']."\n".$HTTP_POST_FILES['attachfile']['name']."\n");
- fclose ($fp);
-
- $attachments[$localfilename] = $HTTP_POST_FILES['attachfile']['name'];
- }
+
+ $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 (($mailbox == "") || ($mailbox == "None"))
+ if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
$mailbox = "INBOX";
- if(isset($send)) {
- if ($HTTP_POST_FILES['attachfile']['tmp_name'] &&
+ if (isset($draft)) {
+ require_once ('../src/draft_actions.php');
+ if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) {
+ showInputForm();
+ exit();
+ } else {
+ $draft_message = _("Draft Email Saved");
+ Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort&startMessage=1¬e=$draft_message");
+ exit();
+ }
+ }
+
+ 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) && ! $AttachFailure) {
- $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 (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();
+ }
+ if ( isset($delete_draft)) {
+ Header("Location: delete_message.php?mailbox=$draft_folder&message=$delete_draft&sort=$sort&startMessage=1");
+ exit();
+ }
+
+ Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
} else {
//$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
displayPageHeader($color, $mailbox);
-
- if ($AttachFailure)
+
+ if (isset($AttachFailure))
plain_error_message(_("Could not move/copy file. File not attached"), $color);
checkInput(true);
-
+
showInputForm();
//sqimap_logout($imapConnection);
}
- } else if ($html_addr_search_done) {
- is_logged_in();
+ } else if (isset($html_addr_search_done)) {
displayPageHeader($color, $mailbox);
- $send_to = sqStripSlashes($send_to);
- $send_to_cc = sqStripSlashes($send_to_cc);
- $send_to_bcc = sqStripSlashes($send_to_bcc);
-
- 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)) {
if (saveAttachedFiles())
plain_error_message(_("Could not move/copy file. File not attached"), $color);
+ displayPageHeader($color, $mailbox);
showInputForm();
} else if (isset($do_delete)) {
- is_logged_in();
displayPageHeader($color, $mailbox);
- while (list($lkey, $localname) = each($delete)) {
- unset ($attachments[$localname]);
- 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 if ($smtpErrors) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- displayPageHeader($color, $mailbox);
-
- $newmail = true;
- if ($forward_id && $ent_num) getAttachments(0);
-
- newMail();
- showInputForm();
- sqimap_logout($imapConnection);
} 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;
-
- if ($forward_id && $ent_num) getAttachments(0);
-
+
+ ClearAttachments();
+
+ if (isset($forward_id) && $forward_id && isset($ent_num) && $ent_num)
+ getAttachments(0);
+
+ if (isset($draft_id) && $draft_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");
+ }
+?>