X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=17e19fb3a5c383e3ce9be0ab14e73c766c85cf06;hp=09c41347ee2a2b9e322615fe859f63a7295902b3;hb=e0d7bbf4116047c6504f76e839adbd61557de722;hpb=47ccfad452e8d345542d09e59112cac317cffed8 diff --git a/src/read_body.php b/src/read_body.php index 09c41347..17e19fb3 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -6,30 +6,31 @@ * This file is used for reading the msgs array and displaying * the resulting emails in the right frame. * - * @copyright © 1999-2006 The SquirrelMail Project Team + * @copyright © 1999-2007 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail */ +/** This is the read_body page */ +define('PAGE_NAME', 'read_body'); + /** - * Path for SquirrelMail required files. - * @ignore + * Include the SquirrelMail initialization file. */ -define('SM_PATH','../'); +require('../include/init.php'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'include/validate.php'); -require_once(SM_PATH . 'functions/global.php'); require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/imap_asearch.php'); // => move to mailbox_display 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'); -require_once(SM_PATH . 'functions/global.php'); require_once(SM_PATH . 'functions/identity.php'); -include_once(SM_PATH . 'functions/arrays.php'); -include_once(SM_PATH . 'functions/mailbox_display.php'); +require_once(SM_PATH . 'functions/mailbox_display.php'); +require_once(SM_PATH . 'functions/forms.php'); +require_once(SM_PATH . 'functions/attachment_common.php'); +require_once(SM_PATH . 'functions/compose.php'); /** * Given an IMAP message id number, this will look it up in the cached @@ -73,46 +74,51 @@ function findPreviousMessage($uidset, $passed_id) { } } -/** - * Displays a link to a page where the message is displayed more - * "printer friendly". - * @param string $mailbox Name of current mailbox - * @param int $passed_id - */ -function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) { - global $javascript_on, $show_html_default; +function html_toggle_href ($mailbox, $passed_id, $passed_ent_id, $message) { + global $base_uri, $show_html_default; - /* hackydiehack */ - if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) { - $view_unsafe_images = false; + $has_html = false; + if ($message->header->type0 == 'message' && $message->header->type1 == 'rfc822') { + $type0 = $message->rfc822_header->content_type->type0; + $type1 = $message->rfc822_header->content_type->type1; } else { - $view_unsafe_images = true; + $type0 = $message->header->type0; + $type1 = $message->header->type1; } - $params = '?passed_ent_id=' . urlencode($passed_ent_id) . - '&mailbox=' . urlencode($mailbox) . - '&passed_id=' . urlencode($passed_id) . - '&view_unsafe_images='. (bool) $view_unsafe_images . - '&show_html_default=' . $show_html_default; - - $print_text = _("View Printable Version"); - - $result = ''; - /* Output the link. */ - if ($javascript_on) { - $result = '\n" . - "$print_text\n"; - } else { - $result = '$print_text\n"; + if($type0 == 'multipart' && + ($type1 == 'alternative' || $type1 == 'mixed' || $type1 == 'related' || $type1=='signed')) { + if ($message->findDisplayEntity(array(), array('text/html'), true)) { + $has_html = true; + } + } + /* + * Normal single part message so check its type. + */ + else { + if($type0 == 'text' && $type1 == 'html') { + $has_html = true; + } + } + if($has_html == true) { + $vars = array('passed_ent_id', 'show_more', 'show_more_cc', 'override_type0', 'override_type1', 'startMessage','where', 'what'); + + $new_link = $base_uri . 'src/read_body.php?passed_id=' . urlencode($passed_id) . + '&passed_ent_id=' . urlencode($passed_ent_id) . + '&mailbox=' . urlencode($mailbox); + foreach($vars as $var) { + if(sqgetGlobalVar($var, $temp)) { + $new_link .= '&' . $var . '=' . urlencode($temp); + } + } + + if($show_html_default == 1) { + $new_link .= '&show_html_default=0'; + } else { + $new_link .= '&show_html_default=1'; + } + return $new_link; } - return $result; + return ''; } function ServerMDNSupport($aFlags) { @@ -121,9 +127,8 @@ function ServerMDNSupport($aFlags) { in_array('\\*',$aFlags,true) ) ; } -function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { - global $username, $attachment_dir, $popuser, $username, $color, - $version, $squirrelmail_language, $default_charset, +function SendMDN ( $mailbox, $passed_id, $message, $imapConnection) { + global $squirrelmail_language, $default_charset, $languages, $useSendmail, $domain, $sent_folder; sqgetGlobalVar('SERVER_NAME', $SERVER_NAME, SQ_SERVER); @@ -140,38 +145,29 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { } $rfc822_header->content_type = $content_type; $rfc822_header->to[] = $header->dnt; - $rfc822_header->subject = _("Read:") . ' ' . encodeHeader($header->subject); - - // Patch #793504 Return Receipt Failing with <@> from Tim Craig (burny_md) - // This merely comes from compose.php and only happens when there is no - // email_addr specified in user's identity (which is the startup config) - if (ereg("^([^@%/]+)[@%/](.+)$", $username, $usernamedata)) { - $popuser = $usernamedata[1]; - $domain = $usernamedata[2]; - unset($usernamedata); - } else { - $popuser = $username; - } + $rfc822_header->subject = _("Read:") . ' ' . decodeHeader($header->subject,true,false); - $reply_to = ''; - $ident = get_identities(); - if(!isset($identity)) $identity = 0; - $full_name = $ident[$identity]['full_name']; - $from_mail = $ident[$identity]['email_address']; - $from_addr = '"'.$full_name.'" <'.$from_mail.'>'; - $reply_to = $ident[$identity]['reply_to']; - - if (!$from_mail) { - $from_mail = "$popuser@$domain"; - $from_addr = $from_mail; + $idents = get_identities(); + $needles = array(); + if ($header->to) { + foreach ($header->to as $message_to) { + $needles[] = $message_to->mailbox.'@'.$message_to->host; + } } + $identity = find_identity($needles); + $from_addr = build_from_header($identity); + $reply_to = isset($idents[$identity]['reply_to']) ? $idents[$identity]['reply_to'] : ''; + // FIXME: this must actually be the envelope address of the orginal message, + // but do we have that information? For now the first identity is our best guess. + $final_recipient = $idents[0]['email_address']; + $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 ); + $senton = getLongDateString( $header->date, $header->date_unparsed ); $to_array = $header->to; $to = ''; foreach ($to_array as $line) { @@ -220,11 +216,10 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $original_recipient = $to; $original_message_id = $header->message_id; - $report = "Reporting-UA : $SERVER_NAME ; SquirrelMail (version $version) \r\n"; + $report = "Reporting-UA : $SERVER_NAME ; SquirrelMail (version " . SM_VERSION . ") \r\n"; if ($original_recipient != '') { $report .= "Original-Recipient : $original_recipient\r\n"; } - $final_recipient = $sender; $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"; @@ -245,8 +240,16 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { if ($useSendmail) { require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php'); - global $sendmail_path; - $deliver = new Deliver_SendMail(); + global $sendmail_path, $sendmail_args; + // Check for outdated configuration + if (!isset($sendmail_args)) { + if ($sendmail_path=='/var/qmail/bin/qmail-inject') { + $sendmail_args = ''; + } else { + $sendmail_args = '-i -t'; + } + } + $deliver = new Deliver_SendMail(array('sendmail_args'=>$sendmail_args)); $stream = $deliver->initStream($composeMessage,$sendmail_path); } else { require_once(SM_PATH . 'class/deliver/Deliver_SMTP.class.php'); @@ -263,19 +266,22 @@ function SendMDN ( $mailbox, $passed_id, $sender, $message, $imapConnection) { $success = $deliver->finalizeStream($stream); } if (!$success) { - $msg = $deliver->dlv_msg . '
' . + $msg = _("Message not sent.") . "
\n" . + $deliver->dlv_msg; + if (! empty($deliver->dlv_server_msg)) { + $msg.= '
' . _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' ' . - $deliver->dlv_server_msg; - require_once(SM_PATH . 'functions/display_messages.php'); - plain_error_message($msg, $color); + nl2br(htmlspecialchars($deliver->dlv_server_msg)); + } + plain_error_message($msg); } else { unset ($deliver); if (sqimap_mailbox_exists ($imapConnection, $sent_folder)) { - sqimap_append ($imapConnection, $sent_folder, $length); + $sid = 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); + sqimap_append_done ($imapConnection, $sent_folder); unset ($imap_deliver); } } @@ -290,8 +296,8 @@ function ToggleMDNflag ($set ,$imapConnection, $mailbox, $passed_id) { } function formatRecipientString($recipients, $item ) { - global $show_more_cc, $show_more, $show_more_bcc, - $PHP_SELF; + global $show_more, $show_more_cc, $show_more_bcc, + $PHP_SELF, $oTemplate; $string = ''; if ((is_array($recipients)) && (isset($recipients[0]))) { @@ -320,24 +326,21 @@ function formatRecipientString($recipients, $item ) { } } - $cnt = count($recipients); - foreach($recipients as $r) { - $add = decodeHeader($r->getAddress(true)); - if ($string) { - $string .= '
' . $add; - } else { - $string = $add; - if ($cnt > 1) { - $string .= ' ('._("less").')'; - } else { - $string .= '">'._("more").')'; - break; - } - } - } + $a = array(); + foreach ($recipients as $r) { + $a[] = array( + 'Name' => htmlspecialchars($r->getAddress(false)), + 'Email' => htmlspecialchars($r->getEmail()), + 'Full' => htmlspecialchars($r->getAddress(true)) + ); } + + $oTemplate->assign('which_field', $item); + $oTemplate->assign('recipients', $a); + $oTemplate->assign('more_less_toggle_href', $url); + $oTemplate->assign('show_more', $show); + + $string = $oTemplate->fetch('read_recipient_list.tpl'); } return $string; } @@ -345,8 +348,8 @@ function formatRecipientString($recipients, $item ) { function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee) { global $default_use_mdn, $default_use_priority, - $show_xmailer_default, $mdn_user_support, $PHP_SELF, $javascript_on, - $squirrelmail_language; + $show_xmailer_default, $mdn_user_support, $PHP_SELF, + $squirrelmail_language, $oTemplate; $mailbox = $aMailbox['NAME']; @@ -361,67 +364,68 @@ function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message, $env[_("From")] = _("Unknown sender"); else $env[_("From")] = decodeHeader($from_name); - $env[_("Date")] = getLongDateString($header->date); + $env[_("Date")] = getLongDateString($header->date, $header->date_unparsed); $env[_("To")] = formatRecipientString($header->to, "to"); $env[_("Cc")] = formatRecipientString($header->cc, "cc"); $env[_("Bcc")] = formatRecipientString($header->bcc, "bcc"); if ($default_use_priority) { - $env[_("Priority")] = htmlspecialchars(getPriorityStr($header->priority)); + $oTemplate->assign('message_priority', $header->priority); + $env[_("Priority")] = $oTemplate->fetch('read_message_priority.tpl'); } if ($show_xmailer_default) { - $env[_("Mailer")] = decodeHeader($header->xmailer); + $oTemplate->assign('xmailer', decodeHeader($header->xmailer)); + $env[_("Mailer")] = $oTemplate->fetch('read_xmailer.tpl'); } + + // this is used for both mdn and also general use for plugins, etc + $oTemplate->assign('first_time_reading', $FirstTimeSee); + if ($default_use_mdn) { if ($mdn_user_support) { if ($header->dnt) { - if ($message->is_mdnsent) { - $env[_("Read receipt")] = _("sent"); - } else { - $env[_("Read receipt")] = _("requested"); - if (!(handleAsSent($mailbox) || - $message->is_deleted || - $passed_ent_id)) { - $mdn_url = $PHP_SELF . '&sendreceipt=1'; - if ($FirstTimeSee && $javascript_on) { - $script = ''. "\n"; - echo $script; - } - $env[_("Read receipt")] .= ' [' . - _("Send read receipt now") . ']'; - } - } + $mdn_url = $PHP_SELF; + $mdn_url = set_url_var($mdn_url, 'mailbox', urlencode($mailbox)); + $mdn_url = set_url_var($mdn_url, 'passed_id', $passed_id); + $mdn_url = set_url_var($mdn_url, 'passed_ent_id', $passed_ent_id); + $mdn_url = set_url_var($mdn_url, 'sendreceipt', 1); + + $oTemplate->assign('read_receipt_sent', $message->is_mdnsent); + $oTemplate->assign('send_receipt_href', $mdn_url); + + $env[_("Read Receipt")] = $oTemplate->fetch('read_handle_receipt.tpl'); } } } - $s = ''; - foreach ($env as $key => $val) { - if ($val) { - $s .= ''; - $s .= html_tag('td', '' . $key . ':  ', 'right', '', 'valign="top" width="20%"') . "\n"; - $s .= html_tag('td', $val, 'left', '', 'valign="top" width="80%"') . "\n"; - $s .= ''; + $statuses = array(); + if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS'])) { + if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\deleted']) && + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\deleted'] === true) { + $statuses[] = _("deleted"); + } + if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\answered']) && + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\answered'] === true) { + $statuses[] = _("answered"); + } + if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\draft']) && + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\draft'] === true) { + $statuses[] = _("draft"); + } + if (isset($aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\flagged']) && + $aMailbox['MSG_HEADERS'][$passed_id]['FLAGS']['\\flagged'] === true) { + $statuses[] = _("flagged"); + } + if ( count($statuses) ) { + $env[_("Status")] = implode(', ', $statuses); } } - echo '
'."\n"; - echo '
'."\n"; - echo $s; - do_hook('read_body_header'); - formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color); - echo '
'; - echo ''."\n"; - echo ''; + + $env[_("Options")] = formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color); + + + $oTemplate->assign('headers_to_display', $env); + + $oTemplate->display('read_headers.tpl'); } /** @@ -434,26 +438,22 @@ function formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message, * @param object $mbx_response */ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removedVar, $nav_on_top = TRUE) { - global $base_uri, $draft_folder, $where, $what, $color, $sort, + global $base_uri, $draft_folder, $where, $what, $sort, $startMessage, $PHP_SELF, $save_as_draft, $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox, - $username, $delete_prev_next_display, - $compose_new_win, $javascript_on, $compose_width, $compose_height; + $delete_prev_next_display, $show_copy_buttons, + $compose_new_win, $compose_width, $compose_height, + $oTemplate; //FIXME cleanup argument list, use $aMailbox where possible $mailbox = $aMailbox['NAME']; - $topbar_delimiter = ' | '; - $double_delimiter = '    '; $urlMailbox = urlencode($mailbox); - $msgs_url = $base_uri . 'src/'; - - // BEGIN NAV ROW - PREV/NEXT, DEL PREV/NEXT, LINKS TO INDEX, etc. - $nav_row = ''; - // Create Prev & Next links // Handle nested entities first (i.e. Mime Attach parts) + $prev_href = $next_href = $up_href = $del_href = $del_prev_href = $del_next_href = ''; + $msg_list_href = $search_href = $view_msg_href = ''; if (isset($passed_ent_id) && $passed_ent_id) { // code for navigating through attached message/rfc822 messages $url = set_url_var($PHP_SELF, 'passed_ent_id',0); @@ -463,111 +463,80 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed foreach($message->parent->entities as $ent) { if ($ent->type0 == 'message' && $ent->type1 == 'rfc822') { + $c++; $entity_count[$c] = $ent->entity_id; $entities[$ent->entity_id] = $c; } } - $prev_link = _("Previous"); if(isset($entities[$passed_ent_id]) && $entities[$passed_ent_id] > 1) { $prev_ent_id = $entity_count[$entities[$passed_ent_id] - 1]; - $prev_link = '' . $prev_link . ''; + $prev_href = set_url_var($PHP_SELF, 'passed_ent_id', $prev_ent_id); } - $next_link = _("Next"); if(isset($entities[$passed_ent_id]) && $entities[$passed_ent_id] < $c) { $next_ent_id = $entity_count[$entities[$passed_ent_id] + 1]; - $next_link = '' . $next_link . ''; + $next_href = set_url_var($PHP_SELF, 'passed_ent_id', $next_ent_id); } $par_ent_id = $message->parent->entity_id; - $up_link = ''; if ($par_ent_id) { $par_ent_id = substr($par_ent_id,0,-2); if ( $par_ent_id != 0 ) { - $up_link = $topbar_delimiter; - $url = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id); - $up_link .= ''._("Up").''; + $up_href = set_url_var($PHP_SELF, 'passed_ent_id',$par_ent_id); } } - $nav_row .= $prev_link . $up_link . $topbar_delimiter . $next_link; - $nav_row .= $double_delimiter . '['._("View Message").']'; + $view_msg_href = $url; // Prev/Next links for regular messages } else if ( true ) { //!(isset($where) && isset($what)) ) { $prev = findPreviousMessage($aMailbox['UIDSET'][$what], $passed_id); $next = findNextMessage($aMailbox['UIDSET'][$what],$passed_id); - $prev_link = _("Previous"); if ($prev >= 0) { - $uri = $base_uri . 'src/read_body.php?passed_id='.$prev. + $prev_href = $base_uri . 'src/read_body.php?passed_id='.$prev. '&mailbox='.$urlMailbox.'&sort='.$sort. "&where=$where&what=$what" . '&startMessage='.$startMessage.'&show_more=0'; - $prev_link = ''.$prev_link.''; } - $next_link = _("Next"); if ($next >= 0) { - $uri = $base_uri . 'src/read_body.php?passed_id='.$next. + $next_href = $base_uri . 'src/read_body.php?passed_id='.$next. '&mailbox='.$urlMailbox.'&sort='.$sort. "&where=$where&what=$what" . '&startMessage='.$startMessage.'&show_more=0'; - $next_link = ''.$next_link.''; } // Only bother with Delete & Prev and Delete & Next IF // top display is enabled. if ( $delete_prev_next_display == 1 && in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) { - $del_prev_link = _("Delete & Prev"); if ($prev >= 0) { - $uri = $base_uri . 'src/read_body.php?passed_id='.$prev. + $del_prev_href = $base_uri . 'src/read_body.php?passed_id='.$prev. '&mailbox='.$urlMailbox.'&sort='.$sort. '&startMessage='.$startMessage.'&show_more=0'. "&where=$where&what=$what" . '&delete_id='.$passed_id; - $del_prev_link = ''.$del_prev_link.''; } - $del_next_link = _("Delete & Next"); if ($next >= 0) { - $uri = $base_uri . 'src/read_body.php?passed_id='.$next. + $del_next_href = $base_uri . 'src/read_body.php?passed_id='.$next. '&mailbox='.$urlMailbox.'&sort='.$sort. '&startMessage='.$startMessage.'&show_more=0'. "&where=$where&what=$what" . '&delete_id='.$passed_id; - $del_next_link = ''.$del_next_link.''; } } - - $nav_row .= '['.$prev_link.$topbar_delimiter.$next_link.']'; - if ( isset($del_prev_link) && isset($del_next_link) ) - $nav_row .= $double_delimiter.'['.$del_prev_link.$topbar_delimiter.$del_next_link.']'; } // Start with Search Results or Message List link. - $msgs_url .= "$where?where=read_body.php&what=$what&mailbox=" . $urlMailbox. + $list_xtra = "?where=read_body.php&what=$what&mailbox=" . $urlMailbox. "&startMessage=$startMessage"; - if ($where == 'search.php') { - $msgs_str = _("Search Results"); - } else { - $msgs_str = _("Message List"); - } - $nav_row .= $double_delimiter . - '[' . $msgs_str . ']'; + $msg_list_href = $base_uri .'src/right_main.php'. $list_xtra; + $search_href = $where=='search.php' ? $base_uri .'src/search.php?'.$list_xtra : ''; - $nav_row .= ''; - - - // BEGIN MENU ROW - DELETE/REPLY/FORWARD/MOVE/etc. - $menu_row = ''; $comp_uri = $base_uri.'src/compose.php' . '?passed_id=' . $passed_id . '&mailbox=' . $urlMailbox . @@ -577,7 +546,7 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed // Start form for reply/reply all/forward.. $target = ''; $on_click=''; - $method='method="post" '; + $method='post'; $onsubmit=''; if ($compose_new_win == '1') { if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) { @@ -586,169 +555,175 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message, $removed if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) { $compose_height = '550'; } - if ( $javascript_on ) { - $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form,'. $compose_width .',' . $compose_height .')"'; + if ( checkForJavascript() ) { + $on_click='comp_in_new_form(\''.$comp_uri.'\', this, this.form,'. $compose_width .',' . $compose_height .')'; $comp_uri = 'javascript:void(0)'; - $method='method="get" '; - $onsubmit = 'onsubmit="return false" '; + $method='get'; + $onsubmit = 'return false'; } else { - $target = 'target="_blank"'; + $target = '_blank'; } } - $menu_row .= "\n".'
'."\n"; + $oTemplate->assign('nav_on_top', $nav_on_top); + + $oTemplate->assign('prev_href', $prev_href); + $oTemplate->assign('up_href', $up_href); + $oTemplate->assign('next_href', $next_href); + $oTemplate->assign('del_prev_href', $del_prev_href); + $oTemplate->assign('del_next_href', $del_next_href); + $oTemplate->assign('view_msg_href', $view_msg_href); + + $oTemplate->assign('message_list_href', $msg_list_href); + $oTemplate->assign('search_href', $search_href); + + $oTemplate->assign('form_extra', ''); + $oTemplate->assign('form_method', $method); + $oTemplate->assign('form_target', $target); + $oTemplate->assign('form_onsubmit', $onsubmit); + $oTemplate->assign('compose_href', $comp_uri); + $oTemplate->assign('button_onclick', $on_click); + $oTemplate->assign('forward_as_attachment_enabled', $enable_forward_as_attachment==1); + + //FIXME: I am surprised these aren't already given to the template; probably needs to be given at a higher level, so I have NO IDEA if this is the right place to do this... adding them so template can construct its own API calls... we can build those herein too if preferrable + $oTemplate->assign('mailbox', $aMailbox['NAME']); + $oTemplate->assign('passed_id', $passed_id); + $oTemplate->assign('what', $what); // If Draft folder - create Resume link + $resume_draft = $edit_as_new = false; if (($mailbox == $draft_folder) && ($save_as_draft)) { - $new_button = 'smaction_draft'; - $comp_alt_string = _("Resume Draft"); + $resume_draft = true; 'smaction_draft'; } else if (handleAsSent($mailbox)) { - // If in Sent folder, edit as new - $new_button = 'smaction_edit_new'; - $comp_alt_string = _("Edit Message as New"); + $edit_as_new = true; } - // Show Alt URI for Draft/Sent - if (isset($comp_alt_string)) - $menu_row .= getButton('submit', $new_button, $comp_alt_string, $on_click) . "\n"; - - $menu_row .= getButton('submit', 'smaction_reply', _("Reply"), $on_click) . "\n"; - $menu_row .= getButton('submit', 'smaction_reply_all', _("Reply All"), $on_click) ."\n"; - $menu_row .= getButton('submit', 'smaction_forward', _("Forward"), $on_click); - if ($enable_forward_as_attachment) - $menu_row .= '' . _("As Attachment") .'  '."\n"; + $oTemplate->assign('can_resume_draft', $resume_draft); + $oTemplate->assign('can_edit_as_new', $edit_as_new); - $menu_row .= '
 '; - - if ( in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) { - // Form for deletion. Form is handled by the originating display in $where. This is right_main.php or search.php + $oTemplate->assign('mailboxes', sqimap_mailbox_option_array($imapConnection)); + if (in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true)) { $delete_url = $base_uri . "src/$where"; - $menu_row .= '
'; - + $oTemplate->assign('can_be_deleted', true); + $oTemplate->assign('move_delete_form_action', $base_uri.'src/'.$where); + $oTemplate->assign('delete_form_extra', addHidden('mailbox', $aMailbox['NAME'])."\n" . + addHidden('msg[0]', $passed_id)."\n" . + addHidden('startMessage', $startMessage)."\n" ); if (!(isset($passed_ent_id) && $passed_ent_id)) { - $menu_row .= addHidden('mailbox', $aMailbox['NAME']); - $menu_row .= addHidden('msg[0]', $passed_id); - $menu_row .= addHidden('startMessage', $startMessage); - $menu_row .= getButton('submit', 'delete', _("Delete")); - $menu_row .= '' . _("Bypass Trash"); + $oTemplate->assign('can_be_moved', true); + $oTemplate->assign('move_form_extra', addHidden('mailbox', $aMailbox['NAME'])."\n" . + addHidden('msg[0]', $passed_id)."\n" ); + $oTemplate->assign('last_move_target', isset($lastTargetMailbox) && !empty($lastTargetMailbox) ? $lastTargetMailbox : ''); + $oTemplate->assign('can_be_copied', $show_copy_buttons==1); } else { - $menu_row .= getButton('submit', 'delete', _("Delete"), '', FALSE) . "\n"; // delete button is disabled + $oTemplate->assign('can_be_moved', false); + $oTemplate->assign('move_form_extra', ''); + $oTemplate->assign('last_move_target', ''); + $oTemplate->assign('can_be_copied', false); } - - $menu_row .= '
'; + } else { + $oTemplate->assign('can_be_deleted', false); + $oTemplate->assign('move_delete_form_action', ''); + $oTemplate->assign('delete_form_extra', ''); + $oTemplate->assign('can_be_moved', false); + $oTemplate->assign('move_form_extra', ''); + $oTemplate->assign('last_move_target', ''); + $oTemplate->assign('can_be_copied', false); } - // Add top move link - $menu_row .= ''; - if ( !(isset($passed_ent_id) && $passed_ent_id) && - in_array('\\deleted', $aMailbox['PERMANENTFLAGS'],true) ) { - - $menu_row .= '
'. - ''. - - addHidden('mailbox',$aMailbox['NAME']) . - addHidden('msg[0]', $passed_id) . _("Move to:") . - ' '; + global $null; + do_hook('read_body_menu', $null); - $menu_row .= getButton('submit', 'moveButton',_("Move")) . "\n" . ''; + if ($nav_on_top) { + $oTemplate->display('read_menubar_nav.tpl'); + $oTemplate->display('read_menubar_buttons.tpl'); + } else { + $oTemplate->display('read_menubar_buttons.tpl'); + $oTemplate->display('read_menubar_nav.tpl'); } - $menu_row .= ''; - // echo rows, with hooks - $ret = do_hook_function('read_body_menu_top', array($nav_row, $menu_row)); - if (is_array($ret)) { - if (isset($ret[0]) && !empty($ret[0])) { - $nav_row = $ret[0]; - } - if (isset($ret[1]) && !empty($ret[1])) { - $menu_row = $ret[1]; - } - } - echo ''; - echo $nav_on_top ? $nav_row . $menu_row : $menu_row . $nav_row; - echo '
'."\n"; - do_hook('read_body_menu_bottom'); } function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) { - global $base_uri, $where, $what; + global $base_uri, $where, $what, $show_html_default, + $oTemplate, $download_href, + $unsafe_image_toggle_href, $unsafe_image_toggle_text; $urlMailbox = urlencode($mailbox); $urlPassed_id = urlencode($passed_id); $urlPassed_ent_id = urlencode($passed_ent_id); $query_string = 'mailbox=' . $urlMailbox . '&passed_id=' . $urlPassed_id . '&passed_ent_id=' . $urlPassed_ent_id; - if (!empty($where)) { $query_string .= '&where=' . urlencode($where); } - if (!empty($what)) { $query_string .= '&what=' . urlencode($what); } - $url = $base_uri.'src/view_header.php?'.$query_string; - $s = "\n" . - html_tag( 'td', '', 'right', '', 'valign="middle" width="20%"' ) . '' . _("Options") . ":  \n" . - html_tag( 'td', '', 'left', '', 'valign="middle" width="80%"' ) . '' . - ''._("View Full Header").''; - - /* Output the printer friendly link if we are in subtle mode. */ - $s .= ' | ' . - printer_friendly_link($mailbox, $passed_id, $passed_ent_id); - echo $s; - do_hook("read_body_header_right"); - $s = "\n" . - "\n"; - echo $s; - -} -/** - * Creates button - * - * @deprecated see form functions available in 1.5.1 and 1.4.3. - * @param string $type - * @param string $name - * @param string $value - * @param string $js - * @param bool $enabled - */ -function getButton($type, $name, $value, $js = '', $enabled = TRUE) { - $disabled = ( $enabled ? '' : 'disabled ' ); - $js = ( $js ? $js.' ' : '' ); - return ''; + // Build the printer friend link + /* hackydiehack */ + if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) { + $view_unsafe_images = false; + } else { + $view_unsafe_images = true; + } + $pf_params = '?passed_ent_id=' . $urlPassed_ent_id . + '&mailbox=' . $urlMailbox . + '&passed_id=' . $urlPassed_id . + '&view_unsafe_images='. (bool) $view_unsafe_images . + '&show_html_default=' . $show_html_default; + $links = array(); + $links[] = array ( + 'URL' => $url, + 'Text' => _("View Full Header") + ); + $links[] = array ( + 'URL' => $pf_params, + 'Text' => _("View Printable Version") + ); + $links[] = array ( + 'URL' => $download_href, + 'Text' => _("Download this as a file") + ); + $toggle = html_toggle_href($mailbox, $passed_id, $passed_ent_id, $message); + if (!empty($toggle)) { + $links[] = array ( + 'URL' => $toggle, + 'Text' => $show_html_default==1 ? _("View as plain text") : _("View as HTML") + ); + } + if (!empty($unsafe_image_toggle_href)) { + $links[] = array ( + 'URL' => $unsafe_image_toggle_href, + 'Text' => $unsafe_image_toggle_text + ); + } + + do_hook('read_body_header_right', $links); + + $oTemplate->assign('links', $links); + + return $oTemplate->fetch('read_toolbar.tpl'); } - /***************************/ /* Main of read_body.php */ /***************************/ /* get the globals we may need */ -sqgetGlobalVar('key', $key, SQ_COOKIE); -sqgetGlobalVar('username', $username, SQ_SESSION); -sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); -sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION); if (!sqgetGlobalVar('messages', $messages, SQ_SESSION) ) { $messages = array(); } - +sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION); +if (is_array($delayed_errors)) { + $oErrorHandler->AssignDelayedErrors($delayed_errors); + sqsession_unregister("delayed_errors"); +} /** GET VARS */ sqgetGlobalVar('sendreceipt', $sendreceipt, SQ_GET); if (!sqgetGlobalVar('where', $where, SQ_GET) ) { @@ -795,15 +770,26 @@ if ( sqgetGlobalVar('startMessage', $temp) ) { } else { $startMessage = 1; } +if(sqgetGlobalVar('show_html_default', $temp)) { + $show_html_default = (int) $temp; +} + +if(sqgetGlobalVar('view_unsafe_images', $temp)) { + $view_unsafe_images = (int) $temp; + if($view_unsafe_images == 1) { + $show_html_default = 1; + } +} else { + $view_unsafe_images = 0; +} /** * Retrieve mailbox cache */ sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION); /* end of get globals */ -global $sqimap_capabilities, $lastTargetMailbox; -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); +$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0); $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mailbox,array('setindex' => $what, 'offset' => $startMessage),array()); @@ -818,6 +804,7 @@ $aMailbox = sqm_api_mailbox_select($imapConnection, $iAccount, $mailbox,array('s /** * Replace From => To in case it concerns a draft or sent folder */ +$aColumns = array(); if (($mailbox == $sent_folder || $mailbox == $draft_folder) && !in_array(SQM_COL_TO,$index_order)) { $aNewOrder = array(); // nice var name ;) @@ -825,11 +812,12 @@ if (($mailbox == $sent_folder || $mailbox == $draft_folder) && if ($iCol == SQM_COL_FROM) { $iCol = SQM_COL_TO; } - $aNewOrder[] = $iCol; + $aColumns[$iCol] = array(); } - $aColumns = $aNewOrder; } else { - $aColumns = $index_order; + foreach ($index_order as $iCol) { + $aColumns[$iCol] = array(); + } } $aProps = array( @@ -891,10 +879,14 @@ if (isset($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'])) { } else { $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); $FirstTimeSee = !$message->is_seen; - $message->is_seen = true; - $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message; } +/** + * update message seen status and put in cache + */ +$message->is_seen = true; +$aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message; + if (isset($passed_ent_id) && $passed_ent_id) { $message = $message->getEntity($passed_ent_id); if ($message->type0 != 'message' && $message->type1 != 'rfc822') { @@ -914,8 +906,6 @@ if (isset($passed_ent_id) && $passed_ent_id) { } $header = $message->header; -$header = $message->header; - /****************************************/ /* Block for handling incoming url vars */ @@ -923,13 +913,8 @@ $header = $message->header; if (isset($sendreceipt)) { if ( !$message->is_mdnsent ) { - $final_recipient = ''; - if ((isset($identity)) && ($identity != 0)) //Main identity - $final_recipient = trim(getPref($data_dir, $username, 'email_address' . $identity, '' )); - if ($final_recipient == '' ) - $final_recipient = trim(getPref($data_dir, $username, 'email_address', '' )); $supportMDN = ServerMDNSupport($aMailbox["PERMANENTFLAGS"]); - if ( SendMDN( $mailbox, $passed_id, $final_recipient, $message, $imapConnection ) > 0 && $supportMDN ) { + if ( SendMDN( $mailbox, $passed_id, $message, $imapConnection ) > 0 && $supportMDN ) { ToggleMDNflag( true, $imapConnection, $mailbox, $passed_id); $message->is_mdnsent = true; $aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT'] = $message; @@ -940,10 +925,8 @@ if (isset($sendreceipt)) { /* End of block for handling incoming url vars */ /***********************************************/ - - $messagebody = ''; -do_hook('read_body_top'); +do_hook('read_body_top', $null); if ($show_html_default == 1) { $ent_ar = $message->findDisplayEntity(array()); } else { @@ -953,55 +936,29 @@ $cnt = count($ent_ar); for ($i = 0; $i < $cnt; $i++) { $messagebody .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox); if ($i != $cnt-1) { - $messagebody .= '
'; + $messagebody .= '
'; } } +/** + * Write mailbox with updated seen flag information back to cache. + */ +$mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; +sqsession_register($mailbox_cache,'mailbox_cache'); +$_SESSION['mailbox_cache'] = $mailbox_cache; + displayPageHeader($color, $mailbox,'',''); formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message,false); formatEnvheader($aMailbox, $passed_id, $passed_ent_id, $message, $color, $FirstTimeSee); -echo ''; -echo ' '; - -echo ''."\n"; - -$attachmentsdisplay = formatAttachments($message,$ent_ar,$mailbox, $passed_id); -if ($attachmentsdisplay) { - echo '
'; -echo ' '; -echo ' '; -echo '
'; -echo ' '; -echo ' '; -echo '
'; -// echo ' '; -echo html_tag( 'table' ,'' , 'left', '', 'width="100%" cellpadding="1" cellspacing="5" border="0"' ); -echo ' ' . html_tag( 'td', '
'. $messagebody."\n", 'left') - . ''; -echo '
'; -echo '
'; -echo '
'; - echo ' '; - echo ' '; - echo ''; -} -echo '
'; - echo ' '; - echo ' ' . html_tag( 'td', '', 'left', $color[9] ); - echo ' ' . _("Attachments") . ':'; - echo ' '; - echo '
'; - echo '
'; - echo $attachmentsdisplay; - echo '
'; - echo '
'; - echo '
'; + +$oTemplate->assign('message_body', $messagebody); +$oTemplate->display('read_message_body.tpl'); + +formatAttachments($message,$ent_ar,$mailbox, $passed_id); /* show attached images inline -- if pref'fed so */ -if (($attachment_common_show_images) && - is_array($attachment_common_show_images_list)) { +if ($attachment_common_show_images && is_array($attachment_common_show_images_list)) { + $images = array(); foreach ($attachment_common_show_images_list as $img) { $imgurl = SM_PATH . 'src/download.php' . '?' . @@ -1009,26 +966,19 @@ if (($attachment_common_show_images) && '&mailbox=' . urlencode($mailbox) . '&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"'); + $a = array(); + $a['Name'] = $img['name']; + $a['DisplayURL'] = $imgurl; + $a['DownloadURL'] = $img['download_href']; + $images[] = $a; } + + $oTemplate->assign('images', $images); + $oTemplate->display('read_display_images_inline.tpl'); } formatMenuBar($aMailbox, $passed_id, $passed_ent_id, $message, false, FALSE); -do_hook('read_body_bottom'); +do_hook('read_body_bottom', $null); sqimap_logout($imapConnection); - -/** - * Write mailbox with updated seen flag information back to cache. - */ -$mailbox_cache[$iAccount.'_'.$aMailbox['NAME']] = $aMailbox; -sqsession_register($mailbox_cache,'mailbox_cache'); - -?> - +$oTemplate->display('footer.tpl');