X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=6950bcb4e2f1d2263c5c7a8f6517e6d4e9f89fd8;hb=38c944cca3a80b0d62def6b1974d1abec143ff54;hp=0aa2c9ef5b46366ec484ab9e161a3f671532bef6;hpb=54817114a34450766c7d5967fbc409b4136de8a6;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index 0aa2c9ef..6950bcb4 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -18,37 +18,70 @@ 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'); +require_once('../src/view_header.php'); + /** -* Given an IMAP message id number, this will look it up in the cached -* and sorted msgs array and return the index. Used for finding the next -* and previous messages. -* -* returns the index of the next valid message from the array -*/ + * Given an IMAP message id number, this will look it up in the cached + * and sorted msgs array and return the index. Used for finding the next + * and previous messages. + * + * @return the index of the next valid message from the array + */ function findNextMessage() { - global $msort, $currentArrayIndex, $msgs, $sort; + global $msort, $currentArrayIndex, $msgs, $sort, + $thread_sort_messages, $allow_server_sort, + $server_sort_array; + if (!is_array($server_sort_array)) { + $thread_sort_messages = 0; + $allow_server_sort = FALSE; + } $result = -1; - - if ($sort == 6) { + if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) { + reset($server_sort_array); + while(list($key, $value) = each ($server_sort_array)) { + if ($currentArrayIndex == $value) { + if ($key == (count($server_sort_array) - 1)) { + $result = -1; + break; + } + $result = $server_sort_array[$key + 1]; + break; + } + } + } + elseif ($sort == 6 && $allow_server_sort != TRUE && + $thread_sort_messages != 1) { if ($currentArrayIndex != 1) { $result = $currentArrayIndex - 1; } - } else { + } + elseif ($allow_server_sort != TRUE && $thread_sort_messages != 1 ) { + if (!is_array($msort)) { + return -1; + } for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { if ($currentArrayIndex == $msgs[$key]['ID']) { next($msort); $key = key($msort); - if (isset($key)) + if (isset($key)){ $result = $msgs[$key]['ID']; break; + } } } } return ($result); } -/** Removes just one address from the list of addresses. */ +/** + * Removes just one address from the list of addresses. + * + * @param &$addr_list a by-ref array of addresses + * @param $addr an address to remove + * @return void, since it operates on a by-ref param + */ function RemoveAddress(&$addr_list, $addr) { if ($addr != '') { foreach (array_keys($addr_list, $addr) as $key_to_delete) { @@ -60,16 +93,37 @@ function RemoveAddress(&$addr_list, $addr) { /** returns the index of the previous message from the array. */ function findPreviousMessage() { global $msort, $currentArrayIndex, $sort, $msgs, $imapConnection, - $mailbox, $data_dir, $username; - + $mailbox, $data_dir, $username, $thread_sort_messages, + $allow_server_sort, $server_sort_array; $result = -1; - - if ($sort == 6) { + if (!is_array($server_sort_array)) { + $thread_sort_messages = 0; + $allow_server_sort = FALSE; + } + if ($thread_sort_messages == 1 || $allow_server_sort == TRUE) { + reset($server_sort_array); + while(list($key, $value) = each ($server_sort_array)) { + if ($currentArrayIndex == $value) { + if ($key == 0) { + $result = -1; + break; + } + $result = $server_sort_array[$key -1]; + break; + } + } + } + elseif ($sort == 6 && $allow_server_sort != TRUE && + $thread_sort_messages != 1) { $numMessages = sqimap_get_num_messages($imapConnection, $mailbox); if ($currentArrayIndex != $numMessages) { $result = $currentArrayIndex + 1; } - } else { + } + elseif ($thread_sort_messages != 1 && $allow_server_sort != TRUE) { + if (!is_array($msort)) { + return -1; + } for (reset($msort); ($key = key($msort)), (isset($key)); next($msort)) { if ($currentArrayIndex == $msgs[$key]['ID']) { prev($msort); @@ -85,9 +139,9 @@ function findPreviousMessage() { } /** -* Displays a link to a page where the message is displayed more -* "printer friendly". -*/ + * Displays a link to a page where the message is displayed more + * "printer friendly". + */ function printer_friendly_link() { global $passed_id, $mailbox, $ent_num, $color, $pf_subtle_link, @@ -98,25 +152,24 @@ function printer_friendly_link() { } $params = '?passed_ent_id=' . $ent_num . - '&mailbox=' . urlencode($mailbox) . - '&passed_id=' . $passed_id; + '&mailbox=' . urlencode($mailbox) . + '&passed_id=' . $passed_id; $print_text = _("View Printable Version"); if (!$pf_subtle_link) { /* The link is large, on the bottom of the header panel. */ - $result = '' . - '' . - ' ' . - ''."\n"; + $result = html_tag( 'tr', '', '', $color[0] ) . + html_tag( 'td', ' ', 'right', '', 'class="medText" valign="top"' ) . + html_tag( 'td', '', 'left', '', 'class="medText" valign="top" colspan="2"' ) . "\n"; } else { /* The link is subtle, below "view full header". */ - $result = "
\n"; + $result = "
\n"; } /* Output the link. */ if ($javascript_on) { - $result .= '\n" . - "$print_text\n"; + "$print_text\n"; } else { - $result .= '$print_text\n"; + $result .= '$print_text\n"; } if (!$pf_subtle_link) { @@ -139,22 +192,8 @@ function printer_friendly_link() { } function ServerMDNSupport( $read ) { - - $num = 0; - $resp = ''; - while ($num < count($read) ) { - $resp .= $read[$num]; - $num++; - } - $read[] = split(' * ', $resp); - $num = 0; - $ret = FALSE; - while ( !$ret && $num < count($read) ) { - if ( ereg('PERMANENTFLAGS', $read[$num] ) ) { - $ret = ( ereg('mdnsent',strtolower($read[$num]) ) || ereg("\\\*", $read[$num] ) ); - } - $num++; - } + /* escaping $ doesn't work -> \x36 */ + $ret = preg_match( '/(\x36MDNSent|\\\*)/i', $read ); return ( $ret ); } @@ -162,9 +201,7 @@ function SendMDN ( $recipient , $sender) { global $imapConnection, $mailbox, $username, $attachment_dir, $SERVER_NAME, $version, $attachments, $identity, $data_dir, $passed_id; - $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); - $header = $message->header; - + $header = sqimap_get_message_header($imapConnection, $passed_id, $mailbox); $hashed_attachment_dir = getHashedDir($username, $attachment_dir); // part 1 (RFC2298) @@ -179,18 +216,15 @@ function SendMDN ( $recipient , $sender) { $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" . _("Sent:") . ' ' . $senton . "\r\n" . "\r\n" . sprintf( _("Was displayed on %s"), $now ); -/* - $body = sprintf( _("This message sent on %s to %s with subject \"%s\" has been displayed on %s."), - $senton, $to, $subject, $now ) . - "\r\n" . - _("This is no guarantee that the message has been read or understood.") . "\r\n"; -*/ + // part2 (RFC2298) $original_recipient = $to; @@ -216,30 +250,23 @@ function SendMDN ( $recipient , $sender) { $newAttachment = array(); $newAttachment['localfilename'] = $localfilename; $newAttachment['type'] = "message/disposition-notification"; - + $newAttachment['session']=-1; $attachments[] = $newAttachment; $MDN_to = trim($recipient); $reply_id = 0; - return (SendMessage($MDN_to,'','', _("Read:") . ' ' . $subject, $body,$reply_id, True, 3) ); + return (SendMessage($MDN_to, '', '', _("Read:") . ' ' . $subject, + $body, $reply_id, True, 3, -1) ); } function ToggleMDNflag ( $set ) { - - global $imapConnection, $passed_id, $mailbox; - - if ( $set ) { - $sg = '+'; - - } else { - $sg = '-'; - } - - $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)'; + global $imapConnection, $passed_id, $mailbox, $uid; sqimap_mailbox_select($imapConnection, $mailbox); - $read = sqimap_run_command ($imapConnection, $cmd, true, $response, $readmessage); - + $sg = $set?'+':'-'; + $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)'; + $read = sqimap_run_command ($imapConnection, $cmd, true, $response, + $readmessage, $uid); } function ClearAttachments() { @@ -247,17 +274,90 @@ function ClearAttachments() { $hashed_attachment_dir = getHashedDir($username, $attachment_dir); + $rem_attachments = array(); foreach ($attachments as $info) { - $attached_file = "$hashed_attachment_dir/$info[localfilename]"; - if (file_exists($attached_file)) { - unlink($attached_file); - } - } + if ($info['session'] == -1) { + $attached_file = "$hashed_attachment_dir/$info[localfilename]"; + if (file_exists($attached_file)) { + unlink($attached_file); + } + } else { + $rem_attachments[] = $info; + } + } + $attachments = $rem_attachments; +} - $attachments = array(); +function formatRecipientString($recipients, $item ) { + global $base_uri, $passed_id, $urlMailbox, $startMessage, $show_more_cc, + $echo_more, $echo_less, $show_more, $show_more_bcc, $sort, $passed_ent_id, + $PHP_SELF; + + $i = 0; + $url_string = ''; + if ((is_array($recipients)) && (isset($recipients[0]))) { + $string = ''; + $ary = $recipients; + $show = false; + + if ($item == 'to') { + if ($show_more) { + $show = true; + $url = set_url_var($PHP_SELF, 'show_more',0); + } else { + $url = set_url_var($PHP_SELF, 'show_more',1); + } + } else if ($item == 'cc') { + if ($show_more_cc) { + $url = set_url_var($PHP_SELF, 'show_more_cc',0); + $show = true; + } else { + $url = set_url_var($PHP_SELF, 'show_more_cc',1); + } + } else if ($item == 'bcc') { + if ($show_more_bcc) { + $url = set_url_var($PHP_SELF, 'show_more_bcc',0); + $show = true; + } else { + $url = set_url_var($PHP_SELF, 'show_more_bcc',1); + } + } + + $cnt = count($ary); + while ($i < $cnt) { + $addr_o = $ary[$i]; + $ary[$i] = $addr_o->getAddress(); + $ary[$i] = decodeHeader(htmlspecialchars($ary[$i])); + $url_string .= $ary[$i]; + if ($string) { + $string .= '
'.$ary[$i]; + } else { + $string = $ary[$i]; + if ($cnt>1) { + $string .= ' ('.$echo_less.')'; + } else { + $string .= '">'.$echo_more.')'; + break; + } + } + } + $i++; + } + } + else { + $string = ''; + } + $url_string = urlencode($url_string); + $result = array(); + $result['str'] = $string; + $result['url_str'] = $url_string; + return $result; } + /* * Main of read_boby.php -------------------------------------------------- */ @@ -268,83 +368,67 @@ function ClearAttachments() { $passed_id */ -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -$read = sqimap_mailbox_select($imapConnection, $mailbox); +global $uid_support, $sqimap_capabilities; + +if (isset($mailbox)){ + $mailbox = urldecode( $mailbox ); +} + +$imapConnection = sqimap_login($username, $key, $imapServerAddress, + $imapPort, 0); + +$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); + +if (!isset($messages)) { + $messages = array(); + session_register('messages'); + echo "SET messages"; +} + +/** + * $message contains all information about the message + * including header and body + */ +if (!isset($messages[$passed_id])) { + $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); + $messages["$passed_id"] = $message; + $header = $message->header; + + echo "NOT SET $passed_id"; +} else { + $message = $messages[$passed_id]; + $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); + if (isset($passed_ent_id)) { + $message = $message->getEntity($passed_ent_id); + $message->id = $passed_id; + $message->mailbox = $mailbox; + } + $header = $message->header; +} do_hook('html_top'); /* * The following code sets necesarry stuff for the MDN thing */ -if( $default_use_mdn && - ( $mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', $default_use_mdn) ) ) { - - $supportMDN = ServerMDNSupport($read); - $flags = sqimap_get_flags ($imapConnection, $passed_id); - $FirstTimeSee = !(in_array( 'Seen', $flags )); +if($default_use_mdn && + ($mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', + $default_use_mdn))) { + $supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]); + $FirstTimeSee = !$message->is_seen; } displayPageHeader($color, $mailbox); - /* * The following code shows the header of the message and then exit */ if (isset($view_hdr)) { - $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY[HEADER]", true, $a, $b); - - echo '
' . - '' . "\n" . - "
" . _("Viewing Full Header") . ' - '. - ''; - } else { - echo "&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more\">"; - } - echo _("View message") . "
\n" . - "\n" . - '
'; - - $cnum = 0; - for ($i=1; $i < count($read); $i++) { - $line = htmlspecialchars($read[$i]); - if (eregi("^>", $line)) { - $second[$i] = $line; - $first[$i] = ' '; - $cnum++; - } else if (eregi("^[ |\t]", $line)) { - $second[$i] = $line; - $first[$i] = ''; - } else if (eregi("^([^:]+):(.+)", $line, $regs)) { - $first[$i] = $regs[1] . ':'; - $second[$i] = $regs[2]; - $cnum++; - } else { - $second[$i] = trim($line); - $first[$i] = ''; - } - } - for ($i=0; $i < count($second); $i = $j) { - if (isset($first[$i])) { - $f = $first[$i]; - } - if (isset($second[$i])) { - $s = nl2br($second[$i]); - } - $j = $i + 1; - while (($first[$j] == '') && ($j < count($first))) { - $s .= '    ' . nl2br($second[$j]); - $j++; - } - parseEmail($s); - if (isset($f)) echo "$f$s"; - } - echo "
\n" . - ''; - sqimap_logout($imapConnection); - exit; + $template_vars = array(); + parse_viewheader($imapConnection,$passed_id,&$template_vars); + $template_vars['return_address'] = set_url_var($PHP_SELF, 'view_hdr'); + view_header($template_vars, '', ''); + exit; } if (isset($msgs)) { @@ -352,84 +436,131 @@ if (isset($msgs)) { } else { $currentArrayIndex = -1; } +$msgs[$passed_id]['FLAG_SEEN'] = true; -for ($i = 0; $i < count($msgs); $i++) { - if ($msgs[$i]['ID'] == $passed_id) { - $msgs[$i]['FLAG_SEEN'] = true; - } + +/* + * The following code sets necesarry stuff for the MDN thing + */ +if($default_use_mdn && + ($mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', + $default_use_mdn))) { + $supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]); + $FirstTimeSee = !$message->is_seen; } -// $message contains all information about the message -// including header and body -$message = sqimap_get_message($imapConnection, $passed_id, $mailbox); +/* + * The following code shows the header of the message and then exit + */ +if (isset($view_hdr)) { + $template_vars = array(); + parse_viewheader($imapConnection,$passed_id,&$template_vars); + $template_vars['return_address'] = set_url_var($PHP_SELF, 'view_hdr'); + view_header($template_vars, '', ''); + exit; +} + +if (isset($msgs)) { + $currentArrayIndex = $passed_id; +} else { + $currentArrayIndex = -1; +} +$msgs[$passed_id]['FLAG_SEEN'] = true; /** translate the subject and mailbox into url-able text **/ -$url_subj = urlencode(trim($message->header->subject)); +$url_subj = urlencode(trim($header->subject)); $urlMailbox = urlencode($mailbox); $url_replyto = ''; -if (isset($message->header->replyto)) { - $url_replyto = urlencode($message->header->replyto); +if (isset($header->replyto)) { + $addr_o = $header->replyto; + $addr_s = $addr_o->getAddress(); + $url_replyto = urlencode($addr_s); } -$url_replytoall = $url_replyto; - -// If we are replying to all, then find all other addresses and -// add them to the list. Remove duplicates. -// This is somewhat messy, so I'll explain: -// 1) Take all addresses (from, to, cc) (avoid nasty join errors here) -$url_replytoall_extra_addrs = array_merge( - array($message->header->from), - $message->header->to, - $message->header->cc -); - -// 2) Make one big string out of them -$url_replytoall_extra_addrs = join(';', $url_replytoall_extra_addrs); +$url_replytoall = $url_replyto; -// 3) Parse that into an array of addresses -$url_replytoall_extra_addrs = parseAddrs($url_replytoall_extra_addrs); +/** + * If we are replying to all, then find all other addresses and + * add them to the list. Remove duplicates. + */ -// 4) Make them unique -- weed out duplicates -// (Coded for PHP 4.0.0) -$url_replytoall_extra_addrs = - array_keys(array_flip($url_replytoall_extra_addrs)); +$excl_arr = array(); -// 5) Remove the addresses we'll be sending the message 'to' +/** + * 1) Remove the addresses we'll be sending the message 'to' + */ $url_replytoall_avoid_addrs = ''; -if (isset($message->header->replyto)) { - $url_replytoall_avoid_addrs = $message->header->replyto; +if (isset($header->replyto)) { + $excl_ar = $header->getAddr_a('replyto'); } -$url_replytoall_avoid_addrs = parseAddrs($url_replytoall_avoid_addrs); -foreach ($url_replytoall_avoid_addrs as $addr) { - RemoveAddress($url_replytoall_extra_addrs, $addr); -} -// 6) Remove our identities from the CC list (they still can be in the -// TO list) only if $include_self_reply_all is turned off +/** + * 2) Remove our identities from the CC list (they still can be in the + * TO list) only if $include_self_reply_all is turned off + */ if (!$include_self_reply_all) { - RemoveAddress($url_replytoall_extra_addrs, - getPref($data_dir, $username, 'email_address')); + $email_address = trim(getPref($data_dir, $username, 'email_address')); + $excl_ar[$email_address] = ''; + $idents = getPref($data_dir, $username, 'identities'); if ($idents != '' && $idents > 1) { for ($i = 1; $i < $idents; $i ++) { - $cur_email_address = getPref($data_dir, $username, 'email_address' . $i); - RemoveAddress($url_replytoall_extra_addrs, $cur_email_address); + $cur_email_address = getPref($data_dir, $username, + 'email_address' . $i); + $cur_email_address = strtolower($cur_email_address); + $excl_ar[$cur_email_address] = ''; } } } -// 7) Smoosh back into one nice line -$url_replytoallcc = getLineOfAddrs($url_replytoall_extra_addrs); +/** + * 3) get the addresses. + */ +$url_replytoall_ar = $header->getAddr_a(array('from','to','cc'), $excl_ar); -// 8) urlencode() it +/** + * 4) generate the string. + */ +$url_replytoallcc = ''; +foreach( $url_replytoall_ar as $email => $personal) { + if ($personal) { + $url_replytoallcc .= ", \"$personal\" <$email>"; + } else { + $url_replytoallcc .= ', '. $email; + } +} +$url_replytoallcc = substr($url_replytoallcc,2); + +/** + * 5) urlencode() it + */ $url_replytoallcc = urlencode($url_replytoallcc); -$dateString = getLongDateString($message->header->date); +$dateString = getLongDateString($header->date); + +/** + * What do we reply to -- text only, if possible + */ + +$body = ''; + + +/* first step in displaying multiple entities */ + + $ent_ar = findDisplayEntity($message, false); + $i = 0; + for ($i = 0; $i < count($ent_ar); $i++) { + $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i]); + } -// What do we reply to -- text only, if possible -$ent_num = findDisplayEntity($message); +$ent_ar = findDisplayEntity($message,true); + +$ent_num = $ent_ar[0]; +for ($i = 1 ; $i < count($ent_ar); $i++) { + $ent_num .= '_'.$ent_ar[$i]; +} /** TEXT STRINGS DEFINITIONS **/ $echo_more = _("more"); $echo_less = _("less"); @@ -438,130 +569,30 @@ if (!isset($show_more_cc)) { $show_more_cc = FALSE; } +if (!isset($show_more_bcc)) { + $show_more_bcc = FALSE; +} + /** FORMAT THE TO STRING **/ -$i = 0; -$to_string = ''; -$to_ary = $message->header->to; -while ($i < count($to_ary)) { - $to_ary[$i] = htmlspecialchars(decodeHeader($to_ary[$i])); - - if ($to_string) { - $to_string = "$to_string
$to_ary[$i]"; - } else { - $to_string = "$to_ary[$i]"; - } +$to = formatRecipientString($message->header->to, "to"); +$to_string = $to['str']; +$url_to_string = $to['url_str']; - $i++; - if (count($to_ary) > 1) { - if ($show_more == false) { - if ($i == 1) { - /* From a search... */ - $to_string .= ' ($echo_more)"; - } else { - $to_string .= "sort=$sort&startMessage=$startMessage&show_more=1&show_more_cc=$show_more_cc\">$echo_more)"; - } - $i = count($to_ary); - } - } else if ($i == 1) { - /* From a search... */ - $to_string .= ' ($echo_less)"; - } else { - $to_string .= "sort=$sort&startMessage=$startMessage&show_more=0&show_more_cc=$show_more_cc\">$echo_less)"; - } - } - } -} /** FORMAT THE CC STRING **/ -$i = 0; -if (isset ($message->header->cc[0]) && trim($message->header->cc[0])) { - $cc_string = ""; - $cc_ary = $message->header->cc; - while ($i < count(decodeHeader($cc_ary))) { - $cc_ary[$i] = htmlspecialchars($cc_ary[$i]); - if ($cc_string) { - $cc_string = "$cc_string
$cc_ary[$i]"; - } else { - $cc_string = "$cc_ary[$i]"; - } - $i++; - if (count($cc_ary) > 1) { - if ($show_more_cc == false) { - if ($i == 1) { - /* From a search... */ - $cc_string .= ' ($echo_more)"; - } else { - $cc_string .= "&sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more)"; - } - $i = count($cc_ary); - } - } else if ($i == 1) { - /* From a search... */ - $cc_string .= ' ($echo_less)"; - } else { - $cc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less)"; - } - } - } - } -} +$cc = formatRecipientString($header->cc, "cc"); +$cc_string = $cc['str']; +$url_cc_string = $cc['url_str']; /** FORMAT THE BCC STRING **/ -$i = 0; -if (isset ($message->header->bcc[0]) && trim($message->header->bcc[0])){ - $bcc_string = ""; - $bcc_ary = $message->header->bcc; - while ($i < count(decodeHeader($bcc_ary))) { - $bcc_ary[$i] = htmlspecialchars($bcc_ary[$i]); - if ($bcc_string) { - $bcc_string = "$bcc_string
$bcc_ary[$i]"; - } else { - $bcc_string = "$bcc_ary[$i]"; - } - $i++; - if (count($bcc_ary) > 1) { - if ($show_more_cc == false) { - if ($i == 1) { - /* From a search... */ - $bcc_string .= ' ($echo_more)"; - } else { - $bcc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more)"; - } - $i = count($bcc_ary); - } - } else if ($i == 1) { - /* From a search... */ - $bcc_string .= ' ($echo_less)"; - } else { - $bcc_string .= "sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less)"; - } - } - } - } -} +$bcc = formatRecipientString($header->bcc, "bcc"); +$bcc_string = $bcc['str']; +$url_bcc_string = $bcc['url_str']; if ($default_use_priority) { - $priority_level = substr($message->header->priority,0,1); + $priority_level = substr($header->priority,0,1); switch($priority_level) { /* check for a higher then normal priority. */ @@ -587,114 +618,190 @@ if ($default_use_priority) { } /** make sure everything will display in HTML format **/ -$from_name = decodeHeader(htmlspecialchars($message->header->from)); + +$from_o = $header->from; +if (is_object($from_o)) { + $from_name = $from_o->getAddress(); +} else { + $from_name = _("Unknown sender"); +} +$from_name = decodeHeader(htmlspecialchars($from_name)); $subject = decodeHeader(htmlspecialchars($message->header->subject)); +$identity = ''; +$idents = getPref($data_dir, $username, 'identities'); +if (!empty($idents) && $idents > 1) { + for ($i = 1; $i < $idents; $i++) { + $enc_from_name = '"'. + encodeHeader(getPref($data_dir, + $username, + 'full_name' . $i)) . + '" <' . getPref($data_dir, $username, + 'email_address' . $i) . '>'; + if (htmlspecialchars($enc_from_name) == $from_name) { + $identity = $i; + break; + } + } +} do_hook('read_body_top'); -echo '
' . - '' . - '' . - '' . + html_tag( 'tr' ) . + html_tag( 'td', '', 'left', '', 'width="100%"' ) . + html_tag( 'table', '', '', '', 'width="100%" border="0" cellspacing="0" cellpadding="3"' ) . + html_tag( 'tr' ) . "\n"; /** subject **/ -echo "\n" . - '' . - ' '; +echo '' . + ' '; /** from **/ -echo '' . - '' . - ''; +echo html_tag( 'tr', "\n" . + html_tag( 'td', _("From:"), 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $from_name . ' ' . "\n" , + 'left', $color[0] ) + ) . "\n"; + do_hook("read_body_after_from"); /** date **/ -echo '' . "\n" . - '' . "\n" . - '' . "\n"; - +echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Date:"), 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $dateString . ' ' . "\n" , + 'left', $color[0] ) + ) . "\n"; /** to **/ -echo "\n" . - "' . "\n" . - '' . "\n"; +echo html_tag( 'tr', "\n" . + html_tag( 'td', _("To:"), 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $to_string . ' ' . "\n" , + 'left', $color[0] ) + ) . "\n"; /** cc **/ -if (isset($cc_string)) { - echo '' . - "' . - '' . "\n"; +if (isset($cc_string) && $cc_string <> '') { + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Cc:"), 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $cc_string . ' ' . "\n" , + 'left', $color[0], 'colspan="2" valign="top"' ) + ) . "\n"; } /** bcc **/ -if (isset($bcc_string)) { - echo ''. - "' . - '' . "\n"; +if (isset($bcc_string) && $bcc_string <> '') { + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Bcc:"), 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $bcc_string . ' ' . "\n" , + 'left', $color[0], 'colspan="2" valign="top"' ) + ) . "\n"; } -if ($default_use_priority) { - if (isset($priority_string)) { - echo '' . - "' . - "" . "\n"; - } +if ($default_use_priority && isset($priority_string) && $priority_string <> '' ) { + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Priority") . ':', 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $priority_string . ' ' . "\n" , + 'left', $color[0], 'colspan="2" valign="top"' ) + ) . "\n"; } if ($show_xmailer_default) { - $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY.PEEK[HEADER.FIELDS (X-Mailer User-Agent)]", true, - $response, $readmessage); - $mailer = substr($read[1], strpos($read[1], " ")); + $mailer = $header->xmailer; if (trim($mailer)) { - echo '' . - "' . - "" . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Mailer") . ':', 'right', $color[0], 'valign="top"' ) . + html_tag( 'td', + '' . $mailer . ' ' , + 'left', $color[0], 'colspan="2" valign="top"' ) + ) . "\n"; } } @@ -788,91 +884,82 @@ if ($default_use_mdn) { if ($mdn_user_support) { // debug gives you the capability to remove mdn-flags - $debug = false; - $read = sqimap_run_command ($imapConnection, "FETCH $passed_id BODY.PEEK[HEADER.FIELDS (Disposition-Notification-To)]", true, - $response, $readmessage); - $MDN_to = substr($read[1], strpos($read[1], ' ')); - $MDN_flag_present = false; - - $read = sqimap_run_command ($imapConnection, "FETCH $passed_id FLAGS", true, - $response, $readmessage); + // $MDNDebug = false; - $MDN_flag_present = preg_match( '/.*\$MDNSent/i', $read[0]); - - if (trim($MDN_to) && - (!isset( $sendreceipt ) || $sendreceipt == '' ) ) { + if ($header->dnt) { + $MDN_to_o = $header->dnt; + $MDN_to = $MDN_to_o->getAddress(); + } else { + $MDN_to = ''; + } - if ( $MDN_flag_present && $supportMDN) { + if ($MDN_to && (!isset( $sendreceipt ) || $sendreceipt == '' ) ) { + if ( $message->is_mdnsent && $supportMDN) { $sendreceipt = 'removeMDN'; - $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; - $sendreceipt=""; - if ($debug ) { - echo '' . - "' . - '' . "\n"; + + $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; + $sendreceipt=''; + /* + if ($MDNDebug ) { + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("send") . ' [' . _("Remove MDN flag") . ']  ' , + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; } else { - echo '' . - "' . - '' . "\n"; + */ + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("send") . ' ' , + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; + /* } + */ } // when deleted or draft flag is set don't offer to send a MDN response - else if ( ereg('Draft',$read[0] || ereg('Deleted',$read[0])) ) { - echo '' . - "' . - '' . "\n"; + else if ( $message->is_draft || $message->is_deleted) { + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("requested") . ' ' , + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; } // if no MDNsupport don't use the annoying popup messages else if ( !$FirstTimeSee ) { $sendreceipt = 'send'; $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; - echo '' . - "' . - '' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("requested") . '   [' . _("Send read receipt now") . ']', + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; $sendreceipt=''; } else { $sendreceipt = 'send'; $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; if ($javascript_on) { - echo "' . "\n"; } - echo '' . - "' . - '' . "\n"; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("requested") . '  [' . _("Send read receipt now") . ']', + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; $sendreceipt = ''; } } @@ -886,50 +973,51 @@ if ($default_use_mdn) { $final_recipient = getPref($data_dir, $username, 'email_address', '' ); } + $final_recipient = trim($final_recipient); if ($final_recipient == '' ) { $final_recipient = getPref($data_dir, $username, 'email_address', '' ); } - if ( SendMDN( $MDN_to, $final_recipient ) > 0 && $supportMDN ) { + if ( SendMDN( $MDN_to, $final_recipient, $message ) > 0 && $supportMDN ) { ToggleMDNflag( true); } + ClearAttachments(); } $sendreceipt = 'removeMDN'; - $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; - $sendreceipt=""; - - if ($debug && $supportMDN) { - echo " \n" . - " ' . "\n" . - ' ' . "\n"; + $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; + $sendreceipt=''; + /* + if ($MDNDebug && $supportMDN) { + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("send") . '  [' . _("Remove MDN flag") . ']', + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; } else { - echo " \n" . - " ' . "\n" . - ' ' . "\n"; + */ + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("send") . ' ', + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; + /* } + */ } elseif ($sendreceipt == 'removeMDN' ) { ToggleMDNflag ( false ); $sendreceipt = 'send'; - $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; - echo ''. - "' . - '' . "\n"; + $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; + echo html_tag( 'tr', "\n" . + html_tag( 'td', _("Read receipt") . ':', 'right', $color[9], 'valign="top"' ) . + html_tag( 'td', + '' . _("requested") . '   [' . _("Send read receipt now") . ']', + 'left', $color[9], 'colspan="2" valign="top"' ) + ) . "\n"; $sendreceipt = ''; } @@ -938,19 +1026,23 @@ if ($default_use_mdn) { do_hook('read_body_header'); -echo '
' . - '' . - '' . - '' . - '' . + html_tag( 'td', '', 'center', '', 'width="33%"' ) . + ''; if ( !($where && $what) ) { - if ($currentArrayIndex == -1) { echo 'Previous | Next'; } else { - $prev = findPreviousMessage(); + $prev = findPreviousMessage($mbx_response['EXISTS']); $next = findNextMessage(); if ($prev != -1) { - echo '" . _("Previous") . " | "; + echo '" . _("Previous") . " | "; } else { echo _("Previous") . ' | '; } if ($next != -1) { - echo '" . _("Next") . ""; + echo '" . _("Next") . ""; } else { echo _("Next"); } } } -echo '' . - '' . + html_tag( 'td', '', 'right', '', 'width="33%"' ) . + '' ; +$comp_uri = $base_uri . "src/compose.php?forward_id=$passed_id&". + "forward_subj=$url_subj&". + ($default_use_priority?"mailprio=$priority_level&":''). + "mailbox=$urlMailbox&ent_num=$ent_num"; + +if ($compose_new_win == '1') { + echo "'. _("Forward") . - ' | ' . - '" . + ' | '; + +$comp_uri = $base_uri . "src/compose.php?send_to=$url_replyto&". + "reply_subj=$url_subj&". + ($default_use_priority?"mailprio=$priority_level&":''). + "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num"; + +if ($compose_new_win == '1') { + echo "'. _("Reply") . - ' | ' . - '" . + ' | '; + +$comp_uri = $base_uri . "src/compose.php?send_to=$url_replytoall&". + "send_to_cc=$url_replytoallcc&reply_subj=$url_subj&". + ($default_use_priority?"mailprio=$priority_level&":''). + "reply_id=$passed_id&mailbox=$urlMailbox&ent_num=$ent_num"; + +if ($compose_new_win == '1') { + echo "'. _("Reply All") . - '  ' . - '' . - '' . - '' . - '
' . - '' . - '' . + '"; + echo "search.php?where=".urlencode($where)."&pos=$pos&what=".urlencode($what)."&mailbox=$urlMailbox\">"; } else { - echo "right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">"; + echo "right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">"; } echo _("Message List") . - ' | ' . - ' | ' . + ''; + echo 'where=' . urlencode($where) . '&what=' . urlencode($what) . '">'; } else { - echo "sort=$sort&startMessage=$startMessage\">"; + echo "sort=$sort&startMessage=$startMessage\">"; } -echo _("Delete") . ' '; +echo _("Delete") . ' '; if (($mailbox == $draft_folder) && ($save_as_draft)) { - echo '| ". + $comp_uri = $base_uri . "src/compose.php?mailbox=$mailbox&". + "identity=$identity&send_to=$url_to_string&". + "send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&". + "subject=$url_subj&mailprio=$priority_level&". + "draft_id=$passed_id&ent_num=$ent_num"; + + if ($compose_new_win == '1') { + echo "'. _("Resume Draft") . ''; } +if ($mailbox == $sent_folder) { + $comp_uri = $base_uri . "src/compose.php?mailbox=$mailbox&". + "identity=$identity&send_to=$url_to_string&". + "send_to_cc=$url_cc_string&send_to_bcc=$url_bcc_string&". + "subject=$url_subj&mailprio=$priority_level&". + "ent_num=$ent_num&passed_id=$passed_id&edit_as_new=1"; + + if ($compose_new_win == '1') { + echo "'. + _("Edit Message as New") . ''; +} echo '  ' . - '' . - '' . - ''; + '' . + '' . - '' . - '" . +echo '' . + '
' . - '
' . - '' . "\n" . - '' . "\n"; + '  ' . + '' . + '' . + '' . + '
' . + '
\n" . - _("Subject:") . - "\n" . - "$subject \n" . - "'. - '' . $subject . ' ' . "\n", 'left', $color[0], 'width="80%" valign="top"' ) . + html_tag( 'td', '', 'right', $color[0], 'rowspan="4" width="10%" valign="top" nowrap' ) . + '
' . - _("From:") . - '' . - "$from_name \n" . - '
' . "\n" . - _("Date:") . - "\n" . - "$dateString \n" . - '
\n" . - _("To:") . - '' . "\n" . - "$to_string \n" . - '
" . - 'Cc:' . - "" . - "$cc_string " . - '
" . - 'Bcc:' . - "" . - "$bcc_string " . - '
" . - _("Priority") . ': '. - "" . - "$priority_string " . - '
" . - _("Mailer") . ': '. - "" . - "$mailer " . - '
" . - _("Read receipt") . ': ' . - "" . - '' . - _("send") . - " [" . _("Remove MDN flag") . '] ' . - '
" . - _("Read receipt") . ': ' . - "" . - ''._("send").''. - '
" . - _("Read receipt") . ': '. - "" . - '' . _("requested") . "" . - '
" . - _("Read receipt") . ': ' . - "" . - '' . _("requested") . - "   [" . _("Send read receipt now") . "]" . - '
" . - _("Read receipt") . ': ' . - "" . - '' . _("requested") . "  " . '[' . - _("Send read receipt now") . '] ' ." \n" . - '
\n" . - " "._("Read receipt").": \n". - " \n" . - ' '._("send").''." " . '[' . _("Remove MDN flag") . '] ' . "\n" . - '
\n" . - " "._("Read receipt").": \n". - " \n" . - ' '._("send").''. "\n" . - '
" . - _("Read receipt") . ': ' . - "" . - '' . _("requested") . - "   [" . _("Send read receipt now") . "]" . - '
' . - ' ' . - ''; +echo '' . + ' ' . + ''; flush(); - -echo "\n" . - "
\n" . - '
'. - formatBody($imapConnection, $message, $color, $wrap_at). - '
' . - '' . "\n" . - " " . - '
 
' . "\n"; +echo html_tag( 'table', "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', '
' . "\n" . $body . "\n", 'left', $color[4] + ) + ) , + 'center', '', 'cellspacing=0 width="97%" border="0" cellpadding="0"') . + + html_tag( 'table', "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', ' ', 'left', $color[9] + ) + ) , + 'center', '', 'cellspacing=0 width="100%" border="0" cellpadding="0"'); /* show attached images inline -- if pref'fed so */ if (($attachment_common_show_images) && @@ -960,18 +1052,16 @@ if (($attachment_common_show_images) && $imgurl = '../src/download.php' . '?' . 'passed_id=' . urlencode($img['passed_id']) . - '&mailbox=' . urlencode($mailbox) . - '&passed_ent_id=' . urlencode($img['ent_id']) . - '&absolute_dl=true'; - - echo "\n" . - '' . - '\n" . - "\n" . - "
' . - "\n" . - "
\n"; - + '&mailbox=' . urlencode($mailbox) . + '&passed_ent_id=' . urlencode($img['ent_id']) . + '&absolute_dl=true'; + + echo html_tag( 'table', "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', '' ."\n", 'left' + ) + ) , + 'center', '', 'cellspacing=0 border="0" cellpadding="2"'); } }