X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=5dc425d63be4903da135422e1ddcaf82efa1cfed;hb=71257f8b1bbf95b87735f654487efbad21b138a0;hp=360cd594c33d3eb2ba8e9b67cfd7a178782c6a4e;hpb=248bfebb4a9608e0d8252cd4b28d54049cfa64c6;p=squirrelmail.git
diff --git a/src/compose.php b/src/compose.php
index 360cd594..5dc425d6 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1,18 +1,20 @@
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 +67,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 +80,7 @@
}
$body = "";
for ($i=0; isset($body_ary[$i]); $i++) {
- if (! $forward_id)
+ if ($reply_id)
{
if (ereg('^[ >]+', $body_ary[$i]))
{
@@ -84,16 +91,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";
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";
@@ -108,7 +117,7 @@
$orig_from = str_replace("'",'',$orig_from);
$body = getReplyCitation($orig_from) . $body;
}
-
+
return;
}
@@ -122,16 +131,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 +156,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 +188,34 @@
// 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, $delete_draft,
+ $mailprio;
$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";
+ }
+ if ($default_use_priority) {
+ if(!isset($mailprio)) {
+ $mailprio = "3";
+ }
+ echo "\n\t". _("Priority") .":";
+ }
+
do_hook("compose_button_row");
echo " \n";
@@ -403,10 +442,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'] == "")
@@ -414,10 +453,28 @@
$attachments[] = $newAttachment;
}
-
- if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
+
+ 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");
+ /* If this is a resumed draft, then delete the original */
+ if(isset($delete_draft)) {
+ Header("Location: delete_message.php?mailbox=$draft_folder&message=$delete_draft&sort=$sort&startMessage=1");
+ exit();
+ } else {
+ 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'] &&
@@ -435,7 +492,7 @@
// 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
@@ -453,23 +510,34 @@
}
}
$body = $newBody;
-
+
do_hook("compose_send");
-
- if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id)) {
- showInputForm();
+
+ 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();
+ }
+ 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);
}
@@ -495,7 +563,7 @@
}
}
}
-
+
showInputForm();
} else if (isset($html_addr_search)) {
if (isset($HTTP_POST_FILES['attachfile']) &&
@@ -529,7 +597,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);
@@ -539,21 +607,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();
}
@@ -584,5 +655,5 @@
/* Build and return the citation string. */
return ($start . $orig_from . $end . "\n");
- }
-?>
\ No newline at end of file
+ }
+?>