session_register('composesession');
}
-if (!isset($session)) {
+if (!isset($session) || (isset($newmessage) && $newmessage)) {
$session = "$composesession" +1;
$composesession = $session;
-}
+}
if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) {
$mailbox = 'INBOX';
exit();
}
if ($compose_new_win == '1') {
- Header("Location: compose.php?mail_sent=yes&session=$composesession");
+ Header("Location: compose.php?mail_sent=yes");
}
else {
Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort".
getAttachments(0, $session);
}
+ if (isset($passed_id) && $passed_id && isset($ent_num) && $ent_num) {
+ getAttachments(0, $session);
+ }
+
newMail($session);
showInputForm($session);
sqimap_logout($imapConnection);
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, $forward_cc;
+ $draft_id, $use_signature, $composesession, $forward_cc, $passed_id;
$send_to = decodeHeader($send_to, false);
$send_to_cc = decodeHeader($send_to_cc, false);
$id = $forward_id;
} elseif ($reply_id) {
$id = $reply_id;
+ } elseif ($passed_id) {
+ $id = $passed_id;
}
+
if ($draft_id){
$id = $draft_id;
$use_signature = FALSE;
sqimap_mailbox_select($imapConnection, $mailbox);
$message = sqimap_get_message($imapConnection, $id, $mailbox);
$orig_header = $message->header;
+ $body = '';
if ($ent_num) {
- $message = getEntity($message, $ent_num);
- }
- 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 {
- $body = decodeBody(
- mime_fetch_body($imapConnection, $id, 1),
- $message->header->encoding);
+ $ent_ar = preg_split('/_/',$ent_num);
+ foreach($ent_ar as $ent_num) {
+ $message = getEntity($message, $ent_num);
+ if ($message->header->type0 == 'text' ||
+ $message->header->type1 == 'message') {
+ $bodypart = decodeBody(
+ mime_fetch_body($imapConnection, $id, $ent_num),
+ $message->header->encoding);
+ if ($message->header->type1 == 'html') {
+ $bodypart = strip_tags($bodypart);
+ }
+ $body .= $bodypart;
+ }
+ }
+ } else if ($message->header->type0 == 'text' ||
+ $message->header->type1 == 'message') {
+ $body .= decodeBody(
+ mime_fetch_body($imapConnection, $id, 1),
+ $message->header->encoding);
+ if ($message->header->type1 == 'html') {
+ $body = strip_tags($body);
+ }
+
+ }
+
+ 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";
}
- } else {
- $body = '';
- }
-
- if ($message->header->type1 == 'html') {
- $body = strip_tags($body);
+ $body = implode("", $rewrap_body);
}
- //sqUnWordWrap($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]);
function getAttachments($message, $session) {
global $mailbox, $attachments, $attachment_dir, $imapConnection,
- $ent_num, $forward_id, $draft_id, $username;
+ $ent_num, $forward_id, $draft_id, $username, $passed_id;
if (isset($draft_id)) {
$id = $draft_id;
- } else {
+ } else if (isset($forward_id)) {
$id = $forward_id;
+ } else {
+ $id = $passed_id;
}
if (!$message) {
$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, $sig_first;
+ $saved_draft, $mail_sent, $sig_first, $edit_as_new;
+ $file_uploads = ini_get('file_uploads');
$subject = decodeHeader($subject, false);
$reply_subj = decodeHeader($reply_subj, false);
$forward_subj = decodeHeader($forward_subj, false);
'// --></SCRIPT>' . "\n\n";
}
- echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ' .
- 'ENCTYPE="multipart/form-data"';
+ echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ';
+ if ($file_uploads) {
+ echo 'ENCTYPE="multipart/form-data"';
+ }
do_hook("compose_form");
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)) {
}
/* This code is for attachments */
- echo ' <TR>' . "\n" .
- ' <TD VALIGN=MIDDLE ALIGN=RIGHT>' . "\n" .
- _("Attach:") .
- ' </TD>' . "\n" .
- ' <TD VALIGN=MIDDLE ALIGN=LEFT>' . "\n" .
- ' <INPUT NAME="attachfile" SIZE=48 TYPE="file">' . "\n" .
- ' <input type="submit" name="attach"' .
- ' value="' . _("Add") .'">' . "\n" .
- ' </TD>' . "\n" .
- ' </TR>' . "\n";
+ if ($file_uploads) {
+ echo ' <TR>' . "\n" .
+ ' <TD VALIGN=MIDDLE ALIGN=RIGHT>' . "\n" .
+ _("Attach:") .
+ ' </TD>' . "\n" .
+ ' <TD VALIGN=MIDDLE ALIGN=LEFT>' . "\n" .
+ ' <INPUT NAME="attachfile" SIZE=48 TYPE="file">' . "\n" .
+ ' <input type="submit" name="attach"' .
+ ' value="' . _("Add") .'">' . "\n" .
+ ' </TD>' . "\n" .
+ ' </TR>' . "\n";
- if (count($attachments)) {
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
- echo '<tr><td bgcolor="' . $color[0] . '" align=right>' . "\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 (count($attachments)) {
+ $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+ echo '<tr><td bgcolor="' . $color[0] . '" align=right>' . "\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";
+ }
+ }
- echo '<input type="submit" name="do_delete" value="' .
- _("Delete selected attachments") . "\">\n" .
- '</td></tr>';
+ echo '<input type="submit" name="do_delete" value="' .
+ _("Delete selected attachments") . "\">\n" .
+ '</td></tr>';
+ }
+ /* End of attachment code */
}
- /* End of attachment code */
if ($compose_new_win == '1') {
echo '</TABLE>'."\n";
}
}
}
- echo " <TR><td>\n </td><td>\n";
+ echo " </td></tr>\n <TR><td>\n </td><td>\n";
echo "\n <INPUT TYPE=SUBMIT NAME=\"sigappend\" VALUE=\"". _("Signature") . "\">\n";
if ($use_javascript_addr_book) {
echo " <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"".