require_once('../functions/display_messages.php');
require_once('../functions/plugin.php');
+/* --------------------- Specific Functions ------------------------------ */
+
+
+
+/**
+ * Does the opposite of sqWordWrap()
+ */
+function sqUnWordWrap(&$body) {
+ $lines = explode("\n", $body);
+ $body = '';
+ $PreviousSpaces = '';
+ for ($i = 0; $i < count($lines); $i ++) {
+ ereg("^([\t >]*)([^\t >].*)?$", $lines[$i], $regs);
+ $CurrentSpaces = $regs[1];
+ if (isset($regs[2])) {
+ $CurrentRest = $regs[2];
+ }
+
+ if ($i == 0) {
+ $PreviousSpaces = $CurrentSpaces;
+ $body = $lines[$i];
+ } else if (($PreviousSpaces == $CurrentSpaces) /* Do the beginnings match */
+ && (strlen($lines[$i - 1]) > 65) /* Over 65 characters long */
+ && strlen($CurrentRest)) { /* and there's a line to continue with */
+ $body .= ' ' . $CurrentRest;
+ } else {
+ $body .= "\n" . $lines[$i];
+ $PreviousSpaces = $CurrentSpaces;
+ }
+ }
+ $body .= "\n";
+}
+
+/* ----------------------------------------------------------------------- */
+
if (!isset($attachments)) {
$attachments = array();
session_register('attachments');
if (! isset($MDN)) {
$MDN = 'False';
}
- if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $MDN)) {
+ if (! isset($mailprio)) {
+ $mailprio = '';
+ }
+ if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $mailprio, $session)) {
showInputForm($session);
exit();
} else {
/*
* 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.
+ * if the browser doesn't support "VIRTUAL" as the wrap type.
*/
$body = explode("\n", $body);
$newBody = '';
if (strlen($line) <= $editor_size + 1) {
$newBody .= $line . "\n";
} else {
- sqWordWrap($line, $editor_size) . "\n";
- $newBody .= $line;
+ sqWordWrap($line, $editor_size);
+ $newBody .= $line . "\n";
}
}
$body = $newBody;
function newMail () {
global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
$reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size,
- $draft_id, $use_signature, $composesession;
+ $draft_id, $use_signature, $composesession, $forward_cc;
$send_to = decodeHeader($send_to, false);
$send_to_cc = decodeHeader($send_to_cc, false);
$send_to_bcc = decodeHeader($send_to_bcc, false);
+ $send_to = str_replace('<', '<', str_replace('>', '>', str_replace('&', '&', str_replace('"', '"', $send_to))));
+ $send_to_cc = str_replace('<', '<', str_replace('>', '>', str_replace('&', '&', str_replace('"', '"', $send_to_cc))));
+ $send_to_bcc = str_replace('<', '<', str_replace('>', '>', str_replace('&', '&', str_replace('"', '"', $send_to_bcc))));
if ($forward_id) {
$id = $forward_id;
}
sqUnWordWrap($body);
+
+ /* this corrects some wrapping/quoting problems on replies */
+ if ($reply_id) {
+ $rewrap_body = explode("\n", $body);
+ for ($i=0;$i<count($rewrap_body);$i++) {
+ sqWordWrap($rewrap_body[$i], ($editor_size - 2));
+ if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
+ $gt = $matches[1];
+ $rewrap_body[$i] = str_replace("\n", "\n$gt ", $rewrap_body[$i]);
+ }
+ $rewrap_body[$i] .= "\n";
+ }
+ $body = implode("", $rewrap_body);
+ }
+
$body_ary = explode("\n", $body);
$i = count($body_ary) - 1;
while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) {
$body = '';
for ($i=0; isset($body_ary[$i]); $i++) {
if ($reply_id) {
- if (ereg('^[ >]+', $body_ary[$i])) {
+ if (preg_match("/^(>){1,}/", $body_ary[$i])) {
$body_ary[$i] = '>' . $body_ary[$i];
} else {
$body_ary[$i] = '> ' . $body_ary[$i];
}
}
- if (!$draft_id) {
- sqWordWrap($body_ary[$i], $editor_size - 1);
+ if ($draft_id) {
+ sqWordWrap($body_ary[$i], $editor_size );
}
$body .= $body_ary[$i] . "\n";
unset($body_ary[$i]);
$bodyTop .= ' ' . $orig_header->to[$x] . "\n";
}
}
+ if (isset($forward_cc) && $forward_cc) {
+ $bodyTop .= _("Cc") . ': ' . $orig_header->cc[0] . "\n";
+ if (count($orig_header->cc) > 1) {
+ for ($x = 1; $x < count($orig_header->cc); $x++) {
+ $bodyTop .= ' ' . $orig_header->cc[$x] . "\n";
+ }
+ }
+ }
$bodyTop .= "\n";
$body = $bodyTop . $body;
}
$from_htmladdr_search, $location_of_buttons, $attachment_dir,
$username, $data_dir, $identity, $draft_id, $delete_draft,
$mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win,
- $saved_draft, $mail_sent;
+ $saved_draft, $mail_sent, $sig_first, $edit_as_new;
$subject = decodeHeader($subject, false);
$reply_subj = decodeHeader($reply_subj, false);
echo ">\n";
- if (isset($draft_id)) {
+ if (isset($draft_id) && !$edit_as_new) {
echo '<input type="hidden" name="delete_draft" value="' . $draft_id . "\">\n";
}
if (isset($delete_draft)) {
}
echo '<TABLE WIDTH="100%" ALIGN=center CELLSPACING=0 BORDER=0>' . "\n";
if ($compose_new_win == '1') {
+ echo '<TABLE ALIGN=CENTER BGCOLOR="'.$color[0].'" WIDTH="100%" BORDER=0>'."\n";
echo ' <TR><TD></TD><TD ALIGN="RIGHT"><INPUT TYPE="BUTTON" NAME="Close" onClick="return self.close()" VALUE='._("Close").'></TD></TR>'."\n";
}
if ($location_of_buttons == 'top') {
if ($location_of_buttons == 'between') {
showComposeButtonRow();
}
-
- echo ' <TR>' . "\n" .
- ' <TD BGCOLOR="' . $color[4] . '" COLSPAN=2>' . "\n" .
- ' <TEXTAREA NAME=body ROWS=20 COLS="' .
- $editor_size . '" WRAP=HARD>' . htmlspecialchars($body);
+ if ($compose_new_win == '1') {
+ echo ' <TR>' . "\n" .
+ ' <TD BGCOLOR="' . $color[0] . '" COLSPAN=2 ALIGN=CENTER>' . "\n" .
+ ' <TEXTAREA NAME=body ROWS=20 COLS="' .
+ $editor_size . '" WRAP="VIRTUAL">';
+ }
+ else {
+ echo ' <TR>' . "\n" .
+ ' <TD BGCOLOR="' . $color[4] . '" COLSPAN=2>' . "\n" .
+ ' <TEXTAREA NAME=body ROWS=20 COLS="' .
+ $editor_size . '" WRAP="VIRTUAL">';
+ }
if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
- echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);
+ if ($sig_first == '1') {
+ echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);
+ echo "\n\n".htmlspecialchars($body);
+ }
+ else {
+ echo "\n\n".htmlspecialchars($body);
+ echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature);
+ }
+ }
+ else {
+ echo htmlspecialchars($body);
}
echo '</TEXTAREA><BR>' . "\n" .
' </TD>' . "\n" .
' ' .
'</td><td align=left bgcolor="' . $color[0] . '">';
foreach ($attachments as $key => $info) {
- if ($info['session'] == $session) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- echo '<input type="checkbox" name="delete[]" value="' . $key . "\">\n" .
- $info['remotefilename'] . ' - ' . $info['type'] . ' (' .
- show_readable_size(filesize($attached_file)) . ")<br>\n";
- }
+ if ($info['session'] == $session) {
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ echo '<input type="checkbox" name="delete[]" value="' . $key . "\">\n" .
+ $info['remotefilename'] . ' - ' . $info['type'] . ' (' .
+ show_readable_size( filesize( $attached_file ) ) . ")<br>\n";
+ }
}
echo '<input type="submit" name="do_delete" value="' .
'</td></tr>';
}
/* End of attachment code */
-
+ if ($compose_new_win == '1') {
+ echo '</TABLE>'."\n";
+ }
echo '</TABLE>' . "\n";
if ($reply_id) {
echo '<input type=hidden name=reply_id value=' . $reply_id . ">\n";
function showComposeButtonRow() {
global $use_javascript_addr_book, $save_as_draft,
$default_use_priority, $mailprio, $default_use_mdn,
+ $request_mdn, $request_dr,
$data_dir, $username;
echo " <TR><TD>\n</TD><TD>\n";
if ($default_use_mdn) {
if ($mdn_user_support) {
echo "\n\t". _("Receipt") .': '.
- '<input type="checkbox" name="request_mdn" value=1>'. _("On read").
- ' <input type="checkbox" name="request_dr" value=1>'. _("On Delivery");
+ '<input type="checkbox" name="request_mdn" value=1'.
+ ($request_mdn=='1'?' checked':'') .'>'. _("On read").
+ ' <input type="checkbox" name="request_dr" value=1'.
+ ($request_dr=='1'?' checked':'') .'>'. _("On Delivery");
}
}
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
$rem_attachments = array();
- foreach ($attachments as $info) {
- if ($info['session'] == $session) {
- $attached_file = "$hashed_attachment_dir/$info[localfilename]";
- if (file_exists($attached_file)) {
- unlink($attached_file);
- }
- } else {
- $rem_attachments[] = $info;
- }
+ if (is_array($attachments)) {
+ foreach ($attachments as $info) {
+ if ($info['session'] == $session) {
+ $attached_file = "$hashed_attachment_dir/$info[localfilename]";
+ if (file_exists($attached_file)) {
+ unlink($attached_file);
+ }
+ }
+ else {
+ $rem_attachments[] = $info;
+ }
+ }
}
$attachments = $rem_attachments;
}
$end = '">';
break;
case 'user-defined':
- $start = $reply_citation_start;
+ $start = $reply_citation_start . ' ';
$end = $reply_citation_end;
break;
default:
projects / squirrelmail.git / blobdiff