X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=91d1641492bc5eb37c4b217402db52de5d96c2af;hp=daae7b63b2f32fbffbe94e44f4a945513886d706;hb=66289791f46da9f6c7e0ab95bdfff31b73898e3c;hpb=1e62a204a9ceb60f3cde686d60efc85436a2fbd2;ds=sidebyside
diff --git a/src/compose.php b/src/compose.php
index daae7b63..91d16414 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -1,5 +1,11 @@
header;
+ if ($ent_num)
+ $message = getEntity($message, $ent_num);
if ($message->header->type0 == "text" || $message->header->type1 == "message") {
- $body = decodeBody(mime_fetch_body($imapConnection, $id, $message->header->entity_id), $message->header->encoding);
+ 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 ($forward_id)
- $tmp = _("-------- Original Message ---------\n");
if ($message->header->type1 == "html")
$body = strip_tags($body);
-
+
+ sqUnWordWrap($body);
$body_ary = explode("\n", $body);
+ $i = count($body_ary) - 1;
+ while (isset($body_ary[$i]) && ereg("^[>\s]*$", $body_ary[$i])) {
+ unset($body_ary[$i]);
+ $i --;
+ }
$body = "";
for ($i=0; $i < count($body_ary); $i++) {
- $tmp = $body_ary[$i];
-
- if ($forward_id)
- $body = "$body$tmp\n";
- else
- $body = "$body> $tmp\n";
+ if (! $forward_id)
+ {
+ if (ereg('^[\s>]+', $body_ary[$i]))
+ {
+ $body_ary[$i] = '>' . $body_ary[$i];
+ }
+ else
+ {
+ $body_ary[$i] = '> ' . $body_ary[$i];
+ }
+ }
+ sqWordWrap($body_ary[$i], $editor_size - 1);
+ $body .= $body_ary[$i] . "\n";
+ $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 (count($orig_header->to) > 1) {
+ for ($x=1; $x < count($orig_header->to); $x++) {
+ $bodyTop .= " " . $orig_header->to[$x] . "\n";
+ }
+ }
+ $bodyTop .= "\n";
+ $body = $bodyTop . $body;
+ }
+
+ $body = ereg_replace('\\\\', '\\\\', $body);
+
+ sqimap_mailbox_close($imapConnection);
+ return;
}
if (!$send_to) {
$send_to = sqimap_find_email($send_to);
}
- $send_to = ereg_replace("\"", "", $send_to);
- $send_to = stripslashes($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 = "";
@@ -105,16 +150,58 @@
}
} // function newMail()
+ function getAttachments($message) {
+ global $mailbox, $attachments, $attachment_dir, $imapConnection,
+ $ent_num, $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;
+
+ }
+ } 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, $editor_size,
$attachments, $subject, $newmail, $use_javascript_addr_book,
- $send_to_bcc, $reply_id, $mailbox;
+ $send_to_bcc, $reply_id, $mailbox, $from_htmladdr_search,
+ $location_of_buttons;
- $subject = decodeHeader($subject);
+ $subject = sqStripSlashes(decodeHeader($subject));
$reply_subj = decodeHeader($reply_subj);
$forward_subj = decodeHeader($forward_subj);
-
+ $body = sqStripSlashes($body);
+
if ($use_javascript_addr_book) {
echo "\n\n";
- } else {
- echo " ";
- }
- echo "\n \n";
- echo " \n";
- echo " \n\n";
-
+ if ($location_of_buttons == 'between') showComposeButtonRow();
echo " \n";
- echo " \n";
- if ($use_signature == true && $newmail == true)
- echo "
";
- else
- echo "
\n";
+ echo " | \n";
+ echo "
\n";
echo " | \n";
echo "
\n";
- echo " |
\n";
+
+ if ($location_of_buttons == 'bottom')
+ showComposeButtonRow();
+ else {
+ echo " | | |
\n";
+ }
// This code is for attachments
echo " \n";
- echo " | \n";
+ echo " | \n";
echo "
"._("Attach:");
- echo " | \n";
+ echo " | \n";
// echo " \n";
- echo " \n";
- echo " \n";
+ echo " \n";
+ echo " \n";
echo " | \n";
echo "
\n";
if (isset($attachments) && count($attachments)>0) {
- echo "| \n";
+ echo " |
| \n";
echo " ";
- echo " | ";
+ echo " | ";
while (list($localname, $remotename) = each($attachments)) {
echo "\n";
echo "$remotename
\n";
@@ -243,6 +322,27 @@
echo "\n";
echo "";
+ do_hook("compose_bottom");
+ }
+
+ function showComposeButtonRow() {
+ global $use_javascript_addr_book;
+ echo " |
| \n | \n";
+ if ($use_javascript_addr_book) {
+ echo " \n";
+ } else {
+ echo " ";
+ }
+ echo "\n \n";
+
+ do_hook("compose_button_row");
+
+ echo " | \n";
+ echo "
\n\n";
}
function showSentForm () {
@@ -258,11 +358,7 @@
error message, show=true **/
global $body, $send_to, $subject, $color;
- if ($body == "" && $subject == "") {
- if ($show)
- plain_error_message(_("You have not entered a message body or a subject."), $color);
- return false;
- } else if ($send_to == "") {
+ if ($send_to == "") {
if ($show)
plain_error_message(_("You have not filled in the \"To:\" field."), $color);
return false;
@@ -271,30 +367,59 @@
} // function checkInput()
+ // True if FAILURE
+ function saveAttachedFiles() {
+ global $HTTP_POST_FILES, $attachment_dir, $attachments;
+
+ is_logged_in();
+ $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'];
+ }
+ }
+
if (($mailbox == "") || ($mailbox == "None"))
$mailbox = "INBOX";
if(isset($send)) {
- if (checkInput(false)) {
+ if ($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");
} else {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ //$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
displayPageHeader($color, $mailbox);
+
+ if ($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) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ is_logged_in();
displayPageHeader($color, $mailbox);
- $body = stripslashes($body);
- $send_to = stripslashes($send_to);
- $send_to_cc = stripslashes($send_to_cc);
- $send_to_bcc = stripslashes($send_to_bcc);
- $subject = stripslashes($subject);
+ $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)
@@ -310,53 +435,46 @@
showInputForm();
} else if ($html_addr_search) {
- //* 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");
+ // 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");
} else if (isset($attach)) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
- displayPageHeader($color, $mailbox);
-
- $localfilename = md5("$attachfile, $attachfile_name, $REMOTE_IP, $REMOTE_PORT, $UNIQUE_ID, and everything else that may add entropy");
- $localfilename = $localfilename;
-
- // Put the file in a better place
- error_reporting(0); // Rename will produce error output if it fails
- if (!rename($attachfile, $attachment_dir.$localfilename)) {
- if (!copy($attachfile, $attachment_dir.$localfilename)) {
- plain_error_message(_("Could not move/copy file. File not attached"));
- $failed = true;
- }
- }
- // If it still exists, PHP will remove the original file
-
- if (!$failed) {
- // Write information about the file
- $fp = fopen ($attachment_dir.$localfilename.".info", "w");
- fputs ($fp, "$attachfile_type\n$attachfile_name\n");
- fclose ($fp);
-
- $attachments[$localfilename] = $attachfile_name;
- }
-
+ if (saveAttachedFiles())
+ plain_error_message(_("Could not move/copy file. File not attached"), $color);
showInputForm();
} else if (isset($do_delete)) {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ is_logged_in();
displayPageHeader($color, $mailbox);
- while (list($key, $localname) = each($delete)) {
- array_splice ($attachments, $key, 1);
+ while (list($lkey, $localname) = each($delete)) {
+ unset ($attachments[$localname]);
unlink ($attachment_dir.$localname);
unlink ($attachment_dir.$localname.".info");
}
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);
displayPageHeader($color, $mailbox);
$newmail = true;
+
+ if ($forward_id && $ent_num) getAttachments(0);
+
newMail();
showInputForm();
+ sqimap_logout($imapConnection);
}
?>
+
+