X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=33bc51d03a9fec0c934cc20489cf8eec51acf062;hp=e7f9402522348b2363022a6f6852cfe4f24fefdf;hb=f95d9e7b53d67bbf15be0894cd25acd1c656f0d7;hpb=01aab860705725d4ba5b003fc01cb6bac92a8390 diff --git a/src/compose.php b/src/compose.php index e7f94025..33bc51d0 100644 --- a/src/compose.php +++ b/src/compose.php @@ -11,49 +11,45 @@ ** - Start new mail ** - Add an attachment ** - Send mail + ** + ** $Id$ **/ - session_start(); - - if (!isset($config_php)) - include("../config/config.php"); - if (!isset($strings_php)) - include("../functions/strings.php"); - if (!isset($page_header_php)) - include("../functions/page_header.php"); - if (!isset($imap_php)) - include("../functions/imap.php"); - if (!isset($date_php)) - include("../functions/date.php"); - if (!isset($mime_php)) - include("../functions/mime.php"); - if (!isset($smtp_php)) - include("../functions/smtp.php"); - if (!isset($display_messages_php)) - include("../functions/display_messages.php"); - if (!isset($auth_php)) - include ("../functions/auth.php"); - if (!isset($plugin_php)) - include ("../functions/plugin.php"); - + include('../src/validate.php'); + include("../functions/strings.php"); + include("../config/config.php"); + include("../functions/page_header.php"); + include("../functions/imap.php"); + include("../functions/date.php"); + include("../functions/mime.php"); + include("../functions/smtp.php"); + include("../functions/display_messages.php"); + include ("../functions/plugin.php"); include("../src/load_prefs.php"); + if (!isset($attachments)) + { + $attachments = array(); + session_register('attachments'); + } + + // 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, $editor_size; - $send_to = sqStripSlashes(decodeHeader($send_to)); - $send_to_cc = sqStripSlashes(decodeHeader($send_to_cc)); - $send_to_bcc = sqStripSlashes(decodeHeader($send_to_bcc)); + $send_to = decodeHeader($send_to); + $send_to_cc = decodeHeader($send_to_cc); + $send_to_bcc = decodeHeader($send_to_bcc); if ($forward_id) $id = $forward_id; - else if ($reply_id) + elseif ($reply_id) $id = $reply_id; - if ($id) { + if (isset($id)) { sqimap_mailbox_select($imapConnection, $mailbox); $message = sqimap_get_message($imapConnection, $id, $mailbox); $orig_header = $message->header; @@ -71,14 +67,19 @@ if ($message->header->type1 == "html") $body = strip_tags($body); - + sqUnWordWrap($body); $body_ary = explode("\n", $body); + $i = count($body_ary) - 1; + while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) { + unset($body_ary[$i]); + $i --; + } $body = ""; - for ($i=0; $i < count($body_ary); $i++) { + for ($i=0; isset($body_ary[$i]); $i++) { if (! $forward_id) { - if (preg_match('/^[\s>]+/', $body_ary[$i])) + if (ereg('^[\\s>]+', $body_ary[$i])) { $body_ary[$i] = '>' . $body_ary[$i]; } @@ -89,7 +90,7 @@ } sqWordWrap($body_ary[$i], $editor_size - 1); $body .= $body_ary[$i] . "\n"; - $body_ary[$i] = ''; + unset($body_ary[$i]); } if ($forward_id) { @@ -105,8 +106,7 @@ $bodyTop .= "\n"; $body = $bodyTop . $body; } - - sqimap_mailbox_close($imapConnection); + return; } @@ -143,16 +143,59 @@ } } // 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 (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['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, + $forward_id, $message->header->entity_id), + $message->header->encoding)); + fclose ($fp); + + $attachments[] = $newAttachment; + } + } 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, $from_htmladdr_search; + $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; - $subject = sqStripSlashes(decodeHeader($subject)); + $subject = decodeHeader($subject); $reply_subj = decodeHeader($reply_subj); $forward_subj = decodeHeader($forward_subj); - $body = sqStripSlashes($body); if ($use_javascript_addr_book) { echo "\n\n\n"; } - echo "\n