X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fread_body.php;h=163a6d10d126778a3dde5348c03457de002fd4e1;hb=6a8aff8c6e6c7c4e6354de1be82508a862b456b8;hp=6e7f22127352083e7673715ab40a8a0f296666f2;hpb=4b07f746390afb2d7b5963c9ccc7fdc508ab0c8e;p=squirrelmail.git diff --git a/src/read_body.php b/src/read_body.php index 6e7f2212..163a6d10 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -18,6 +18,9 @@ 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('../class/html.class'); +require_once('../src/view_header.php'); /** * Given an IMAP message id number, this will look it up in the cached @@ -72,21 +75,6 @@ function findNextMessage() { return ($result); } -/** - * 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) { - unset($addr_list[$key_to_delete]); - } - } -} - /** returns the index of the previous message from the array. */ function findPreviousMessage() { global $msort, $currentArrayIndex, $sort, $msgs, $imapConnection, @@ -156,13 +144,12 @@ function printer_friendly_link() { 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. */ @@ -175,10 +162,10 @@ function printer_friendly_link() { " }\n" . "// -->\n" . "\n" . - "$print_text\n"; + "$print_text\n"; } else { - $result .= '$print_text\n"; + $result .= '$print_text\n"; } if (!$pf_subtle_link) { @@ -195,12 +182,15 @@ function ServerMDNSupport( $read ) { return ( $ret ); } -function SendMDN ( $recipient , $sender) { +function SendMDN ( $sender, $message) { global $imapConnection, $mailbox, $username, $attachment_dir, $SERVER_NAME, $version, $attachments, $identity, $data_dir, $passed_id; - $header = sqimap_get_message_header($imapConnection, $passed_id, $mailbox); + $header = $message->header; $hashed_attachment_dir = getHashedDir($username, $attachment_dir); + + $recipient_o = $header->dnt; + $recipient = $recipient_o->getAddress(true); // part 1 (RFC2298) @@ -250,21 +240,21 @@ function SendMDN ( $recipient , $sender) { $newAttachment['type'] = "message/disposition-notification"; $newAttachment['session']=-1; $attachments[] = $newAttachment; - $MDN_to = trim($recipient); + $reply_id = 0; - return (SendMessage($MDN_to, '', '', _("Read:") . ' ' . $subject, + return (SendMessage($recipient, '', '', _("Read:") . ' ' . $subject, $body, $reply_id, True, 3, -1) ); } function ToggleMDNflag ( $set ) { - global $imapConnection, $passed_id, $mailbox; + global $imapConnection, $passed_id, $mailbox, $uid_support; sqimap_mailbox_select($imapConnection, $mailbox); $sg = $set?'+':'-'; $cmd = 'STORE ' . $passed_id . ' ' . $sg . 'FLAGS ($MDNSent)'; $read = sqimap_run_command ($imapConnection, $cmd, true, $response, - $readmessage); + $readmessage, $uid_support); } function ClearAttachments() { @@ -288,82 +278,60 @@ function ClearAttachments() { function formatRecipientString($recipients, $item ) { global $base_uri, $passed_id, $urlMailbox, $startMessage, $show_more_cc, - $echo_more, $echo_less, $show_more, $show_more_bcc, $sort; + $echo_more, $echo_less, $show_more, $show_more_bcc, $sort, $passed_ent_id, + $PHP_SELF; $i = 0; - $url_string = ''; - - if (isset ($recipients[0]) && trim($recipients[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); + } + } - switch ($item) { - case 'to': - $show = "&show_more=1&show_more_cc=$show_more_cc&". - "show_more_bcc=$show_more_bcc"; - $show_n = "&show_more=0&show_more_cc=$show_more_cc&". - "show_more_bcc=$show_more_bcc"; - break; - case 'cc': - $show = "&show_more=$show_more&show_more_cc=1&". - "show_more_bcc=$show_more_bcc"; - $show_n = "&show_more=$show_more&show_more_cc=0&". - "show_more_bcc=$show_more_bcc"; - $show_more = $show_more_cc; - break; - case 'bcc': - $show = "&show_more=$show_more&show_more_cc=$show_more_cc". - "&show_more_bcc=1"; - $show_n = "&show_more=$show_more&show_more_cc=". - "$show_more_cc&show_more_bcc=0"; - $show_more = $show_more_bcc; - break; - default: - $break; - } - - while ($i < count($ary)) { + $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 = "$string
$ary[$i]"; + $string .= '
'.$ary[$i]; } else { - $string = "$ary[$i]"; + $string = $ary[$i]; + if ($cnt>1) { + $string .= ' ('.$echo_less.')'; + } else { + $string .= '">'.$echo_more.')'; + break; + } + } } - $i++; - if (count($ary) > 1) { - if ($show_more == false) { - if ($i == 1) { - /* From a search... */ - $string .= ' ($echo_more)"; - } else { - $string .= "sort=$sort&startMessage=". - "$startMessage"."$show\">$echo_more)"; - } - $i = count($ary); - } - } else if ($i == 1) { - /* From a search... */ - $string .= ' ($echo_less)"; - } else { - $string .= "sort=$sort&startMessage=$startMessage". - "$show_n\">$echo_less)"; - } - } - } } } else { @@ -388,14 +356,46 @@ function formatRecipientString($recipients, $item ) { $passed_id */ +global $uid_support, $sqimap_capabilities; + if (isset($mailbox)){ $mailbox = urldecode( $mailbox ); } + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -$read = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); -do_hook('html_top'); +$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true); + +if (!isset($messages)) { + $messages = array(); + session_register('messages'); +} + +/** + * $message contains all information about the message + * including header and body + */ + +$uidvalidity = $mbx_response['UIDVALIDITY']; + +if (!isset($messages[$uidvalidity])) { + $messages[$uidvalidity] = array(); +} +if (!isset($messages[$uidvalidity][$passed_id]) || !$uid_support) { + $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); + $messages[$uidvalidity][$passed_id] = $message; +} else { + $message = $messages[$uidvalidity][$passed_id]; +} +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 @@ -403,110 +403,75 @@ do_hook('html_top'); if($default_use_mdn && ($mdn_user_support = getPref($data_dir, $username, 'mdn_user_support', $default_use_mdn))) { - - $supportMDN = ServerMDNSupport($read["PERMANENTFLAGS"]); - $flags = sqimap_get_flags ($imapConnection, $passed_id); - $FirstTimeSee = !(in_array( 'Seen', $flags )); + $supportMDN = ServerMDNSupport($mbx_response["PERMANENTFLAGS"]); + $FirstTimeSee = !$message->is_seen; } -displayPageHeader($color, $mailbox); +$xtra = ''; +$xtra = ""; +//displayPageHeader($color, $mailbox); + +/* ============================================================================= + * block for handling incoming url vars + * + * ============================================================================= + */ /* * 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++; - } - if(strtolower($f) != 'message-id:') { - parseEmail($s); /* Find and linkify emailaddresses except msgid */ - } - if (isset($f)) { - echo "$f$s"; - } - } - echo "
\n" . - ''; - sqimap_logout($imapConnection); - exit; + $template_vars = array(); + parse_viewheader($imapConnection,$passed_id, $passed_ent_id, &$template_vars); + $template_vars['return_address'] = set_url_var($PHP_SELF, 'view_hdr'); + view_header($template_vars, '', ''); + exit; } +if (isset($sendreceipt)) { + if ( !$message->is_mdnsent ) { + if (isset($identity) ) { + $final_recipient = getPref($data_dir, $username, 'email_address' . '0', '' ); + } else { + $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( $final_recipient, $message ) > 0 && $supportMDN ) { + ToggleMDNflag( true); + $message->is_mdnsent = true; + } + ClearAttachments(); + } +} + +/* ============================================================================= + * end block for handling incoming url vars + * + * ============================================================================= + */ + + if (isset($msgs)) { $currentArrayIndex = $passed_id; } else { $currentArrayIndex = -1; } - -for ($i = 0; $i < count($msgs); $i++) { - if ($msgs[$i]['ID'] == $passed_id) { - $msgs[$i]['FLAG_SEEN'] = true; - } -} - -/** - * $message contains all information about the message - * including header and body - */ -$message = sqimap_get_message($imapConnection, $passed_id, $mailbox); +$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; @@ -514,110 +479,79 @@ $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); -/** - * 3) Parse that into an array of addresses - */ -$url_replytoall_extra_addrs = parseAddrs($url_replytoall_extra_addrs); +$excl_arr = array(); /** - * 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)); - -/** - * 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 + * 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 = strtolower($cur_email_address); + $excl_ar[$cur_email_address] = ''; } } } -/** - * 7) Smoosh back into one nice line +/** + * 3) get the addresses. + */ +$url_replytoall_ar = $header->getAddr_a(array('from','to','cc'), $excl_ar); + +/** + * 4) generate the string. */ -$url_replytoallcc = getLineOfAddrs($url_replytoall_extra_addrs); +$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); /** - * 8) urlencode() it + * 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 = ''; +$messagebody = ''; + +/* first step in displaying multiple entities */ -/* experimental */ -/* -if ($message->header->type0 == 'multipart' && $message->header->type1 == 'digest') { - listEntities($message); - for ($i = 0; $i < count($message->entities); $i++) { - - $msg = $message->entities[$i]; - $body .= $msg->header->type0 .'/'.$msg->header->type1 .'
'; - - $msg->header->type0 = 'message'; - $msg->header->type1 = 'rfc822'; - $ent_ar = findDisplayEntity($msg, false); - for ($i = 0; $i < count($ent_ar); $i++) { - $body .= formatBody($imapConnection, $msg, $color, $wrap_at, $ent_ar[$i]); - } - $i++; - } -} else { -*/ - $ent_ar = findDisplayEntity($message, false); + $ent_ar = $message->findDisplayEntity(array()); $i = 0; for ($i = 0; $i < count($ent_ar); $i++) { - $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i]); + $messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox); } -/* -} -*/ - -/* first step in displaying multiple entities */ -$ent_ar = findDisplayEntity($message,true); + + +//$ent_ar = findDisplayEntity($message,true); $ent_num = $ent_ar[0]; for ($i = 1 ; $i < count($ent_ar); $i++) { @@ -635,6 +569,8 @@ if (!isset($show_more_bcc)) { $show_more_bcc = FALSE; } +$use_css = false; + /** FORMAT THE TO STRING **/ $to = formatRecipientString($message->header->to, "to"); $to_string = $to['str']; @@ -643,18 +579,18 @@ $url_to_string = $to['url_str']; /** FORMAT THE CC STRING **/ -$cc = formatRecipientString($message->header->cc, "cc"); +$cc = formatRecipientString($header->cc, "cc"); $cc_string = $cc['str']; $url_cc_string = $cc['url_str']; /** FORMAT THE BCC STRING **/ -$bcc = formatRecipientString($message->header->bcc, "bcc"); +$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. */ @@ -680,7 +616,14 @@ 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'); @@ -698,427 +641,412 @@ if (!empty($idents) && $idents > 1) { } } } +/* start of prepare html fase */ -do_hook('read_body_top'); -echo '
' . - '' . - '' . - '' . - ' '; - -/** from **/ -echo '' . - '' . - ''; -/** date **/ -echo '' . "\n" . - '' . "\n" . - '' . "\n"; - -/** to **/ -echo "\n" . - "' . "\n" . - '' . "\n"; -/** cc **/ +//echo '
' . - '' . - '' . - '' . - '' . - '' . - '
' . - '' . - '"; + $msgs_url .= 'search.php?where='.urlencode($where).'&pos='.$pos. + '&what='.urlencode($what).'&mailbox='.$urlMailbox; } else { - echo "right_main.php?sort=$sort&startMessage=$startMessage&mailbox=$urlMailbox\">"; + $msgs_url .= 'right_main.php?sort='.$sort.'&startMessage='. + $startMessage.'&mailbox='.$urlMailbox; } -echo _("Message List") . - ' | ' . - ' true),'rb_tbc','',array('align' => $lft, + 'width' => '33%')); + +$topbar_col->addChild('a', _("Message List"),'','','', + array('href' => $msgs_url)); + +$delete_url = $base_uri . 'src/delete_message.php?mailbox='.$urlMailbox. + '&message='.$passed_id.'&'; if ($where && $what) { - echo 'where=' . urlencode($where) . '&what=' . urlencode($what) . '">'; + $delete_url .= 'where=' . urlencode($where) . '&what=' . urlencode($what); } else { - echo "sort=$sort&startMessage=$startMessage\">"; + $delete_url .= 'sort='. $sort . '&startMessage='. $startMessage; } -echo _("Delete") . ' '; + +$topbar_col->htmlAdd($topbar_delimiter); +$topbar_col->addChild('a', _("Delete") ,'','','', + array('href' => $delete_url)); + if (($mailbox == $draft_folder) && ($save_as_draft)) { - $comp_uri = $base_uri . "src/compose.php?mailbox=$mailbox&". + $comp_alt_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") . ''; + "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"; + $comp_alt_string = _("Resume Draft"); } -if ($mailbox == $sent_folder) { - $comp_uri = $base_uri . "src/compose.php?mailbox=$mailbox&". +else if ($mailbox == $sent_folder) { + $comp_alt_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"; - + "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"; + $comp_alt_string = _("Edit Message as New"); +} +if (isset($comp_alt_uri)) { + $topbar_col->htmlAdd($topbar_delimiter); if ($compose_new_win == '1') { - echo "addChild('a', $comp_alt_string ,'','','', + array('href' => 'javascript:void(0)'), + array('onclick'=> 'comp_in_new(false,'.$comp_alt_uri.')')); } else { - echo '| addChild('a', $comp_alt_string ,'','','', + array('href' => $comp_alt_uri)); } - echo '>'. - _("Edit Message as New") . ''; } +$topbar_row->htmlAdd($topbar_col); -echo '  ' . - '' . - '' . - ''; +if (!(isset($where) && isset($what))) { + $topbar_col = new html('td','',array('small'=> true),'rb_tbc','',array('align' => 'center', + 'width' => '33%')); -if ( !($where && $what) ) { if ($currentArrayIndex == -1) { - echo 'Previous | Next'; + $topbar_col->addChild('',_("Previous")); + $topbar_col->htmlAdd($topbar_delimiter); + $topbar_col->addChild('',_("Next")); } else { - $prev = findPreviousMessage(); + $prev = findPreviousMessage($mbx_response['EXISTS']); $next = findNextMessage(); if ($prev != -1) { - echo '" . _("Previous") . " | "; + $uri = $base_uri . 'src/read_body.php?passed_id='.$prev. + '&mailbox='.$urlMailbox.'&sort='.$sort. + '&startMessage='.$startMessage.'&show_more=0'; + $topbar_col->addChild('a',_("Previous") , '','','', + array('href' => $uri)); } else { - echo _("Previous") . ' | '; + $topbar_col->addChild('',_("Previous")); } - + $topbar_col->htmlAdd($topbar_delimiter); if ($next != -1) { - echo '" . _("Next") . ""; + $uri = $base_uri . 'src/read_body.php?passed_id='.$next. + '&mailbox='.$urlMailbox.'&sort='.$sort. + '&startMessage='.$startMessage.'&show_more=0'; + $topbar_col->addChild('a',_("Next") ,'','','', + array('href' => $uri)); } else { - echo _("Next"); + $topbar_col->addChild('',_("Next")); } } + $topbar_row->htmlAdd($topbar_col); } -echo '' . - '' . - '' ; +$topbar_col = new html('td','',array('small'=>true),'rb_tbc','',array('align' => $rgt, + 'width' => '33%')); $comp_uri = $base_uri . "src/compose.php?forward_id=$passed_id&". "forward_subj=$url_subj&". - ($default_use_priority?"mailprio=$priority_level&":''). + ($default_use_priority?"mailprio=$priority_level&":''). "mailbox=$urlMailbox&ent_num=$ent_num"; - + if ($compose_new_win == '1') { - echo "addChild('a',_("Forward") ,'','','', + array('href' => 'javascript:void(0)'), + array('onclick'=> 'comp_in_new(false,'.$comp_uri.')')); } else { - echo '| addChild('a', _("Forward") ,'','','', + array('href' => $comp_uri)); } - echo '>'. - _("Forward") . - ' | '; - +$topbar_col->htmlAdd($topbar_delimiter); $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 "addChild('a',_("Reply") ,'','','', + array('href' => 'javascript:void(0)'), + array('onclick'=> 'comp_in_new(false,'.$comp_uri.')')); } else { - echo '| addChild('a', _("Reply") ,'','','', + array('href' => $comp_uri)); } - 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"; +$topbar_col->htmlAdd($topbar_delimiter); if ($compose_new_win == '1') { - echo "addChild('a',_("Reply All") ,'','','', + array('href' => 'javascript:void(0)'), + array('onclick'=> 'comp_in_new(false,'.$comp_uri.')')); } else { - echo '| addChild('a', _("Reply All") ,'','','', + array('href' => $comp_uri)); } - - echo '>'. - _("Reply All") . - '  ' . - '' . - '
' . - '
' . - '' . "\n" . - '' . "\n"; - -/** subject **/ -echo "\n" . - '
\n" . - _("Subject:") . - "\n" . - "$subject \n" . - "'. - '
'; + +/* read_body envelope */ + +/* init some formatting arrays */ +$use_css = false; +if (!$use_css) { + $ar_key = array( 'width' => '20%', + 'valign' => 'top', + 'bgcolor' => $color[0], + 'align' => 'right'); + + $ar_val = array( 'width' => '80%', + 'valign' => 'top', + 'bgcolor' => $color[0], + 'align' => 'left'); + $ar_table = array( 'width' => '100%', + 'cellpadding' => '0', + 'cellspacing' => '0', + 'border' => '0', + 'align' =>'center'); } else { - echo "startMessage=$startMessage&show_more=$show_more&view_hdr=1\">" . - _("View Full Header") . "\n"; -} - -/* Output the printer friendly link if we are in subtle mode. */ -if ($pf_subtle_link) { - echo printer_friendly_link(true); + $ar_key = ''; + $ar_val = ''; + $ar_table = array( 'cellpadding' => '0', + 'cellspacing' => '0'); } -do_hook("read_body_header_right"); -echo '
' . - _("From:") . - '' . - "$from_name \n"; - do_hook("read_body_after_from"); -echo '
' . "\n" . - _("Date:") . - "\n" . - "$dateString \n" . - '
\n" . - _("To:") . - '' . "\n" . - "$to_string \n" . - '
'; + +$envtable = new html('table','','','rb_env','',$ar_table); + +/* subject */ +$row_s = new html('tr','','','rb_r','rb_sc'); +$col = new html('td',_("Subject").': ','','rb_hk','rb_sk',$ar_key); +$row_s->htmlAdd($col); +$col = new html('td',$subject,array('b'=> true),'rb_hv','rb_sv', $ar_val); +$row_s->htmlAdd($col); +$envtable->htmlAdd($row_s); + +/* from */ +$row_f = new html('tr','','','rb_r','rb_fc'); +$col = new html('td',_("From").': ','','rb_hk','rb_fk', $ar_key); +$row_f->htmlAdd($col); +$col = new html('td',$from_name,array('b'=> true),'rb_hv','rb_fv',$ar_val); +$row_f->htmlAdd($col); +$envtable->htmlAdd($row_f); + +/* date */ +$row_d = new html('tr','','','rb_r','rb_dc'); +$col = new html('td',_("Date").': ','','rb_hk','rb_dk', $ar_key); +$row_d->htmlAdd($col); +$col = new html('td',$dateString,array('b'=> true),'rb_hv','rb_dv',$ar_val); +$row_d->htmlAdd($col); +$envtable->htmlAdd($row_d); + +/* to */ +$row_t = new html('tr','','','rb_r','rb_tc'); +$col = new html('td',_("To").': ','','rb_hk','rb_tk', $ar_key); +$row_t->htmlAdd($col); +$col = new html('td',$to_string,array('b'=> true),'rb_hv','rb_tv',$ar_val); +$row_t->htmlAdd($col); +$envtable->htmlAdd($row_t); + +/* cc */ if (isset($cc_string) && $cc_string <> '') { - echo '' . - "" . - 'Cc:' . - "" . - "$cc_string " . - '' . - '' . "\n"; + $row_c = new html('tr','','','rb_r','rb_cc'); + $col = new html('td',_("Cc").': ','','rb_hk','rb_ck', $ar_key); + $row_c->htmlAdd($col); + $col = new html('td',$cc_string,array('b'=> true),'rb_hv','rb_cv',$ar_val); + $row_c->htmlAdd($col); + $envtable->htmlAdd($row_c); } -/** bcc **/ +/* bcc */ if (isset($bcc_string) && $bcc_string <> '') { - echo ''. - "" . - 'Bcc:' . - "" . - "$bcc_string " . - '' . - '' . "\n"; + $row_b = new html('tr','','','rb_r','rb_bc'); + $col = new html('td',_("Bcc"). ': ','','rb_hk','rb_bk', $ar_key); + $row_b->htmlAdd($col); + $col = new html('td',$bcc_string,array('b'=> true),'rb_hv','rb_bv',$ar_val); + $row_b->htmlAdd($col); + $envtable->htmlAdd($row_b); } +/* priority */ if ($default_use_priority && isset($priority_string) && $priority_string <> '' ) { - echo '' . - "" . - _("Priority") . ': '. - "" . - "$priority_string " . - '' . - "" . "\n"; + $row_p = new html('tr','','','rb_r','rb_pc'); + $col = new html('td',_("Priority") . ': ','','rb_hk','rb_pk', $ar_key); + $row_p->htmlAdd($col); + $col = new html('td',$priority_string ,array('b'=> true),'rb_hv','rb_pv',$ar_val); + $row_p->htmlAdd($col); + $envtable->htmlAdd($row_p); } +/* xmailer */ 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 '' . - "" . - _("Mailer") . ': '. - "" . - "$mailer " . - '' . - "" . "\n"; + $row_xm = new html('tr','','','rb_r','rb_xmc'); + $col = new html('td',_("Mailer") . ': ','','rb_hk','rb_xmk', $ar_key); + $row_xm->htmlAdd($col); + $col = new html('td',$mailer ,array('b'=> true),'rb_hv','rb_xmv',$ar_val); + $row_xm->htmlAdd($col); + $envtable->htmlAdd($row_xm); } } -/* Output the printer friendly link if we are not in subtle mode. */ -if (!$pf_subtle_link) { - echo printer_friendly_link(true); -} - if ($default_use_mdn) { if ($mdn_user_support) { + if ($header->dnt) { + $row_mdn = new html('tr','','','rb_r','rb_mdnc'); + $col = new html('td',_("Read receipt") . ':','','rb_hk','rb_mdnk', $ar_key); + $row_mdn->htmlAdd($col); + if ($message->is_mdnsent) { + $mdn_string = _("send"); + } else { + $mdn_string = _("requested"); + global $draftfolder; + if ( !($mailbox == $draftfolder || $message->is_deleted)) { + $mdn_url = 'read_body.php?mailbox='.$mailbox.'&passed_id='. + $passed_id.'&startMessage='.$startMessage. + '&show_more='.$show_more.'&sendreceipt=1'; + if ($FirstTimeSee && $javascript_on) { + $script = 'if (window.confirm("' . + _("The message sender has requested a response to indicate that you have read this message. Would you like to send a receipt?") . + '")) { '."\n" . + ' window.open('.$mdn_url.',"right");' . "\n" . + '}' . "\n"; + $body->scriptAdd($script); + } + $mdn_link = new html('a','[' . _("Send read receipt now") . ']','','','', + array('href' => $mdn_url)); + } + } + $col = new html('td',$mdn_string , + array('b'=> true),'rb_hv','rb_mdnv',$ar_val); + if (isset($mdn_link)) { + $col->htmlAdd($mdn_link); + } + $row_mdn->htmlAdd($col); + $envtable->htmlAdd($row_mdn); + } + } +} + +//$envtable->echoHtml($use_css); + +$rb_tools_table = new html('table','','','rb_tools','',$ar_table); +$row = new html('tr','','','rb_rt','',array('width'=> '100%', + 'valign'=> 'top', + 'align'=> 'right', + 'nowrap')); +/* view header */ +$viewheader_url = $base_uri . 'src/read_body.php?mailbox=' . $urlMailbox . + '&passed_id='. $passed_id. '&'; +if ($where && $what) { + $viewheader_url .= 'where=' . urlencode($where) . '&what=' . urlencode($what) . + '&view_hdr=1'; +} else { + $viewheader_url .= 'startMessage=' .$startMessage. '&show_more='. + $show_more .'&view_hdr=1'; +} - // debug gives you the capability to remove mdn-flags - // $MDNDebug = 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); - $MDN_flag_present = preg_match( '/.*\$MDNSent/i', $read[0]); - - if (trim($MDN_to) && - (!isset( $sendreceipt ) || $sendreceipt == '' ) ) { - - if ( $MDN_flag_present && $supportMDN) { - $sendreceipt = 'removeMDN'; - $url = "\"read_body.php?mailbox=$mailbox&passed_id=$passed_id&startMessage=$startMessage&show_more=$show_more&sendreceipt=$sendreceipt\""; - $sendreceipt=''; - /* - if ($MDNDebug ) { - echo '' . - "" . - _("Read receipt") . ': ' . - "" . - '' . - _("send") . - " [" . _("Remove MDN flag") . '] ' . - '' . - '' . "\n"; - } else { - */ - echo '' . - "" . - _("Read receipt") . ': ' . - "" . - ''._("send").''. - '' . - '' . "\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 '' . - "" . - _("Read receipt") . ': '. - "" . - '' . _("requested") . "" . - '' . - '' . "\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 '' . - "" . - _("Read receipt") . ': ' . - "" . - '' . _("requested") . - "   [" . _("Send read receipt now") . "]" . - '' . - '' . "\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 '' . - "" . - _("Read receipt") . ': ' . - "" . - '' . _("requested") . "  " . '[' . - _("Send read receipt now") . '] ' ." \n" . - '' . - '' . "\n"; - $sendreceipt = ''; - } - } +$link = new html('a',_("View Full Header") .' | ','','','',array ( + 'href' => $viewheader_url)); +$col = new html('td','',array('small'=>true),'rb_ht','rb_vht'); +$col->htmlAdd($link); - if ( !isset( $sendreceipt ) || $sendreceipt == '' ) { - } else if ( $sendreceipt == 'send' ) { - if ( !$MDN_flag_present) { - if (isset($identity) ) { - $final_recipient = getPref($data_dir, $username, 'email_address' . '0', '' ); - } else { - $final_recipient = getPref($data_dir, $username, 'email_address', '' ); - } +/* Output the printer friendly link if we are in subtle mode. */ +if ($pf_subtle_link) { + $link = new html('span',printer_friendly_link(true),'','rb_ht','rb_pft'); + $col->htmlAdd($link); +} +$row->htmlAdd($col); - $final_recipient = trim($final_recipient); - if ($final_recipient == '' ) { - $final_recipient = getPref($data_dir, $username, 'email_address', '' ); - } +//do_hook("read_body_header_right"); - if ( SendMDN( $MDN_to, $final_recipient ) > 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 ($MDNDebug && $supportMDN) { - echo " \n" . - " \n" . - " "._("Read receipt").": \n". - " \n" . - ' '._("send").''." " . '[' . _("Remove MDN flag") . '] ' . "\n" . - ' ' . "\n" . - ' ' . "\n"; - } else { - */ - echo " \n" . - " \n" . - " "._("Read receipt").": \n". - " \n" . - ' '._("send").''. "\n" . - ' ' . "\n" . - ' ' . "\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 ''. - "" . - _("Read receipt") . ': ' . - "" . - '' . _("requested") . - "   [" . _("Send read receipt now") . "]" . - '' . - '' . "\n"; - $sendreceipt = ''; +$rb_tools_table->htmlAdd($row); - } - } +//$rb_tools_table->echoHtml($use_css); + +//do_hook('read_body_header'); + +if ($use_css) { + $ar_row = array('align'=>$lft); +} else { + $ar_row = array('align'=>$lft, 'bgcolor'=> $color[4]); } -do_hook('read_body_header'); -echo '' . - ' ' . - ''; -flush(); -echo "\n" . - "
\n" . - '
'; -echo $body; +$rb_message_table = new html('table','','','rb_body','',$ar_table); +$row_body = new html('tr','','','rb_bd','rb_bdr'); +$col_body = new html('td',$messagebody,array('br'=>false),'rb_bd','rb_bdr',$ar_row); +$row_body->htmlAdd($col_body); +$rb_message_table->htmlAdd($row_body); + +$row_body = new html('tr','','','rb_bd','rb_bdr'); +$attachements = formatAttachments($message,$ent_ar,$mailbox, $passed_id); +$col_body = new html('td',$attachements,array('br'=>false),'rb_bd','rb_bdr',$ar_row); +$row_body->htmlAdd($col_body); +$rb_message_table->htmlAdd($row_body); + +if ($use_css) { + $ar_row = array('align'=>$lft); +} else { + $ar_row = array('align'=>$lft, 'bgcolor'=> $color[4], 'cellpadding' =>3); +} + +$body->htmlAdd($top); +$body->htmlAdd($menu); +$body->htmlAdd($topbar); +$body->htmlAdd($envtable); +$body->htmlAdd($rb_tools_table); +$body->htmlAdd($rb_message_table); + +$page->html_el[0]->htmlAdd($head); +$page->html_el[0]->htmlAdd($body); + +$page->echoHtml(); + + -echo '
' . - '' . "\n" . - " " . - '
 
' . "\n"; /* show attached images inline -- if pref'fed so */ if (($attachment_common_show_images) && @@ -1132,21 +1060,18 @@ if (($attachment_common_show_images) && '&passed_ent_id=' . urlencode($img['ent_id']) . '&absolute_dl=true'; - echo "\n" . - '' . - '\n" . - "\n" . - "
' . - "\n" . - "
\n"; - + echo html_tag( 'table', "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', '' ."\n", 'left' + ) + ) , + 'center', '', 'cellspacing=0 border="0" cellpadding="2"'); } } -do_hook('read_body_bottom'); -do_hook('html_bottom'); +//do_hook('read_body_bottom'); +//do_hook('html_bottom'); sqimap_logout($imapConnection); ?> - - +