// This function is used when not sending or adding attachments
function newMail () {
global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
- $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc;
+ $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size;
$send_to = sqStripSlashes(decodeHeader($send_to));
$send_to_cc = sqStripSlashes(decodeHeader($send_to_cc));
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++) {
- if ($i==0 && $forward_id) {
- $tmp = "-------- " . _("Original Message") . " --------\n";
- $tmp .= _("Subject") . ": " . $orig_header->subject . "\n";
- $tmp .= _("From") . ": " . $orig_header->from . "\n";
- $tmp .= _("To") . ": " . $orig_header->to[0] . "\n";
- if (count($orig_header->to) > 1) {
- for ($x=1; $x < count($orig_header->to); $x++) {
- $tmp .= " " . $orig_header->to[$x] . "\n";
- }
- }
- $tmp .= "\n" . $body_ary[$i];
- } else {
- $tmp = $body_ary[$i];
+ if (! $forward_id)
+ {
+ if (ereg('^[\s>]+', $body_ary[$i]))
+ {
+ $body_ary[$i] = '>' . $body_ary[$i];
+ }
+ else
+ {
+ $body_ary[$i] = '> ' . $body_ary[$i];
+ }
}
- if ($forward_id)
- $body = "$body$tmp\n";
- else
- $body = "$body> $tmp\n";
+ 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 $body;
+ return;
}
if (!$send_to) {
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;
+ $send_to_bcc, $reply_id, $mailbox, $from_htmladdr_search,
+ $location_of_buttons;
$subject = sqStripSlashes(decodeHeader($subject));
$reply_subj = decodeHeader($reply_subj);
$forward_subj = decodeHeader($forward_subj);
$body = sqStripSlashes($body);
-
+
if ($use_javascript_addr_book) {
echo "\n<SCRIPT LANGUAGE=JavaScript><!--\n";
echo "function open_abook() { \n";
}
printf("<INPUT TYPE=hidden NAME=mailbox VALUE=\"%s\">\n", htmlspecialchars($mailbox));
echo "<TABLE WIDTH=\"100%\" ALIGN=center CELLSPACING=0 BORDER=0>\n";
+
+ if ($location_of_buttons == 'top') showComposeButtonRow();
+
echo " <TR>\n";
echo " <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
echo _("To:");
}
echo "</td></tr>\n\n";
- echo " <TR><td>\n </td><td>\n";
- if ($use_javascript_addr_book) {
- echo " <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
- echo " <input type=button value=\\\""._("Addresses")."\\\" onclick='javascript:open_abook();'>\");";
- echo " // --></SCRIPT><NOSCRIPT>\n";
- echo " <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
- echo " </NOSCRIPT>\n";
- } else {
- echo " <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
- }
- echo "\n <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
-
- do_hook("compose_button_row");
-
- echo " </TD>\n";
- echo " </TR>\n\n";
-
+ if ($location_of_buttons == 'between') showComposeButtonRow();
echo " <TR>\n";
echo " <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
echo " <TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>";
+ echo htmlspecialchars($body);
if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
- echo (htmlspecialchars($body)) . "\n\n-- \n" . htmlspecialchars($signature);
- } else {
- echo (htmlspecialchars($body));
+ echo "\n\n-- \n" . htmlspecialchars($signature);
}
echo "</TEXTAREA><BR>\n";
echo " </TD>\n";
echo " </TR>\n";
- echo " <TR><TD COLSPAN=2 ALIGN=CENTER><INPUT TYPE=SUBMIT NAME=send VALUE=\"";
- echo _("Send");
- echo "\"></TD></TR>\n";
+
+ if ($location_of_buttons == 'bottom')
+ showComposeButtonRow();
+ else {
+ echo " <TR><TD> </TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT NAME=send VALUE=\""._("Send")."\"></TD></TR>\n";
+ }
// This code is for attachments
echo " <tr>\n";
echo "</FORM>";
do_hook("compose_bottom");
}
+
+ function showComposeButtonRow() {
+ echo " <TR><td>\n </td><td>\n";
+ if ($use_javascript_addr_book) {
+ echo " <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
+ echo " <input type=button value=\\\""._("Addresses")."\\\" onclick='javascript:open_abook();'>\");";
+ echo " // --></SCRIPT><NOSCRIPT>\n";
+ echo " <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
+ echo " </NOSCRIPT>\n";
+ } else {
+ echo " <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
+ }
+ echo "\n <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
+
+ do_hook("compose_button_row");
+
+ echo " </TD>\n";
+ echo " </TR>\n\n";
+ }
function showSentForm () {
echo "<BR><BR><BR><CENTER><B>Message Sent!</B><BR><BR>";
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);
checkInput(true);
showInputForm();
- sqimap_logout($imapConnection);
+ //sqimap_logout($imapConnection);
}
} else if ($html_addr_search_done) {
is_logged_in();
displayPageHeader($color, $mailbox);
while (list($lkey, $localname) = each($delete)) {
- array_splice ($attachments, $lkey, 1);
+ unset ($attachments[$localname]);
unlink ($attachment_dir.$localname);
unlink ($attachment_dir.$localname.".info");
}
projects / squirrelmail.git / blobdiff