* $Id$
*/
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
-require_once('../functions/mime.php');
-require_once('../functions/date.php');
-require_once('../functions/url_parser.php');
-require_once('../functions/smtp.php');
-require_once('../functions/html.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'src/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/mime.php');
+require_once(SM_PATH . 'functions/date.php');
+require_once(SM_PATH . 'functions/url_parser.php');
+require_once(SM_PATH . 'functions/html.php');
/**
* Given an IMAP message id number, this will look it up in the cached
return ( $ret );
}
-function SendMDN ( $mailbox, $passed_id, $sender, $message) {
+function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) {
global $username, $attachment_dir, $SERVER_NAME,
- $version, $attachments;
+ $version, $attachments, $squirrelmail_language, $default_charset,
+ $languages, $useSendmail, $domain, $sent_folder,
+ $popuser, $data_dir, $username;
$header = $message->rfc822_header;
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-
- $recipient_o = $header->dnt;
- $recipient = $recipient_o->getAddress(true);
+ $rfc822_header = new Rfc822Header();
+ $content_type = new ContentType('multipart/report');
+ $content_type->properties['report-type']='disposition-notification';
+
+ set_my_charset();
+ if ($default_charset) {
+ $content_type->properties['charset']=$default_charset;
+ }
+ $rfc822_header->content_type = $content_type;
+ $rfc822_header->to[] = $header->dnt;
+ $rfc822_header->subject = _("Read:") . ' ' . $header->subject;
+
+
+ $reply_to = '';
+ if (isset($identity) && $identity != 'default') {
+ $from_mail = getPref($data_dir, $username,
+ 'email_address' . $identity);
+ $full_name = getPref($data_dir, $username,
+ 'full_name' . $identity);
+ $from_addr = '"'.$full_name.'" <'.$from_mail.'>';
+ $reply_to = getPref($data_dir, $username,
+ 'reply_to' . $identity);
+ } else {
+ $from_mail = getPref($data_dir, $username, 'email_address');
+ $full_name = getPref($data_dir, $username, 'full_name');
+ $from_addr = '"'.$full_name.'" <'.$from_mail.'>';
+ $reply_to = getPref($data_dir, $username,'reply_to');
+ }
+ if (!$from_addr) {
+ $from_addr = "$popuser@$domain";
+ $from_mail = $from_addr;
+ }
+ $rfc822_header->from = $rfc822_header->parseAddress($from_addr,true);
+ if ($reply_to) {
+ $rfc822_header->reply_to = $rfc822_header->parseAddress($reply_to,true);
+ }
+
// part 1 (RFC2298)
-
$senton = getLongDateString( $header->date );
$to_array = $header->to;
$to = '';
foreach ($to_array as $line) {
$to .= ' '.$line->getAddress();
}
-
- $subject = $header->subject;
$now = getLongDateString( time() );
-
set_my_charset();
-
$body = _("Your message") . "\r\n\r\n" .
"\t" . _("To:") . ' ' . $to . "\r\n" .
- "\t" . _("Subject:") . ' ' . $subject . "\r\n" .
+ "\t" . _("Subject:") . ' ' . $header->subject . "\r\n" .
"\t" . _("Sent:") . ' ' . $senton . "\r\n" .
"\r\n" .
sprintf( _("Was displayed on %s"), $now );
- $body = charset_encode_japanese($body);
-
+ $special_encoding = '';
+ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+ $body = $languages[$squirrelmail_language]['XTRA_CODE']('encode', $body);
+ if (strtolower($default_charset) == 'iso-2022-jp') {
+ if (mb_detect_encoding($body) == 'ASCII') {
+ $special_encoding = '8bit';
+ } else {
+ $body = mb_convert_encoding($body, 'JIS');
+ $special_encoding = '7bit';
+ }
+ }
+ }
+ $part1 = new Message();
+ $part1->setBody($body);
+ $mime_header = new MessageHeader;
+ $mime_header->type0 = 'text';
+ $mime_header->type1 = 'plain';
+ if ($special_encoding) {
+ $mime_header->encoding = $special_encoding;
+ } else {
+ $mime_header->encoding = 'us-ascii';
+ }
+ if ($default_charset) {
+ $mime_header->parameters['charset'] = $default_charset;
+ }
+ $part1->mime_header = $mime_header;
+
// part2 (RFC2298)
$original_recipient = $to;
$original_message_id = $header->message_id;
- $part2 = "Reporting-UA : $SERVER_NAME ; SquirrelMail (version $version) \r\n";
+ $report = "Reporting-UA : $SERVER_NAME ; SquirrelMail (version $version) \r\n";
if ($original_recipient != '') {
- $part2 .= "Original-Recipient : $original_recipient\r\n";
+ $report .= "Original-Recipient : $original_recipient\r\n";
}
$final_recipient = $sender;
- $part2 .= "Final-Recipient: rfc822; $final_recipient\r\n" .
+ $report .= "Final-Recipient: rfc822; $final_recipient\r\n" .
"Original-Message-ID : $original_message_id\r\n" .
"Disposition: manual-action/MDN-sent-manually; displayed\r\n";
- $localfilename = GenerateRandomString(32, 'FILE', 7);
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
-
- $fp = fopen( $full_localfilename, 'w');
- fwrite ($fp, $part2);
- fclose($fp);
-
- $newAttachment = array();
- $newAttachment['localfilename'] = $localfilename;
- $newAttachment['type'] = "message/disposition-notification";
- $newAttachment['session']=-1;
- $attachments[] = $newAttachment;
-
- return (SendMessage($recipient, '', '', _("Read:") . ' ' . $subject,
- $body, 0, True, 3, -1) );
+ $part2 = new Message();
+ $part2->setBody($report);
+ $mime_header = new MessageHeader;
+ $mime_header->type0 = 'message';
+ $mime_header->type1 = 'disposition-notification';
+ $mime_header->encoding = 'us-ascii';
+ $part2->mime_header = $mime_header;
+
+ $composeMessage = new Message();
+ $composeMessage->rfc822_header = $rfc822_header;
+ $composeMessage->addEntity($part1);
+ $composeMessage->addEntity($part2);
+
+
+ if (!$useSendmail) {
+ require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php');
+ $deliver = new Deliver_SMTP();
+ global $smtpServerAddress, $smtpPort, $use_authenticated_smtp, $pop_before_smtp;
+ if ($use_authenticated_smtp) {
+ global $key, $onetimepad;
+ $user = $username;
+ $pass = OneTimePadDecrypt($key, $onetimepad);
+ } else {
+ $user = '';
+ $pass = '';
+ }
+ $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
+ $stream = $deliver->initStream($composeMessage,$domain,0,
+ $smtpServerAddress, $smtpPort, $authPop);
+ } else {
+ require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
+ global $sendmail_path;
+ $deliver = new Deliver_SendMail();
+ $stream = $deliver->initStream($composeMessage,$sendmail_path);
+ }
+ $succes = false;
+ if ($stream) {
+ $length = $deliver->mail($composeMessage, $stream);
+ $succes = $deliver->finalizeStream($stream);
+ }
+ if (!$succes) {
+ $msg = $deliver->dlv_msg . '<br>Server replied: '.$deliver->dlv_ret_nr;
+ require_once(SM_PATH . 'functions/display_messages.php');
+ plain_error_message($msg, $color);
+ } else {
+ unset ($deliver);
+ if (sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
+ sqimap_append ($imapConnection, $sent_folder, $length);
+ require_once(SM_PATH . 'class/deliver/Deliver_IMAP.class.php');
+ $imap_deliver = new Deliver_IMAP();
+ $imap_deliver->mail($composeMessage, $imapConnection);
+ sqimap_append_done ($imapConnection);
+ unset ($imap_deliver);
+ }
+ }
+ return $succes;
}
function formatEnvheader($mailbox, $passed_id, $passed_ent_id, $message,
$color, $FirstTimeSee) {
- global $msn_user_support, $default_use_mdn, $draft_folder, $sent_folder,
- $default_use_priority, $show_xmailer_default,
- $mdn_user_support, $PHP_SELF, $javascript_on;
+ global $msn_user_support, $default_use_mdn, $draft_folder, $sent_folder,
+ $default_use_priority, $show_xmailer_default,
+ $mdn_user_support, $PHP_SELF, $javascript_on;
$header = $message->rfc822_header;
$env = array();
}
}
echo $s;
- do_hook("read_body_header");
+ do_hook("read_body_header");
formatToolbar($mailbox,$passed_id,$passed_ent_id,$message, $color);
echo '</table>';
}
if (isset($where) && isset($what)) {
$msgs_url .= 'search.php?where='.urlencode($where).
'&what='.urlencode($what).'&mailbox='.$urlMailbox;
- $msgs_str = _("Search results");
+ $msgs_str = _("Search results");
} else {
$msgs_url .= 'right_main.php?sort='.$sort.'&startMessage='.
$startMessage.'&mailbox='.$urlMailbox;
$comp_uri = $base_uri . 'src/compose.php'.
'?passed_id='.$passed_id.
- '&mailbox='.$urlMailbox.
- (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
+ '&mailbox='.$urlMailbox.
+ (isset($passed_ent_id)?'&passed_ent_id='.$passed_ent_id:'');
if (($mailbox == $draft_folder) && ($save_as_draft)) {
$comp_alt_uri = $comp_uri . '&action=draft';
$s .= $topbar_delimiter;
if ($compose_new_win == '1') {
$s .= '<a href="javascript:void(0)" '.
- 'onclick="comp_in_new(\''.$comp_alt_uri.'\')">'.$comp_alt_string.'</a>';
+ 'onclick="comp_in_new(\''.$comp_alt_uri.'\')">'.$comp_alt_string.'</a>';
} else {
$s .= '<a href="'.$comp_alt_uri.'">'.$comp_alt_string.'</a>';
}
}
-
+
$s .= '</small></td><td align="center" width="33%"><small>';
-
+
if (!(isset($where) && isset($what)) && !$passed_ent_id) {
$prev = findPreviousMessage($mbx_response['EXISTS'], $passed_id);
$next = findNextMessage($passed_id);
$uri = $base_uri . 'src/read_body.php?passed_id='.$next.
'&mailbox='.$urlMailbox.'&sort='.$sort.
'&startMessage='.$startMessage.'&show_more=0';
- $s .= '<a href="'.$uri.'">'._("Next").'</a>';
+ $s .= '<a href="'.$uri.'">'._("Next").'</a>';
} else {
$s .= _("Next");
}
$s .= '<a href="'.$url.'">'._("View Message").'</a>';
$par_ent_id = $message->parent->entity_id;
if ($par_ent_id) {
- $par_ent_id = substr($par_ent_id,0,-2);
- $s .= $topbar_delimiter;
- $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
- $s .= '<a href="'.$url.'">'._("Up").'</a>';
+ $par_ent_id = substr($par_ent_id,0,-2);
+ $s .= $topbar_delimiter;
+ $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id);
+ $s .= '<a href="'.$url.'">'._("Up").'</a>';
}
- }
+ }
$s .= '</small></td><td align="right" width="33%" nowrap><small>';
$comp_action_uri = $comp_uri . '&action=forward';
$s .= $topbar_delimiter;
}
-
$comp_action_uri = decodeHeader($comp_uri . '&action=reply');
if ($compose_new_win == '1') {
$s .= '<a href="javascript:void(0)" '.
$s .= '<a href="'.$comp_action_uri.'">'._("Reply All").'</a>';
}
$s .= '</small></td></tr></table>';
+ do_hook("read_body_menu_top");
echo $s;
+ do_hook("read_body_menu_bottom");
}
function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
$urlMailbox = urlencode($mailbox);
$url = $base_uri.'src/view_header.php?'.$QUERY_STRING;
- $s = "<TR>\n";
- $s .= '<TD VALIGN="MIDDLE" ALIGN="RIGHT" WIDTH="20%"><B>' . _("Options") . ": </B></TD>\n";
- $s .= '<TD VALIGN="MIDDLE" ALIGN="LEFT" WIDTH="80%"><SMALL>';
- $s .= '<a href="'.$url.'">'.("View Full Header").'</a>';
+ $s = "<TR>\n" .
+ '<TD VALIGN="MIDDLE" ALIGN="RIGHT" WIDTH="20%"><B>' . _("Options") . ": </B></TD>\n" .
+ '<TD VALIGN="MIDDLE" ALIGN="LEFT" WIDTH="80%"><SMALL>' .
+ '<a href="'.$url.'">'._("View Full Header").'</a>';
/* Output the printer friendly link if we are in subtle mode. */
- $s .= ' | ';
- $s .= printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color);
+ $s .= ' | ' .
+ printer_friendly_link($mailbox, $passed_id, $passed_ent_id, $color);
echo $s;
do_hook("read_body_header_right");
- $s = "</SMALL></TD>\n";
- $s .= "</TR>\n";
+ $s = "</SMALL></TD>\n" .
+ "</TR>\n";
echo $s;
-
}
/***************************/
-/* Main of read_boby.php */
+/* Main of read_body.php */
/***************************/
/*
if (!isset($messages)) {
$messages = array();
- session_register('messages');
+ sqsession_register($messages,'messages');
}
/**
}
if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) {
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+ $FirstTimeSee = !$message->is_seen;
+ $message->is_seen = true;
$messages[$uidvalidity][$passed_id] = $message;
+ sqsession_register($messages, 'messages');
} else {
- $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
-// $message = $messages[$uidvalidity][$passed_id];
+// $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+ $message = $messages[$uidvalidity][$passed_id];
+ $FirstTimeSee = !$message->is_seen;
}
-$FirstTimeSee = !$message->is_seen;
-$message->is_seen = true;
-$messages[$uidvalidity][$passed_id] = $message;
+//$FirstTimeSee = !$message->is_seen;
+//$message->is_seen = true;
+//$messages[$uidvalidity][$passed_id] = $message;
if (isset($passed_ent_id) && $passed_ent_id) {
$message = $message->getEntity($passed_ent_id);
$message = $message->parent;
}
$read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[$passed_ent_id.HEADER]", true, $response, $msg, $uid_support);
- $rfc822_header = new rfc822_header();
+ $rfc822_header = new Rfc822Header();
$rfc822_header->parseHeader($read);
$message->rfc822_header = $rfc822_header;
} else {
$final_recipient = getPref($data_dir, $username, 'email_address', '' );
}
$supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]);
- if ( SendMDN( $mailbox, $passed_id, $final_recipient, $message ) > 0 && $supportMDN ) {
+ if ( SendMDN( $mailbox, $passed_id, $final_recipient, $message, $imapConnection ) > 0 && $supportMDN ) {
ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id, $uid_support);
$message->is_mdnsent = true;
$messages[$uidvalidity][$passed_id]=$message;
echo ' </table>';
echo ' </td></tr>';
echo ' </table></td></tr>';
-echo ' </table>';
-echo ' </td></tr>';
+echo ' </table>';
+echo ' </td></tr>';
$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id);
if ($attachmentsdisplay) {
- echo ' <tr><td>';
+ echo ' <tr><td>';
echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center"'.' border="0" bgcolor="'.$color[9].'">';
- echo ' <tr><td>';
- echo ' <table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
+ echo ' <tr><td>';
+ echo '
<table width="100%" cellpadding="1" cellspacing="0" align="center" border="0" bgcolor="'.$color[4].'">';
echo ' <tr><td ALIGN="left" bgcolor="'.$color[9].'">';
echo ' <b>' . _("Attachments") . ':</b>';
echo ' </td></tr>';
echo $attachmentsdisplay;
echo ' </td></tr></table>';
echo ' </table></td></tr>';
- echo ' </table></td></tr>';
+ echo ' </table></td></tr>';
echo ' </table>';
echo ' </td></tr>';
}
projects / squirrelmail.git / blobdiff