X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fcompose.php;h=c1eb4787d2ef36bd5767aa9bec7dbb755fe09af4;hp=0922f1dc6f331e1c808db635806f281e0a39f547;hb=59edcad6bf7931f7aaf1ad695bb723e45840925e;hpb=55b321f24262c35a4aee5f8bc769b1a34baf9141 diff --git a/src/compose.php b/src/compose.php index 0922f1dc..c1eb4787 100644 --- a/src/compose.php +++ b/src/compose.php @@ -21,9 +21,11 @@ require_once('../src/validate.php'); require_once('../functions/imap.php'); require_once('../functions/date.php'); require_once('../functions/mime.php'); -require_once('../functions/smtp.php'); +//require_once('../functions/smtp.php'); require_once('../functions/plugin.php'); require_once('../functions/display_messages.php'); +require_once('../class/deliver/Deliver.class.php'); + /* --------------------- Specific Functions ------------------------------ */ function replyAllString($header) { @@ -50,7 +52,7 @@ function replyAllString($header) { $cur_email_address = getPref($data_dir, $username, 'email_address' . $i); $cur_email_address = strtolower($cur_email_address); - $excl_ar[$cur_email_address] = ''; + $excl_ar[$cur_email_address] = ''; } } } @@ -66,9 +68,9 @@ function replyAllString($header) { $url_replytoallcc = ''; foreach( $url_replytoall_ar as $email => $personal) { if ($personal) { - $url_replytoallcc .= ", \"$personal\" <$email>"; + $url_replytoallcc .= ", \"$personal\" <$email>"; } else { - $url_replytoallcc .= ', '. $email; + $url_replytoallcc .= ', '. $email; } } $url_replytoallcc = substr($url_replytoallcc,2); @@ -76,28 +78,32 @@ function replyAllString($header) { } function getforwardHeader($orig_header) { - $display = array( - _("Subject") => strlen(_("Subject")), - _("From") => strlen(_("From")), - _("Date") => strlen(_("Date")), - _("To") => strlen(_("To")), - _("Cc") => strlen(_("Cc")) - ); + global $editor_size; + + $display = array( _("Subject") => strlen(_("Subject")), + _("From") => strlen(_("From")), + _("Date") => strlen(_("Date")), + _("To") => strlen(_("To")), + _("Cc") => strlen(_("Cc")) ); $maxsize = max($display); $indent = str_pad('',$maxsize+2); foreach($display as $key => $val) { $display[$key] = $key .': '. str_pad('', $maxsize - $val); } - $bodyTop = str_pad(' '._("Original Message").' ',78, '-',STR_PAD_BOTH); - $bodyTop .= "\n". $display[_("Subject")] . $orig_header->subject . "\n" . - $display[_("From")] . $orig_header->getAddr_s('from',"\n$indent") . "\n" . - $display[_("Date")] . getLongDateString( $orig_header->date ). "\n" . - $display[_("To")] . $orig_header->getAddr_s('to',"\n$indent") ."\n"; + $bodyTop = str_pad(' '._("Original Message").' ',$editor_size -2,'-',STR_PAD_BOTH) . + "\n". $display[_("Subject")] . + decodeHeader($orig_header->subject) . "\n" . + $display[_("From")] . + decodeHeader($orig_header->getAddr_s('from',"\n$indent")) . "\n" . + $display[_("Date")] . + getLongDateString( $orig_header->date ). "\n" . + $display[_("To")] . + decodeHeader($orig_header->getAddr_s('to',"\n$indent")) ."\n"; if ($orig_header->cc != array() && $orig_header->cc !='') { - $bodyTop .= $display[_("Cc")] . $orig_header->getAddr_s('cc',"\n$indent") . "\n"; + $bodyTop .= $display[_("Cc")] . decodeHeader($orig_header->getAddr_s('cc',"\n$indent")) . "\n"; } - $bodyTop .= str_pad('',78, '-'); - $bodyTop .= "\n"; + $bodyTop .= str_pad('', $editor_size -2 , '-') . + "\n"; return $bodyTop; } /* ----------------------------------------------------------------------- */ @@ -145,35 +151,46 @@ if (session_is_registered('session_expired_post')) { if (!isset($attachments)) { $attachments = array(); - session_register('attachments'); + sqsession_register(array(), 'attachments'); } if (!isset($composesession)) { $composesession = 0; - session_register('composesession'); + sqsession_register(0,'composesession'); } if (!isset($session) || (isset($newmessage) && $newmessage)) { $session = "$composesession" +1; - $composesession = $session; + $composesession = $session; + sqsession_register($composesession,'composesession'); } +if (!isset($compose_messages)) { + $compose_messages = array(); +} +if (!array_key_exists($session, $compose_messages)) { + $composeMessage = new message(); + $rfc822_header = new Rfc822Header(); + $composeMessage->rfc822_header = $rfc822_header; + $composeMessage->reply_rfc822_header = ''; + $compose_messages[$session] = $composeMessage; +} +sqsession_register($compose_messages,'compose_messages'); + if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None')) { $mailbox = 'INBOX'; } if (isset($draft)) { - include_once ('../src/draft_actions.php'); - if (! isset($passed_id)) { - $passed_id = 0; - } - if (! isset($MDN)) { - $MDN = 'False'; - } - if (! isset($mailprio)) { - $mailprio = ''; - } - if (!saveMessageAsDraft($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $passed_id, $mailprio, $session)) { + /* + * Set $default_charset to correspond with the user's selection + * of language interface. + */ + set_my_charset(); + $composeMessage=$compose_messages[$session]; + $Result = sendMessage($composeMessage, true); + + if (! sendMessage($composeMessage, true)) { showInputForm($session); exit(); } else { @@ -187,12 +204,12 @@ if (isset($draft)) { else { if ($compose_new_win == '1') { Header("Location: compose.php?saved_draft=yes&session=$composesession"); - exit(); + exit(); } else { - Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort". - "&startMessage=1¬e=".urlencode($draft_message)); - exit(); + Header("Location: right_main.php?mailbox=$draft_folder&sort=$sort". + "&startMessage=1¬e=".urlencode($draft_message)); + exit(); } } } @@ -214,7 +231,6 @@ if (isset($send)) { * of language interface. */ set_my_charset(); - /* * This is to change all newlines to \n * We'll change them to \r\n later (in the sendMessage function) @@ -241,17 +257,9 @@ if (isset($send)) { } } $body = $newBody; - do_hook('compose_send'); - - $MDN = False; // we are not sending a mdn response - if (! isset($mailprio)) { - $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc, - $subject, $body, $passed_id, $MDN, '', $session); - } else { - $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc, - $subject, $body, $passed_id, $MDN, $mailprio, $session); - } + $composeMessage=$compose_messages[$session]; + $Result = sendMessage($composeMessage); if (! $Result) { showInputForm($session); exit(); @@ -368,17 +376,22 @@ elseif (isset($sigappend)) { displayPageHeader($color, $mailbox); } - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (isset($delete) && is_array($delete)) { + $composeMessage = $compose_messages[$session]; foreach($delete as $index) { - $attached_file = $hashed_attachment_dir . '/' - . $attachments[$index]['localfilename']; - unlink ($attached_file); - unset ($attachments[$index]); + $attached_file = $composeMessage->entities[$index]->att_local_name; + unlink ($attached_file); + unset ($composeMessage->entities[$index]); } - setPref($data_dir, $username, 'attachments', serialize($attachments)); + $new_entities = array(); + foreach ($composeMessage->entities as $entity) { + $new_entities[] = $entity; + } + $composeMessage->entities = $new_entities; + $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages, 'compose_messages'); +// setPref($data_dir, $username, 'attachments', serialize($attachments)); } - showInputForm($session); } else { /* @@ -394,10 +407,18 @@ elseif (isset($sigappend)) { $newmail = true; - if (!isset($passed_ent_id)) $passed_ent_id = ''; - if (!isset($passed_id)) $passed_id = ''; - if (!isset($mailbox)) $mailbox = ''; - if (!isset($action)) $action = ''; + if (!isset($passed_ent_id)) { + $passed_ent_id = ''; + } + if (!isset($passed_id)) { + $passed_id = ''; + } + if (!isset($mailbox)) { + $mailbox = ''; + } + if (!isset($action)) { + $action = ''; + } $values = newMail($mailbox,$passed_id,$passed_ent_id, $action, $session); @@ -421,67 +442,70 @@ exit(); /* This function is used when not sending or adding attachments */ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $session='') { - global $editor_size, $default_use_priority, + global $editor_size, $default_use_priority, $body, $use_signature, $composesession, $data_dir, $username, - $username, $key, $imapServerAddress, $imapPort; + $username, $key, $imapServerAddress, $imapPort, $compose_messages, + $composeMessage; - $send_to = $send_to_cc = $send_to_bcc = $subject = $body = $identity = ''; + $send_to = $send_to_cc = $send_to_bcc = $subject = $identity = ''; $mailprio = 3; if ($passed_id) { $imapConnection = sqimap_login($username, $key, $imapServerAddress, - $imapPort, 0); - + $imapPort, 0); + sqimap_mailbox_select($imapConnection, $mailbox); $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); - $body = ''; - if ($passed_ent_id) { - /* redefine the messsage in case of message/rfc822 */ - $message = $message->getEntity($passed_ent_id); - /* message is an entity which contains the envelope and type0=message - * and type1=rfc822. The actual entities are childs from - * $message->entities[0]. That's where the encoding and is located - */ - - $entities = $message->entities[0]->findDisplayEntity - (array(), $alt_order = array('text/plain')); - if (!count($entities)) { - $entities = $message->entities[0]->findDisplayEntity - (array(), $alt_order = array('text/plain','html/plain')); - } - $orig_header = $message->rfc822_header; /* here is the envelope located */ - /* redefine the message for picking up the attachments */ - $message = $message->entities[0]; - - } else { - $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain')); - if (!count($entities)) { - $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain','html/plain')); - } - $orig_header = $message->rfc822_header; - } - $encoding = $message->header->encoding; - $type0 = $message->type0; - $type1 = $message->type1; + + $body = ''; + if ($passed_ent_id) { + /* redefine the messsage in case of message/rfc822 */ + $message = $message->getEntity($passed_ent_id); + /* message is an entity which contains the envelope and type0=message + * and type1=rfc822. The actual entities are childs from + * $message->entities[0]. That's where the encoding and is located + */ + + $entities = $message->entities[0]->findDisplayEntity + (array(), $alt_order = array('text/plain')); + if (!count($entities)) { + $entities = $message->entities[0]->findDisplayEntity + (array(), $alt_order = array('text/plain','html/plain')); + } + $orig_header = $message->rfc822_header; /* here is the envelope located */ + /* redefine the message for picking up the attachments */ + $message = $message->entities[0]; + } else { + $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain')); + if (!count($entities)) { + $entities = $message->findDisplayEntity (array(), $alt_order = array('text/plain','html/plain')); + } + $orig_header = $message->rfc822_header; + } + + $encoding = $message->header->encoding; + $type0 = $message->type0; + $type1 = $message->type1; foreach ($entities as $ent) { - $bodypart = decodeBody( - mime_fetch_body($imapConnection, $passed_id, $ent), - $encoding); - if ($type1 == 'html') { - $bodypart = strip_tags($bodypart); - } - $body .= $bodypart; - } - if ($default_use_priority) { - $mailprio = substr($orig_header->priority,0,1); - if (!$mailprio) { - $mailprio = 3; - } - } else { - $mailprio = ''; - } - ClearAttachments($session); + $unencoded_bodypart = mime_fetch_body($imapConnection, $passed_id, $ent); + $body_part_entity = $message->getEntity($ent); + $bodypart = decodeBody($unencoded_bodypart, + $body_part_entity->header->encoding); + if ($type1 == 'html') { + $bodypart = strip_tags($bodypart); + } + $body .= $bodypart; + } + if ($default_use_priority) { + $mailprio = substr($orig_header->priority,0,1); + if (!$mailprio) { + $mailprio = 3; + } + } else { + $mailprio = ''; + } + //ClearAttachments($session); $identity = ''; $idents = getPref($data_dir, $username, 'identities'); @@ -490,163 +514,205 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $orig_from = $from_o->getAddress(); } else { $orig_from = ''; - } + } if (!empty($idents) && $idents > 1) { - for ($i = 1; $i < $idents; $i++) { - $enc_from_name = '"'. - getPref($data_dir, - $username, - 'full_name' . $i) . - '" <' . getPref($data_dir, $username, - 'email_address' . $i) . '>'; - if ($enc_from_name == $orig_from) { - $identity = $i; - break; - } - } + for ($i = 1; $i < $idents; $i++) { + $enc_from_name = '"'. + getPref($data_dir, + $username, + 'full_name' . $i) . + '" <' . getPref($data_dir, $username, + 'email_address' . $i) . '>'; + if ($enc_from_name == $orig_from) { + $identity = $i; + break; + } + } } - - switch ($action) { - case ('draft'): - $use_signature = FALSE; - $send_to = $orig_header->getAddr_s('to'); - $send_to_cc = $orig_header->getAddr_s('cc'); - $send_to_bcc = $orig_header->getAddr_s('bcc'); - $subject = $orig_header->subject; - - $body_ary = explode("\n", $body); - $cnt = count($body_ary) ; - $body = ''; - for ($i=0; $i < $cnt; $i++) { - if (!ereg("^[>\\s]*$", $body_ary[$i])) { - sqWordWrap($body_ary[$i], $editor_size ); - $body .= $body_ary[$i] . "\n"; - } - unset($body_ary[$i]); - } - sqUnWordWrap($body); - getAttachments($message, $session, $passed_id, $entities, $imapConnection); - break; + + switch ($action) { + case ('draft'): + $use_signature = FALSE; + $send_to = $orig_header->getAddr_s('to'); + $send_to_cc = $orig_header->getAddr_s('cc'); + $send_to_bcc = $orig_header->getAddr_s('bcc'); + $subject = decodeHeader($orig_header->subject); + + $body_ary = explode("\n", $body); + $cnt = count($body_ary) ; + $body = ''; + for ($i=0; $i < $cnt; $i++) { + if (!ereg("^[>\\s]*$", $body_ary[$i]) || !$body_ary[$i]) { + sqWordWrap($body_ary[$i], $editor_size ); + $body .= $body_ary[$i] . "\n"; + } + unset($body_ary[$i]); + } + sqUnWordWrap($body); + $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + break; case ('edit_as_new'): - $send_to = $orig_header->getAddr_s('to'); - $send_to_cc = $orig_header->getAddr_s('cc'); - $send_to_bcc = $orig_header->getAddr_s('bcc'); - $subject = $orig_header->subject; - $mailprio = $orig_header->priority; - $orig_from = ''; - getAttachments($message, $session, $passed_id, $entities, $imapConnection); - sqUnWordWrap($body); - break; - case ('forward'): - $send_to = ''; - $subject = $orig_header->subject; - if ((substr(strtolower($subject), 0, 4) != 'fwd:') && - (substr(strtolower($subject), 0, 5) != '[fwd:') && - (substr(strtolower($subject), 0, 6) != '[ fwd:')) { - $subject = '[Fwd: ' . $subject . ']'; - } - $body = getforwardHeader($orig_header) . $body; - sqUnWordWrap($body); - getAttachments($message, $session, $passed_id, $entities, $imapConnection); - break; + $send_to = $orig_header->getAddr_s('to'); + $send_to_cc = $orig_header->getAddr_s('cc'); + $send_to_bcc = $orig_header->getAddr_s('bcc'); + $subject = decodeHeader($orig_header->subject); + $mailprio = $orig_header->priority; + $orig_from = ''; + $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + sqUnWordWrap($body); + break; + case ('forward'): + $send_to = ''; + $subject = decodeHeader($orig_header->subject); + if ((substr(strtolower($subject), 0, 4) != 'fwd:') && + (substr(strtolower($subject), 0, 5) != '[fwd:') && + (substr(strtolower($subject), 0, 6) != '[ fwd:')) { + $subject = '[Fwd: ' . $subject . ']'; + } + $body = getforwardHeader($orig_header) . $body; + sqUnWordWrap($body); + $composeMessage = getAttachments($message, $composeMessage, $passed_id, $entities, $imapConnection); + break; + case ('forward_as_attachment'): + $composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, $passed_ent_id, $imapConnection); + $body = ''; + break; case ('reply_all'): - $send_to_cc = replyAllString($orig_header); - case ('reply'): - $send_to = $orig_header->reply_to; - if (is_object($send_to)) { - $send_to = $send_to->getAddr_s('reply_to'); - } else { - $send_to = $orig_header->getAddr_s('from'); - } - $subject = $orig_header->subject; - $subject = str_replace('"', "'", $subject); - $subject = trim($subject); - if (substr(strtolower($subject), 0, 3) != 're:') { - $subject = 'Re: ' . $subject; - } - /* this corrects some wrapping/quoting problems on replies */ - $rewrap_body = explode("\n", $body); - $body = getReplyCitation($orig_header->from->personal); - $cnt = count($rewrap_body); - for ($i=0;$i<$cnt;$i++) { - sqWordWrap($rewrap_body[$i], ($editor_size - 2)); - if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) { - $gt = $matches[1]; - $body .= '>' . str_replace("\n", "\n$gt ", $rewrap_body[$i]) ."\n"; - } else { - $body .= '> ' . $rewrap_body[$i] . "\n"; - } - unset($rewrap_body[$i]); - } - break; - default: - break; + $send_to_cc = replyAllString($orig_header); + case ('reply'): + $send_to = $orig_header->reply_to; + if (is_object($send_to)) { + $send_to = $send_to->getAddr_s('reply_to'); + } else { + $send_to = $orig_header->getAddr_s('from'); + } + $subject = decodeHeader($orig_header->subject); + $subject = str_replace('"', "'", $subject); + $subject = trim($subject); + if (substr(strtolower($subject), 0, 3) != 're:') { + $subject = 'Re: ' . $subject; + } + /* this corrects some wrapping/quoting problems on replies */ + $rewrap_body = explode("\n", $body); + + $body = getReplyCitation($orig_header->from->personal); + $cnt = count($rewrap_body); + for ($i=0;$i<$cnt;$i++) { + // sqWordWrap($rewrap_body[$i], ($editor_size - 2)); + if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) { + $gt = $matches[1]; + $body .= '>' . str_replace("\n", "\n$gt ", $rewrap_body[$i]) ."\n"; + } else { + $body .= '> ' . $rewrap_body[$i] . "\n"; + } + unset($rewrap_body[$i]); + } + $composeMessage->reply_rfc822_header = $orig_header; + break; + default: + break; } - sqimap_logout($imapConnection); - } - $ret = array( - 'send_to' => $send_to, - 'send_to_cc' => $send_to_cc, - 'send_to_bcc' => $send_to_bcc, - 'subject' => $subject, - 'mailprio' => $mailprio, - 'body' => $body, - 'identity' => $identity - ); - + $compose_messages[$session] = $composeMessage; + sqsession_register($compose_messages, 'compose_messages'); + + sqimap_logout($imapConnection); + } + $ret = array( 'send_to' => $send_to, + 'send_to_cc' => $send_to_cc, + 'send_to_bcc' => $send_to_bcc, + 'subject' => $subject, + 'mailprio' => $mailprio, + 'body' => $body, + 'identity' => $identity ); + return ($ret); } /* function newMail() */ - -function getAttachments($message, $session, $passed_id, $entities, $imapConnection) { - global $attachments, $attachment_dir, $username, $data_dir; - +function getAttachments($message, &$composeMessage, $passed_id, $entities, $imapConnection) { + global $attachment_dir, $username, $data_dir, $squirrelmail_language; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); if (!count($message->entities) || ($message->type0 == 'message' && $message->type1 == 'rfc822')) { if ( !in_array($message->entity_id, $entities) && $message->entity_id) { - if ($message->type0 == 'message' && $message->type1 == 'rfc822') { - $filename = decodeHeader($message->rfc822_header->subject.'.eml'); - if ($filename == "") { - $filename = "untitled-".$message->entity_id.'.eml'; - } - } else { - $filename = decodeHeader($message->header->getParameter('filename')); - if ($filename == "") { - $filename = "untitled-".$message->entity_id; - } - } - $localfilename = GenerateRandomString(32, '', 7); - $full_localfilename = "$hashed_attachment_dir/$localfilename"; - while (file_exists($full_localfilename)) { - $localfilename = GenerateRandomString(32, '', 7); - $full_localfilename = "$hashed_attachment_dir/$localfilename"; - } - - $newAttachment = array(); - $newAttachment['localfilename'] = $localfilename; - $newAttachment['remotefilename'] = $filename; - $newAttachment['type'] = strtolower($message->type0 . - '/' . $message->type1); - $newAttachment['id'] = strtolower($message->header->id); - $newAttachment['session'] = $session; - - /* Write Attachment to file */ - $fp = fopen ("$hashed_attachment_dir/$localfilename", 'w'); - fputs($fp, decodeBody(mime_fetch_body($imapConnection, - $passed_id, $message->entity_id), - $message->header->encoding)); - fclose ($fp); - - $attachments[] = $newAttachment; - setPref($data_dir, $username, 'attachments', $attachments); + switch ($message->type0) { + case 'message': + if ($message->type1 == 'rfc822') { + $filename = decodeHeader($message->rfc822_header->subject.'.eml'); + if ($filename == "") { + $filename = "untitled-".$message->entity_id.'.eml'; + } + } else { + $filename = decodeHeader($message->getFilename()); + } + break; + default: + $filename = decodeHeader($message->getFilename()); + break; + } + if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + $filename = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $filename); + } + + $localfilename = GenerateRandomString(32, '', 7); + $full_localfilename = "$hashed_attachment_dir/$localfilename"; + while (file_exists($full_localfilename)) { + $localfilename = GenerateRandomString(32, '', 7); + $full_localfilename = "$hashed_attachment_dir/$localfilename"; + } + $message->att_local_name = $full_localfilename; + if (!$message->mime_header) { /* temporary hack */ + $message->mime_header = $message->header; + } + + $composeMessage->addEntity($message); + + /* Write Attachment to file */ + $fp = fopen ("$hashed_attachment_dir/$localfilename", 'wb'); + fputs($fp, decodeBody(mime_fetch_body($imapConnection, + $passed_id, $message->entity_id), + $message->header->encoding)); + fclose ($fp); } } else { - for ($i = 0; $i < count($message->entities); $i++) { - getAttachments($message->entities[$i], $session, $passed_id, $entities, $imapConnection); + for ($i=0, $entCount=count($message->entities); $i<$entCount;$i++) { + $composeMessage=getAttachments($message->entities[$i], $composeMessage, $passed_id, $entities, $imapConnection); } } - return; +// setPref($data_dir, $username, 'attachments', serialize($attachments)); + return $composeMessage; +} + +function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, + $passed_ent_id='', $imapConnection) { + global $attachments, $attachment_dir, $username, $data_dir, $uid_support; + $hashed_attachment_dir = getHashedDir($username, $attachment_dir); + if (!$passed_ent_id) { + $body_a = sqimap_run_command($imapConnection, + 'FETCH '.$passed_id.' RFC822', + TRUE, $response, $readmessage, + $uid_support); + } else { + $body_a = sqimap_run_command($imapConnection, + 'FETCH '.$passed_id.' BODY['.$passed_ent_id.']', + TRUE, $response, $readmessage, $uid_support); + $message = $message->parent; + } + if ($response = 'OK') { + $subject = encodeHeader($message->rfc822_header->subject); + array_shift($body_a); + $body = implode('', $body_a) . "\r\n"; + + $localfilename = GenerateRandomString(32, 'FILE', 7); + $full_localfilename = "$hashed_attachment_dir/$localfilename"; + + $fp = fopen( $full_localfilename, 'w'); + fwrite ($fp, $body); + fclose($fp); + $composeMessage->initAttachment('message/rfc822',$subject.'.eml', + $full_localfilename); + } + return $composeMessage; } function showInputForm ($session, $values=false) { @@ -658,7 +724,9 @@ function showInputForm ($session, $values=false) { $username, $data_dir, $identity, $draft_id, $delete_draft, $mailprio, $default_use_mdn, $mdn_user_support, $compose_new_win, $saved_draft, $mail_sent, $sig_first, $edit_as_new, $action, - $username; + $username, $compose_messages; + + $composeMessage = $compose_messages[$session]; $subject = decodeHeader($subject, false); if ($values) { @@ -698,7 +766,10 @@ function showInputForm ($session, $values=false) { if (isset($session)) { echo '\n"; } - + + if (isset($passed_id)) { + echo '\n"; + } if ($saved_draft == 'yes') { echo '
'. _("Draft Saved").'
'; @@ -706,10 +777,10 @@ function showInputForm ($session, $values=false) { if ($mail_sent == 'yes') { echo '
'. _("Your Message has been sent").'
'; } - echo '' . "\n"; + echo '
' . "\n"; if ($compose_new_win == '1') { - echo '
'."\n"; - echo ' '."\n"; + echo '
'."\n" . + ' '."\n"; } if ($location_of_buttons == 'top') { showComposeButtonRow(); @@ -794,14 +865,22 @@ function showInputForm ($session, $values=false) { } if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) { if ($sig_first == '1') { + if ($charset == 'iso-2022-jp') { + echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP'); + } else { echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature); + } echo "\n\n".htmlspecialchars($body); } else { echo "\n\n".htmlspecialchars($body); + if ($charset == 'iso-2022-jp') { + echo "\n\n".($prefix_sig==true? "-- \n":'').mb_convert_encoding($signature, 'EUC-JP'); + }else{ echo "\n\n".($prefix_sig==true? "-- \n":'').htmlspecialchars($signature); } } + } else { echo htmlspecialchars($body); } @@ -812,12 +891,19 @@ function showInputForm ($session, $values=false) { if ($location_of_buttons == 'bottom') { showComposeButtonRow(); } else { - echo ' ' . "\n"; + echo ' ' . "\n"; } /* This code is for attachments */ - echo ' ' . "\n" . + echo '
'; - echo '  
' . + ' ' . + '     

' . + '
' . + ' '; + /* End of attachment code */ if ($compose_new_win == '1') { echo '
' . + ' ' . + ' ' . + '
' . + ' ' . + ' ' . "\n" . ' ' . "\n" . @@ -827,34 +913,41 @@ function showInputForm ($session, $values=false) { ' value="' . _("Add") .'">' . "\n" . ' ' . "\n" . ' ' . "\n"; + - if (count($attachments)) { - $hashed_attachment_dir = getHashedDir($username, $attachment_dir); - echo ''; + $s_a = array(); + foreach ($composeMessage->entities as $key => $attachment) { + $attached_file = $attachment->att_local_name; + if ($attachment->att_local_name || $attachment->body_part) { + $attached_filename = decodeHeader($attachment->mime_header->getParameter('name')); + $type = $attachment->mime_header->type0.'/'. + $attachment->mime_header->type1; + $s_a[] = '\n" . $attached_filename . ' - ' . $type . + ' ('.show_readable_size( filesize( $attached_file ) ) + . ')
'."\n"; + } + } + if (count($s_a)) { + foreach ($s_a as $s) { + echo ''; + } + echo ''; } + echo '
' . "\n" . _("Attach:") . '
' . "\n" . - ' ' . - ''; - foreach ($attachments as $key => $info) { - if ($info['session'] == $session) { - $attached_file = "$hashed_attachment_dir/$info[localfilename]"; - echo '\n" . - $info['remotefilename'] . ' - ' . $info['type'] . ' (' . - show_readable_size( filesize( $attached_file ) ) . ")
\n"; - } - } - - echo '\n" . - '
'.$s.'
\n" . + '
' . + '
'."\n"; } - echo '' . "\n"; - - echo '\n"; - echo '\n" . + '\n" . ''; do_hook('compose_bottom'); @@ -864,9 +957,9 @@ function showInputForm ($session, $values=false) { function showComposeButtonRow() { global $use_javascript_addr_book, $save_as_draft, - $default_use_priority, $mailprio, $default_use_mdn, - $request_mdn, $request_dr, - $data_dir, $username; + $default_use_priority, $mailprio, $default_use_mdn, + $request_mdn, $request_dr, + $data_dir, $username; echo " \n\n"; if ($default_use_priority) { @@ -884,14 +977,14 @@ function showComposeButtonRow() { if ($mdn_user_support) { echo "\n\t". _("Receipt") .': '. ''. _("On read"). + ($request_mdn=='1'?' checked':'') .'>'. _("On Read"). ' '. _("On Delivery"); + ($request_dr=='1'?' checked':'') .'>'. _("On Delivery"); } } - echo " \n \n \n"; - echo "\n \n"; + echo " \n \n \n" . + "\n \n"; if ($use_javascript_addr_book) { echo "