X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=f008aee0b042c2593df37c53ff1c0d94db8a2bd8;hb=84c18709b6fdf706f2531877369a34f8ee341e2e;hp=9ebb5ded071d4f4541fa343de5756e8121aefbe3;hpb=0fa507f1ee8bfa85f916279487eab20d54782e84;p=squirrelmail.git
diff --git a/src/compose.php b/src/compose.php
index 9ebb5ded..f008aee0 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1,27 +1,28 @@
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
@@ -60,11 +66,11 @@
} 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 ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) {
@@ -73,7 +79,7 @@
}
$body = "";
for ($i=0; isset($body_ary[$i]); $i++) {
- if (! $forward_id)
+ if ($reply_id)
{
if (ereg('^[ >]+', $body_ary[$i]))
{
@@ -91,9 +97,9 @@
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";
@@ -102,13 +108,13 @@
$bodyTop .= "\n";
$body = $bodyTop . $body;
} else if ($reply_id) {
- $orig_from = $orig_header->from;
+ $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 = getReplyCitation($orig_from) . $body;
}
-
+
return;
}
@@ -122,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]) != "")) {
@@ -147,21 +153,26 @@
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,
+ $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);
@@ -174,33 +185,33 @@
// Write Attachment to file
$fp = fopen ($attachment_dir.$localfilename, 'w');
- fputs ($fp, decodeBody(mime_fetch_body($imapConnection,
- $forward_id, $message->header->entity_id),
+ 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,
+ $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;
+ $username, $data_dir, $identity, $draft_id;
$subject = decodeHeader($subject);
$reply_subj = decodeHeader($reply_subj);
$forward_subj = decodeHeader($forward_subj);
-
+
if ($use_javascript_addr_book) {
echo "\n\n";
- } else {
+ } else {
echo " ";
- }
+ }
echo "\n \n";
-
+
+ if ($save_as_draft) {
+ echo "\n";
+ }
+
do_hook("compose_button_row");
echo " \n";
@@ -394,7 +413,7 @@
// 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);
@@ -404,10 +423,10 @@
return true;
}
}
-
+
$newAttachment['localfilename'] = $localfilename;
$newAttachment['remotefilename'] = $HTTP_POST_FILES['attachfile']['name'];
- $newAttachment['type'] =
+ $newAttachment['type'] =
strtolower($HTTP_POST_FILES['attachfile']['type']);
if ($newAttachment['type'] == "")
@@ -415,10 +434,22 @@
$attachments[] = $newAttachment;
}
-
+
if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
$mailbox = "INBOX";
+ 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'] &&
@@ -433,44 +464,49 @@
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;
-
+ // 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");
+ 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 (isset($AttachFailure))
plain_error_message(_("Could not move/copy file. File not attached"), $color);
checkInput(true);
-
+
showInputForm();
//sqimap_logout($imapConnection);
}
@@ -479,24 +515,24 @@
if (isset($send_to_search) && is_array($send_to_search)) {
foreach ($send_to_search as $k => $v) {
- if (substr($k, 0, 1) == 'T') {
+ 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;
- }
+ }
+ 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 (isset($html_addr_search)) {
if (isset($HTTP_POST_FILES['attachfile']) &&
@@ -508,7 +544,7 @@
}
// 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);
@@ -530,7 +566,7 @@
} else {
// 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,
+ $imapConnection = sqimap_login($username, $key, $imapServerAddress,
$imapPort, 0);
displayPageHeader($color, $mailbox);
@@ -540,21 +576,24 @@
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();
}
@@ -585,5 +624,5 @@
/* Build and return the citation string. */
return ($start . $orig_from . $end . "\n");
- }
+ }
?>