X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=b2bae15f448a1cbc6d74d5be09261467f64c7228;hp=302cab44e2a522ffde92cdbbdbbeff7962255beb;hb=2d367c687f9813a45a3d2f1911036cfc0425fdd0;hpb=3bc5ef2df787326ceba9cf40f880e353d2e998f4
diff --git a/src/compose.php b/src/compose.php
index 302cab44..b2bae15f 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1,62 +1,55 @@
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
@@ -73,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])) {
@@ -86,9 +79,9 @@
}
$body = "";
for ($i=0; isset($body_ary[$i]); $i++) {
- if (! $forward_id)
+ if ($reply_id)
{
- if (ereg('^[\\s>]+', $body_ary[$i]))
+ if (ereg('^[ >]+', $body_ary[$i]))
{
$body_ary[$i] = '>' . $body_ary[$i];
}
@@ -97,16 +90,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]);
+ 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";
@@ -114,8 +109,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;
}
-
+
return;
}
@@ -129,16 +130,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]) != "")) {
@@ -154,53 +155,66 @@
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));
- 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;
-
- $subject = sqStripSlashes(decodeHeader($subject));
+ $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\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";
echo " \n\n";
}
- function showSentForm () {
- echo "