From 9e62a075232b8e2bfaf5916800c930353dff7f9b Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 23 Jul 2009 14:55:00 -0600 Subject: [PATCH] Use print CSS media to print messages in IMP (no more popup) --- imp/js/src/message.js | 29 +- imp/lib/IMP.php | 3 - imp/lib/Mime/Viewer/Html.php | 1 - imp/lib/UI/Message.php | 4 +- imp/message-mimp.php | 4 +- imp/message.php | 426 ++++++++++++++---------------- imp/templates/message/navbar_actions.html | 2 +- imp/themes/screen-dimp.css | 53 ---- imp/themes/screen.css | 55 ++++ imp/thread.php | 4 +- 10 files changed, 271 insertions(+), 310 deletions(-) diff --git a/imp/js/src/message.js b/imp/js/src/message.js index a38c28262..5dd2a0f1f 100644 --- a/imp/js/src/message.js +++ b/imp/js/src/message.js @@ -6,8 +6,6 @@ */ var ImpMessage = { - // The following variables are defined in message.php: - // printmode _arrowHandler: function(e) { @@ -128,25 +126,13 @@ var ImpMessage = { onDomLoad: function() { - if (!this.printmode) { - // Set up left and right arrows to go to the previous/next page. - document.observe('keydown', this._arrowHandler.bindAsEventListener(this)); - document.observe('change', this._changeHandler.bindAsEventListener(this)); - document.observe('click', this._clickHandler.bindAsEventListener(this)); - - if (Prototype.Browser.IE) { - this._messageActionsHover(); - } - } - }, + // Set up left and right arrows to go to the previous/next page. + document.observe('keydown', this._arrowHandler.bindAsEventListener(this)); + document.observe('change', this._changeHandler.bindAsEventListener(this)); + document.observe('click', this._clickHandler.bindAsEventListener(this)); - onLoad: function() - { - if (this.printmode) { - Event.observe(window, 'afterprint', function() { window.close(); }); - try { - window.print(); - } catch (e) {} + if (Prototype.Browser.IE) { + this._messageActionsHover(); } }, @@ -179,6 +165,8 @@ var ImpMessage = { this.submit('spam_report'); } else if (elt.hasClassName('notspamAction')) { this.submit('notspam_report'); + } else if (elt.hasClassName('printAction')) { + window.print(); } } else if (elt.hasClassName('unblockImageLink')) { IMP.unblockImages(e); @@ -197,4 +185,3 @@ var ImpMessage = { }; document.observe('dom:loaded', ImpMessage.onDomLoad.bind(ImpMessage)); -Event.observe(window, 'load', ImpMessage.onLoad.bind(ImpMessage)); diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php index ea0c6f4c7..9f4cedd00 100644 --- a/imp/lib/IMP.php +++ b/imp/lib/IMP.php @@ -34,9 +34,6 @@ class IMP /* IMP internal string used to separate indexes. */ const IDX_SEP = '\0'; - /* Are we currently in "print" mode? */ - static public $printMode = false; - /* Storage place for an altered version of the current URL. */ static public $newUrl = null; diff --git a/imp/lib/Mime/Viewer/Html.php b/imp/lib/Mime/Viewer/Html.php index 38d1e9ef6..421613cab 100644 --- a/imp/lib/Mime/Viewer/Html.php +++ b/imp/lib/Mime/Viewer/Html.php @@ -188,7 +188,6 @@ class IMP_Horde_Mime_Viewer_Html extends Horde_Mime_Viewer_Html /* Only display images if specifically allowed by user. */ if ($inline && - !IMP::$printMode && $GLOBALS['prefs']->getValue('html_image_replacement') && preg_match($this->_img_regex, $data)) { /* Make sure the URL parameters are correct for the current diff --git a/imp/lib/UI/Message.php b/imp/lib/UI/Message.php index d6300a825..ec58aecef 100644 --- a/imp/lib/UI/Message.php +++ b/imp/lib/UI/Message.php @@ -303,7 +303,7 @@ class IMP_UI_Message * * @return string String containing the formatted address list. */ - public function buildAddressLinks($addrlist, $addURL = null, $link = false) + public function buildAddressLinks($addrlist, $addURL = null, $link = true) { global $prefs, $registry; @@ -420,7 +420,7 @@ class IMP_UI_Message */ public function formatStatusMsg($data) { - if (empty($data) || IMP::$printMode) { + if (empty($data)) { return ''; } diff --git a/imp/message-mimp.php b/imp/message-mimp.php index 1bca22537..238014306 100644 --- a/imp/message-mimp.php +++ b/imp/message-mimp.php @@ -168,12 +168,12 @@ if (!empty($format_date)) { } /* Build From address links. */ -$display_headers['from'] = $imp_ui->buildAddressLinks($envelope['from']); +$display_headers['from'] = $imp_ui->buildAddressLinks($envelope['from'], false); /* Build To/Cc/Bcc links. */ foreach (array('to', 'cc', 'bcc') as $val) { $msgAddresses[] = $mime_headers->getValue($val); - $addr_val = $imp_ui->buildAddressLinks($envelope[$val]); + $addr_val = $imp_ui->buildAddressLinks($envelope[$val], false); if (!empty($addr_val)) { $display_headers[$val] = $addr_val; } diff --git a/imp/message.php b/imp/message.php index cc3ece3a2..656496d50 100644 --- a/imp/message.php +++ b/imp/message.php @@ -54,7 +54,7 @@ $user_identity = Identity::singleton(array('imp', 'imp')); /* Run through action handlers. */ $actionID = Horde_Util::getFormData('actionID'); -if ($actionID && ($actionID != 'print_message')) { +if ($actionID) { try { Horde::checkRequestToken('imp.message', Horde_Util::getFormData('message_token')); } catch (Horde_Exception $e) { @@ -87,10 +87,6 @@ case 'whitelist': } break; -case 'print_message': - IMP::$printMode = true; - break; - case 'delete_message': case 'undelete_message': if ($actionID == 'undelete_message') { @@ -249,37 +245,35 @@ if (!empty($format_date)) { } /* Build From address links. */ -$display_headers['from'] = $imp_ui->buildAddressLinks($envelope['from'], $self_link, !IMP::$printMode); +$display_headers['from'] = $imp_ui->buildAddressLinks($envelope['from'], $self_link); /* Add country/flag image. Try X-Originating-IP first, then fall back to the * sender's domain name. */ -if (!IMP::$printMode) { - $from_img = ''; - $origin_host = str_replace(array('[', ']'), '', $mime_headers->getValue('X-Originating-IP')); - if ($origin_host) { - if (!is_array($origin_host)) { - $origin_host = array($origin_host); - } - foreach ($origin_host as $host) { - $from_img .= Horde_Nls::generateFlagImageByHost($host) . ' '; - } - trim($from_img); +$from_img = ''; +$origin_host = str_replace(array('[', ']'), '', $mime_headers->getValue('X-Originating-IP')); +if ($origin_host) { + if (!is_array($origin_host)) { + $origin_host = array($origin_host); } - - if (empty($from_img) && !empty($envelope['from'])) { - $from_ob = reset($envelope['from']); - $from_img = Horde_Nls::generateFlagImageByHost($from_ob['host']); + foreach ($origin_host as $host) { + $from_img .= Horde_Nls::generateFlagImageByHost($host) . ' '; } + trim($from_img); +} - if (!empty($from_img)) { - $display_headers['from'] .= ' ' . $from_img; - } +if (empty($from_img) && !empty($envelope['from'])) { + $from_ob = reset($envelope['from']); + $from_img = Horde_Nls::generateFlagImageByHost($from_ob['host']); +} + +if (!empty($from_img)) { + $display_headers['from'] .= ' ' . $from_img; } /* Build To/Cc/Bcc links. */ foreach (array('to', 'cc', 'bcc') as $val) { $msgAddresses[] = $mime_headers->getValue($val); - $addr_val = $imp_ui->buildAddressLinks($envelope[$val], $self_link, !IMP::$printMode); + $addr_val = $imp_ui->buildAddressLinks($envelope[$val], $self_link); if (!empty($addr_val)) { $display_headers[$val] = $addr_val; } @@ -313,7 +307,7 @@ case 'low': } /* Build Reply-To address links. */ -$reply_to = $imp_ui->buildAddressLinks($envelope['reply-to'], $self_link, !IMP::$printMode); +$reply_to = $imp_ui->buildAddressLinks($envelope['reply-to'], $self_link); if (!empty($reply_to) && (!($from = $display_headers['from']) || ($from != $reply_to))) { $display_headers['reply-to'] = $reply_to; @@ -387,180 +381,178 @@ $view_link = IMP::generateIMPUrl('view.php', $imp_mbox['mailbox'], $index, $mail $imp_flags = IMP_Imap_Flags::singleton(); /* Everything below here is related to preparing the output. */ -if (!IMP::$printMode) { - /* Set the status information of the message. */ - $identity = $match_identity = $status = null; - - if (!empty($msgAddresses)) { - $identity = $match_identity = $user_identity->getMatchingIdentity($msgAddresses); - if (is_null($identity)) { - $identity = $user_identity->getDefault(); - } - } - $flag_parse = $imp_flags->parse(array( - 'div' => true, - 'flags' => $flags, - 'personal' => $match_identity - )); +/* Set the status information of the message. */ +$identity = $match_identity = $status = null; - foreach ($flag_parse as $val) { - if ($val['type'] == 'imapp') { - $status .= '' . htmlspecialchars($val['label']) . ''; - } else { - $status .= $val['div']; - } +if (!empty($msgAddresses)) { + $identity = $match_identity = $user_identity->getMatchingIdentity($msgAddresses); + if (is_null($identity)) { + $identity = $user_identity->getDefault(); } +} - /* If this is a search mailbox, display a link to the parent mailbox of the - * message in the header. */ - $h_page_label = htmlspecialchars($page_label); - $header_label = $h_page_label; - if ($imp_search->isSearchMbox($imp_mbox['mailbox'])) { - $header_label .= ' [' . Horde::link(Horde_Util::addParameter(Horde::applicationUrl('mailbox.php'), 'mailbox', $mailbox_name)) . IMP::displayFolder($mailbox_name) . ']'; - } +$flag_parse = $imp_flags->parse(array( + 'div' => true, + 'flags' => $flags, + 'personal' => $match_identity +)); - /* Prepare the navbar top template. */ - $t_template = new Horde_Template(); - $t_template->set('message_url', $message_url); - $t_template->set('form_input', Horde_Util::formInput()); - $t_template->set('mailbox', htmlspecialchars($imp_mbox['mailbox'])); - $t_template->set('thismailbox', htmlspecialchars($mailbox_name)); - $t_template->set('start', htmlspecialchars($msgindex)); - $t_template->set('index', htmlspecialchars($index)); - $t_template->set('label', sprintf(_("%s: %s"), $header_label, $shortsub)); - $t_template->set('msg_count', sprintf(_("(%d of %d)"), $msgindex, $imp_mailbox->getMessageCount())); - $t_template->set('status', $status); - $t_template->set('message_token', $message_token); - - /* Prepare the navbar navigate template. */ - $n_template = new Horde_Template(); - $n_template->setOption('gettext', true); - $n_template->set('readonly', $readonly); - $n_template->set('usepop', $use_pop); - $n_template->set('id', 1); - - if (!$use_pop) { - $n_template->set('mailbox', $imp_mbox['mailbox']); - - $tmp = $imp_flags->getFlagList($imp_mbox['mailbox']); - $n_template->set('flaglist_set', $tmp['set']); - $n_template->set('flaglist_unset', $tmp['unset']); - - if ($conf['user']['allow_folders']) { - $n_template->set('move', Horde::widget('#', _("Move to folder"), 'widget moveAction', '', '', _("Move"), true)); - $n_template->set('copy', Horde::widget('#', _("Copy to folder"), 'widget copyAction', '', '', _("Copy"), true)); - $n_template->set('options', IMP::flistSelect(array('heading' => _("This message to"), 'new_folder' => true, 'inc_tasklists' => true, 'inc_notepads' => true))); - } +foreach ($flag_parse as $val) { + if ($val['type'] == 'imapp') { + $status .= '' . htmlspecialchars($val['label']) . ''; + } else { + $status .= $val['div']; } +} + +/* If this is a search mailbox, display a link to the parent mailbox of the + * message in the header. */ +$h_page_label = htmlspecialchars($page_label); +$header_label = $h_page_label; +if ($imp_search->isSearchMbox($imp_mbox['mailbox'])) { + $header_label .= ' [' . Horde::link(Horde_Util::addParameter(Horde::applicationUrl('mailbox.php'), 'mailbox', $mailbox_name)) . IMP::displayFolder($mailbox_name) . ']'; +} - $n_template->set('back_to', Horde::widget($mailbox_url, sprintf(_("Back to %s"), $h_page_label), 'widget', '', '', sprintf(_("Bac_k to %s"), $h_page_label), true)); +/* Prepare the navbar top template. */ +$t_template = new Horde_Template(); +$t_template->set('message_url', $message_url); +$t_template->set('form_input', Horde_Util::formInput()); +$t_template->set('mailbox', htmlspecialchars($imp_mbox['mailbox'])); +$t_template->set('thismailbox', htmlspecialchars($mailbox_name)); +$t_template->set('start', htmlspecialchars($msgindex)); +$t_template->set('index', htmlspecialchars($index)); +$t_template->set('label', sprintf(_("%s: %s"), $header_label, $shortsub)); +$t_template->set('msg_count', sprintf(_("(%d of %d)"), $msgindex, $imp_mailbox->getMessageCount())); +$t_template->set('status', $status); +$t_template->set('message_token', $message_token); - $rtl = !empty(Horde_Nls::$config['rtl'][$language]); - if (Horde_Util::nonInputVar('prev_url')) { - $n_template->set('prev', Horde::link($prev_url, _("Previous Message"))); - $n_template->set('prev_img', Horde::img($rtl ? 'nav/right.png' : 'nav/left.png', $rtl ? '>' : '<', '', $registry->getImageDir('horde'))); - } else { - $n_template->set('prev_img', Horde::img($rtl ? 'nav/right-grey.png' : 'nav/left-grey.png', '', '', $registry->getImageDir('horde'))); - } +/* Prepare the navbar navigate template. */ +$n_template = new Horde_Template(); +$n_template->setOption('gettext', true); +$n_template->set('readonly', $readonly); +$n_template->set('usepop', $use_pop); +$n_template->set('id', 1); - if (Horde_Util::nonInputVar('next_url')) { - $n_template->set('next', Horde::link($next_url, _("Next Message"))); - $n_template->set('next_img', Horde::img($rtl ? 'nav/left.png' : 'nav/right.png', $rtl ? '<' : '>', '', $registry->getImageDir('horde'))); - } else { - $n_template->set('next_img', Horde::img($rtl ? 'nav/left-grey.png' : 'nav/right-grey.png', '', '', $registry->getImageDir('horde'))); - } +if (!$use_pop) { + $n_template->set('mailbox', $imp_mbox['mailbox']); - /* Prepare the navbar actions template. */ - $a_template = new Horde_Template(); - $a_template->setOption('gettext', true); - $a_template->set('readonly', $readonly); - $compose_params = array('index' => $index, 'identity' => $identity, 'thismailbox' => $mailbox_name); - if (!$prefs->getValue('compose_popup')) { - $compose_params += array('start' => $msgindex, 'mailbox' => $imp_mbox['mailbox']); - } + $tmp = $imp_flags->getFlagList($imp_mbox['mailbox']); + $n_template->set('flaglist_set', $tmp['set']); + $n_template->set('flaglist_unset', $tmp['unset']); - if (!$readonly) { - if (in_array('\\deleted', $flags)) { - $a_template->set('delete', Horde::widget(Horde_Util::addParameter($self_link, 'actionID', 'undelete_message'), _("Undelete"), 'widget', '', '', _("Undelete"), true)); - } else { - $a_template->set('delete', Horde::widget(Horde_Util::addParameter($self_link, 'actionID', 'delete_message'), _("Delete"), 'widget', '', ($use_pop) ? "return window.confirm('" . addslashes(_("Are you sure you wish to PERMANENTLY delete these messages?")) . "');" : '', _("_Delete"), true)); - } + if ($conf['user']['allow_folders']) { + $n_template->set('move', Horde::widget('#', _("Move to folder"), 'widget moveAction', '', '', _("Move"), true)); + $n_template->set('copy', Horde::widget('#', _("Copy to folder"), 'widget copyAction', '', '', _("Copy"), true)); + $n_template->set('options', IMP::flistSelect(array('heading' => _("This message to"), 'new_folder' => true, 'inc_tasklists' => true, 'inc_notepads' => true))); } +} - $disable_compose = !IMP::canCompose(); - - if (!$disable_compose) { - $a_template->set('reply', Horde::widget(IMP::composeLink(array(), array('actionID' => 'reply') + $compose_params), _("Reply"), 'widget hasmenu', '', '', _("_Reply"), true)); - $a_template->set('reply_sender', Horde::widget(IMP::composeLink(array(), array('actionID' => 'reply') + $compose_params), _("To Sender"), 'widget', '', '', _("To Sender"), true)); +$n_template->set('back_to', Horde::widget($mailbox_url, sprintf(_("Back to %s"), $h_page_label), 'widget', '', '', sprintf(_("Bac_k to %s"), $h_page_label), true)); - if ($list_info['reply_list']) { - $a_template->set('reply_list', Horde::widget(IMP::composeLink(array(), array('actionID' => 'reply_list') + $compose_params), _("To List"), 'widget', '', '', _("To _List"), true)); - } +$rtl = !empty(Horde_Nls::$config['rtl'][$language]); +if (Horde_Util::nonInputVar('prev_url')) { + $n_template->set('prev', Horde::link($prev_url, _("Previous Message"))); + $n_template->set('prev_img', Horde::img($rtl ? 'nav/right.png' : 'nav/left.png', $rtl ? '>' : '<', '', $registry->getImageDir('horde'))); +} else { + $n_template->set('prev_img', Horde::img($rtl ? 'nav/right-grey.png' : 'nav/left-grey.png', '', '', $registry->getImageDir('horde'))); +} - if (Horde_Mime_Address::addrArray2String(array_merge($envelope['to'], $envelope['cc']), array('filter' => array_keys($user_identity->getAllFromAddresses(true))))) { - $a_template->set('show_reply_all', Horde::widget(IMP::composeLink(array(), array('actionID' => 'reply_all') + $compose_params), _("To All"), 'widget', '', '', _("To _All"), true)); - } +if (Horde_Util::nonInputVar('next_url')) { + $n_template->set('next', Horde::link($next_url, _("Next Message"))); + $n_template->set('next_img', Horde::img($rtl ? 'nav/left.png' : 'nav/right.png', $rtl ? '<' : '>', '', $registry->getImageDir('horde'))); +} else { + $n_template->set('next_img', Horde::img($rtl ? 'nav/left-grey.png' : 'nav/right-grey.png', '', '', $registry->getImageDir('horde'))); +} - $a_template->set('forward', Horde::widget(IMP::composeLink(array(), array('actionID' => 'forward') + $compose_params), _("Forward"), 'widget', '', '', _("Fo_rward"), true)); +/* Prepare the navbar actions template. */ +$a_template = new Horde_Template(); +$a_template->setOption('gettext', true); +$a_template->set('readonly', $readonly); +$compose_params = array('index' => $index, 'identity' => $identity, 'thismailbox' => $mailbox_name); +if (!$prefs->getValue('compose_popup')) { + $compose_params += array('start' => $msgindex, 'mailbox' => $imp_mbox['mailbox']); +} - $a_template->set('redirect', Horde::widget(IMP::composeLink(array(), array('actionID' => 'redirect_compose') + $compose_params), _("Redirect"), 'widget', '', '', _("Redirec_t"), true)); +if (!$readonly) { + if (in_array('\\deleted', $flags)) { + $a_template->set('delete', Horde::widget(Horde_Util::addParameter($self_link, 'actionID', 'undelete_message'), _("Undelete"), 'widget', '', '', _("Undelete"), true)); + } else { + $a_template->set('delete', Horde::widget(Horde_Util::addParameter($self_link, 'actionID', 'delete_message'), _("Delete"), 'widget', '', ($use_pop) ? "return window.confirm('" . addslashes(_("Are you sure you wish to PERMANENTLY delete these messages?")) . "');" : '', _("_Delete"), true)); } +} - if (IMP::threadSortAvailable($imp_mbox['mailbox'])) { - $a_template->set('show_thread', Horde::widget(Horde_Util::addParameter(IMP::generateIMPUrl('thread.php', $imp_mbox['mailbox'], $index, $mailbox_name), array('start' => $msgindex)), _("View Thread"), 'widget', '', '', _("_View Thread"), true)); - } +$disable_compose = !IMP::canCompose(); - if ($registry->hasMethod('mail/blacklistFrom')) { - $a_template->set('blacklist', Horde::widget(Horde_Util::addParameter($self_link, 'actionID', 'blacklist'), _("Blacklist"), 'widget', '', '', _("_Blacklist"), true)); - } +if (!$disable_compose) { + $a_template->set('reply', Horde::widget(IMP::composeLink(array(), array('actionID' => 'reply') + $compose_params), _("Reply"), 'widget hasmenu', '', '', _("_Reply"), true)); + $a_template->set('reply_sender', Horde::widget(IMP::composeLink(array(), array('actionID' => 'reply') + $compose_params), _("To Sender"), 'widget', '', '', _("To Sender"), true)); - if ($registry->hasMethod('mail/whitelistFrom')) { - $a_template->set('whitelist', Horde::widget(Horde_Util::addParameter($self_link, 'actionID', 'whitelist'), _("Whitelist"), 'widget', '', '', _("_Whitelist"), true)); + if ($list_info['reply_list']) { + $a_template->set('reply_list', Horde::widget(IMP::composeLink(array(), array('actionID' => 'reply_list') + $compose_params), _("To List"), 'widget', '', '', _("To _List"), true)); } - if (!empty($conf['user']['allow_view_source'])) { - $a_template->set('view_source', $imp_contents->linkViewJS($imp_contents->getMIMEMessage(), 'view_source', _("_Message Source"), array('jstext' => _("Message Source"), 'css' => 'widget', 'widget' => true))); + if (Horde_Mime_Address::addrArray2String(array_merge($envelope['to'], $envelope['cc']), array('filter' => array_keys($user_identity->getAllFromAddresses(true))))) { + $a_template->set('show_reply_all', Horde::widget(IMP::composeLink(array(), array('actionID' => 'reply_all') + $compose_params), _("To All"), 'widget', '', '', _("To _All"), true)); } - if (!$disable_compose && - (!empty($conf['user']['allow_resume_all']) || - (!empty($conf['user']['allow_resume_all_in_drafts']) && - $mailbox_name == IMP::folderPref($prefs->getValue('drafts_folder'), true)) || - in_array('\\draft', $flags))) { - $a_template->set('resume', Horde::widget(IMP::composeLink(array(), array('actionID' => 'draft') + $compose_params), _("Resume"), 'widget', '', '', _("Resume"), true)); - } + $a_template->set('forward', Horde::widget(IMP::composeLink(array(), array('actionID' => 'forward') + $compose_params), _("Forward"), 'widget', '', '', _("Fo_rward"), true)); - $imp_params = IMP::getIMPMboxParameters($imp_mbox['mailbox'], $index, $mailbox_name); - $a_template->set('save_as', Horde::widget(Horde::downloadUrl($subject, array_merge(array('actionID' => 'save_message'), $imp_params)), _("Save as"), 'widget', '', '', _("Sa_ve as"), 2)); + $a_template->set('redirect', Horde::widget(IMP::composeLink(array(), array('actionID' => 'redirect_compose') + $compose_params), _("Redirect"), 'widget', '', '', _("Redirec_t"), true)); +} - $print_params = array_merge(array('actionID' => 'print_message'), $imp_params); - $a_template->set('print', Horde::widget(Horde_Util::addParameter(IMP::generateIMPUrl('message.php', $imp_mbox['mailbox']), $print_params), _("Print"), 'widget', '_blank', IMP::popupIMPString('message.php', $print_params) . 'return false;', _("_Print"), true)); +if (IMP::threadSortAvailable($imp_mbox['mailbox'])) { + $a_template->set('show_thread', Horde::widget(Horde_Util::addParameter(IMP::generateIMPUrl('thread.php', $imp_mbox['mailbox'], $index, $mailbox_name), array('start' => $msgindex)), _("View Thread"), 'widget', '', '', _("_View Thread"), true)); +} - if ($conf['spam']['reporting'] && - ($conf['spam']['spamfolder'] || - ($mailbox_name != IMP::folderPref($prefs->getValue('spam_folder'), true)))) { - $a_template->set('spam', Horde::widget('#', _("Report as Spam"), 'widget spamAction', '', '', _("Report as Spam"), true)); - } +if ($registry->hasMethod('mail/blacklistFrom')) { + $a_template->set('blacklist', Horde::widget(Horde_Util::addParameter($self_link, 'actionID', 'blacklist'), _("Blacklist"), 'widget', '', '', _("_Blacklist"), true)); +} - if ($conf['notspam']['reporting'] && - (!$conf['notspam']['spamfolder'] || - ($mailbox_name == IMP::folderPref($prefs->getValue('spam_folder'), true)))) { - $a_template->set('notspam', Horde::widget('#', _("Report as Innocent"), 'widget notspamAction', '', '', _("Report as Innocent"), true)); - } +if ($registry->hasMethod('mail/whitelistFrom')) { + $a_template->set('whitelist', Horde::widget(Horde_Util::addParameter($self_link, 'actionID', 'whitelist'), _("Whitelist"), 'widget', '', '', _("_Whitelist"), true)); +} - $a_template->set('redirect', Horde::widget(IMP::composeLink(array(), array('actionID' => 'redirect_compose') + $compose_params), _("Redirect"), 'widget', '', '', _("Redirec_t"), true)); +if (!empty($conf['user']['allow_view_source'])) { + $a_template->set('view_source', $imp_contents->linkViewJS($imp_contents->getMIMEMessage(), 'view_source', _("_Message Source"), array('jstext' => _("Message Source"), 'css' => 'widget', 'widget' => true))); +} - $a_template->set('headers', Horde::widget('#', _("Headers"), 'widget hasmenu', '', '', _("Headers"), true)); - if ($all_headers || $list_headers) { - $a_template->set('common_headers', Horde::widget($headersURL, _("Show Common Headers"), 'widget', '', '', _("Show Common Headers"), true)); - } - if (!$all_headers) { - $a_template->set('all_headers', Horde::widget(Horde_Util::addParameter($headersURL, 'show_all_headers', 1), _("Show All Headers"), 'widget', '', '', _("Show All Headers"), true)); - } - if ($list_info['exists'] && !$list_headers) { - $a_template->set('list_headers', Horde::widget(Horde_Util::addParameter($headersURL, 'show_list_headers', 1), _("Show Mailing List Information"), 'widget', '', '', _("Show Mailing List Information"), true)); - } +if (!$disable_compose && + (!empty($conf['user']['allow_resume_all']) || + (!empty($conf['user']['allow_resume_all_in_drafts']) && + $mailbox_name == IMP::folderPref($prefs->getValue('drafts_folder'), true)) || + in_array('\\draft', $flags))) { + $a_template->set('resume', Horde::widget(IMP::composeLink(array(), array('actionID' => 'draft') + $compose_params), _("Resume"), 'widget', '', '', _("Resume"), true)); +} + +$imp_params = IMP::getIMPMboxParameters($imp_mbox['mailbox'], $index, $mailbox_name); +$a_template->set('save_as', Horde::widget(Horde::downloadUrl($subject, array_merge(array('actionID' => 'save_message'), $imp_params)), _("Save as"), 'widget', '', '', _("Sa_ve as"), 2)); + +$a_template->set('print', Horde::widget('#', _("Print"), 'widget printAction', '', '', _("_Print"), true)); + +if ($conf['spam']['reporting'] && + ($conf['spam']['spamfolder'] || + ($mailbox_name != IMP::folderPref($prefs->getValue('spam_folder'), true)))) { + $a_template->set('spam', Horde::widget('#', _("Report as Spam"), 'widget spamAction', '', '', _("Report as Spam"), true)); +} + +if ($conf['notspam']['reporting'] && + (!$conf['notspam']['spamfolder'] || + ($mailbox_name == IMP::folderPref($prefs->getValue('spam_folder'), true)))) { + $a_template->set('notspam', Horde::widget('#', _("Report as Innocent"), 'widget notspamAction', '', '', _("Report as Innocent"), true)); +} + +$a_template->set('redirect', Horde::widget(IMP::composeLink(array(), array('actionID' => 'redirect_compose') + $compose_params), _("Redirect"), 'widget', '', '', _("Redirec_t"), true)); + +$a_template->set('headers', Horde::widget('#', _("Headers"), 'widget hasmenu', '', '', _("Headers"), true)); +if ($all_headers || $list_headers) { + $a_template->set('common_headers', Horde::widget($headersURL, _("Show Common Headers"), 'widget', '', '', _("Show Common Headers"), true)); +} +if (!$all_headers) { + $a_template->set('all_headers', Horde::widget(Horde_Util::addParameter($headersURL, 'show_all_headers', 1), _("Show All Headers"), 'widget', '', '', _("Show All Headers"), true)); +} +if ($list_info['exists'] && !$list_headers) { + $a_template->set('list_headers', Horde::widget(Horde_Util::addParameter($headersURL, 'show_list_headers', 1), _("Show Mailing List Information"), 'widget', '', '', _("Show Mailing List Information"), true)); } $hdrs = array(); @@ -592,8 +584,7 @@ $atc_parts = $display_ids = array(); $msgtext = ''; /* Do MDN processing now. */ -if (!IMP::$printMode && - $imp_ui->MDNCheck($imp_mbox['mailbox'], $index, $mime_headers, Horde_Util::getFormData('mdn_confirm'))) { +if ($imp_ui->MDNCheck($imp_mbox['mailbox'], $index, $mime_headers, Horde_Util::getFormData('mdn_confirm'))) { $msgtext .= $imp_ui->formatStatusMsg(array('text' => array(_("The sender of this message is requesting a Message Disposition Notification from you when you have read this message."), sprintf(_("Click %s to send the notification message."), Horde::link(htmlspecialchars(Horde_Util::addParameter($selfURL, 'mdn_confirm', 1))) . _("HERE") . '')))); } @@ -602,20 +593,16 @@ if ($show_parts == 'all') { $atc_parts = array_keys($parts_list); } +$part_info_display = array_merge($part_info_display, $part_info_action); $contents_mask = IMP_Contents::SUMMARY_BYTES | IMP_Contents::SUMMARY_SIZE | - IMP_Contents::SUMMARY_ICON; -if (IMP::$printMode) { - $contents_mask |= IMP_Contents::SUMMARY_DESCRIP_NOLINK; -} else { - $part_info_display = array_merge($part_info_display, $part_info_action); - $contents_mask |= IMP_Contents::SUMMARY_DESCRIP_LINK | - IMP_Contents::SUMMARY_DOWNLOAD | - IMP_Contents::SUMMARY_DOWNLOAD_ZIP | - IMP_Contents::SUMMARY_IMAGE_SAVE; - if (!$readonly && $strip_atc) { - $contents_mask |= IMP_Contents::SUMMARY_STRIP_LINK; - } + IMP_Contents::SUMMARY_ICON | + IMP_Contents::SUMMARY_DESCRIP_LINK | + IMP_Contents::SUMMARY_DOWNLOAD | + IMP_Contents::SUMMARY_DOWNLOAD_ZIP | + IMP_Contents::SUMMARY_IMAGE_SAVE; +if (!$readonly && $strip_atc) { + $contents_mask |= IMP_Contents::SUMMARY_STRIP_LINK; } /* Build body text. This needs to be done before we build the attachment list @@ -672,19 +659,17 @@ if (!strlen($msgtext)) { } /* Build the Attachments menu. */ -if (!IMP::$printMode) { - $a_template->set('atc', Horde::widget('#', _("Attachments"), 'widget hasmenu', '', '', _("Attachments"), true)); - if ($show_parts != 'all') { - $a_template->set('show_parts_all', Horde::widget(Horde_Util::addParameter($headersURL, array('show_parts' => 'all')), _("Show All Message Parts"), 'widget', '', '', _("Show All Message Parts"), true)); - } - if ($show_parts != 'atc') { - $a_template->set('show_parts_atc', Horde::widget(Horde_Util::addParameter($headersURL, array('show_parts' => 'atc')), _("Show Attachments Only"), 'widget', '', '', _("Show Attachments Only"), true)); - } - if (count($display_ids) > 2) { - $a_template->set('download_all', Horde::widget($imp_contents->urlView($imp_contents->getMIMEMessage(), 'download_all'), _("Download All Attachments (in .zip file)"), 'widget', '', '', _("Download All Attachments (in .zip file)"), true)); - if ($strip_atc) { - $a_template->set('strip_all', Horde::widget(htmlspecialchars(html_entity_decode(Horde_Util::addParameter(Horde_Util::removeParameter(Horde::selfUrl(true), array('actionID')), array('actionID' => 'strip_all', 'message_token' => $message_token)))), _("Strip All Attachments"), 'widget', '', "return window.confirm('" . addslashes(_("Are you sure you wish to PERMANENTLY delete all attachments?")) . "');", _("Strip All Attachments"), true)); - } +$a_template->set('atc', Horde::widget('#', _("Attachments"), 'widget hasmenu', '', '', _("Attachments"), true)); +if ($show_parts != 'all') { + $a_template->set('show_parts_all', Horde::widget(Horde_Util::addParameter($headersURL, array('show_parts' => 'all')), _("Show All Message Parts"), 'widget', '', '', _("Show All Message Parts"), true)); +} +if ($show_parts != 'atc') { + $a_template->set('show_parts_atc', Horde::widget(Horde_Util::addParameter($headersURL, array('show_parts' => 'atc')), _("Show Attachments Only"), 'widget', '', '', _("Show Attachments Only"), true)); +} +if (count($display_ids) > 2) { + $a_template->set('download_all', Horde::widget($imp_contents->urlView($imp_contents->getMIMEMessage(), 'download_all'), _("Download All Attachments (in .zip file)"), 'widget', '', '', _("Download All Attachments (in .zip file)"), true)); + if ($strip_atc) { + $a_template->set('strip_all', Horde::widget(htmlspecialchars(html_entity_decode(Horde_Util::addParameter(Horde_Util::removeParameter(Horde::selfUrl(true), array('actionID')), array('actionID' => 'strip_all', 'message_token' => $message_token)))), _("Strip All Attachments"), 'widget', '', "return window.confirm('" . addslashes(_("Are you sure you wish to PERMANENTLY delete all attachments?")) . "');", _("Strip All Attachments"), true)); } } @@ -702,21 +687,19 @@ if (!empty($atc_parts) && ($show_parts != 'none')) { foreach ($part_info as $val) { $tmp[] = '' . $summary[$val] . ''; } - if (!IMP::$printMode) { - $tmp[] = ''; - foreach ($part_info_action as $val) { - $tmp[] = $summary[$val]; - } - $tmp[] = ''; + $tmp[] = ''; + foreach ($part_info_action as $val) { + $tmp[] = $summary[$val]; } - $tmp[] = ''; + $tmp[] = ''; } $hdrs[] = array('name' => ($show_parts == 'all') ? _("Parts") : _("Attachments"), 'val' => '' . implode('', $tmp) . '
', 'i' => (++$i % 2)); } -if (IMP::$printMode && !empty($conf['print']['add_printedby'])) { - $hdrs[] = array('name' => _("Printed By"), 'val' => $user_identity->getFullname() ? $user_identity->getFullname() : Horde_Auth::getAuth(), 'i' => (++$i % 2)); +if (!empty($conf['print']['add_printedby'])) { + // TODO + //$hdrs[] = array('name' => _("Printed By"), 'val' => $user_identity->getFullname() ? $user_identity->getFullname() : Horde_Auth::getAuth(), 'i' => (++$i % 2)); } $m_template->set('headers', $hdrs); @@ -728,30 +711,23 @@ Horde::addScriptFile('effects.js', 'horde', true); Horde::addScriptFile('imp.js', 'imp', true); Horde::addScriptFile('message.js', 'imp', true); require IMP_TEMPLATES . '/common-header.inc'; -if (IMP::$printMode) { - Horde::addInlineScript('ImpMessage.printmode = true'); -} else { - if (!empty($conf['maillog']['use_maillog'])) { - IMP_Maillog::displayLog($envelope['message-id']); - } - IMP::menu(); - IMP::status(); - IMP::quota(); - - echo $t_template->fetch(IMP_TEMPLATES . '/message/navbar_top.html'); - echo $n_template->fetch(IMP_TEMPLATES . '/message/navbar_navigate.html'); - echo $a_template->fetch(IMP_TEMPLATES . '/message/navbar_actions.html'); +if (!empty($conf['maillog']['use_maillog'])) { + IMP_Maillog::displayLog($envelope['message-id']); } +IMP::menu(); +IMP::status(); +IMP::quota(); +echo $t_template->fetch(IMP_TEMPLATES . '/message/navbar_top.html'); +echo $n_template->fetch(IMP_TEMPLATES . '/message/navbar_navigate.html'); +echo $a_template->fetch(IMP_TEMPLATES . '/message/navbar_actions.html'); echo $m_template->fetch(IMP_TEMPLATES . '/message/message.html'); -if (!IMP::$printMode) { - $a_template->set('isbottom', true); - echo $a_template->fetch(IMP_TEMPLATES . '/message/navbar_actions.html'); +$a_template->set('isbottom', true); +echo $a_template->fetch(IMP_TEMPLATES . '/message/navbar_actions.html'); - $n_template->set('id', 2); - $n_template->set('isbottom', true); - echo $n_template->fetch(IMP_TEMPLATES . '/message/navbar_navigate.html'); -} +$n_template->set('id', 2); +$n_template->set('isbottom', true); +echo $n_template->fetch(IMP_TEMPLATES . '/message/navbar_navigate.html'); require $registry->get('templates', 'horde') . '/common-footer.inc'; diff --git a/imp/templates/message/navbar_actions.html b/imp/templates/message/navbar_actions.html index 908cc362a..2d7aff22e 100644 --- a/imp/templates/message/navbar_actions.html +++ b/imp/templates/message/navbar_actions.html @@ -1,4 +1,4 @@ - +
    diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css index 00fd35177..82b374c7c 100644 --- a/imp/themes/screen-dimp.css +++ b/imp/themes/screen-dimp.css @@ -1038,56 +1038,3 @@ span.readonlyImg { #Growler div.imp-forward, div.imp-redirect, span.imp-forward, span.imp-redirect { background-image: url("graphics/mail_forwarded.png"); } - - -/* Print CSS rules. */ -@media print { - body { - background: #fff; - } - - a, a:visited { - color: #000; - } - - #pageContainer { - margin-left: 20px; - margin-right: 20px; - } - - #dimpmain { - position: relative; - left: 0 !important; - margin-left: 0; - top: 0; - } - - #previewPane { - height: auto !important; - overflow: visible !important; - } - - #msgHeaders, .dispaddrlist { - display: block !important; - } - - .msgfullread .msgBody { - border-top: 1px solid silver; - } - - .label { - min-width: 60px; - text-align: right; - font-weight: bold; - } - - #msgHeadersColl, .context, .address img, .noprint, .mimeStatusMessage, .largeaddrlist, #msgAtc { - display: none !important; - } - - a.address { - left: 0; - padding: 0; - text-decoration: none; - } -} diff --git a/imp/themes/screen.css b/imp/themes/screen.css index 848120ea1..6688d1939 100644 --- a/imp/themes/screen.css +++ b/imp/themes/screen.css @@ -605,3 +605,58 @@ td.addressTr span.loadingImg { #itipconflicts tr.itipnearcollision { background-color: #ee0; } + + + + +/* Print CSS rules. */ +@media print { + body { + background: #fff; + } + + a, a:visited { + color: #000; + } + + #pageContainer { + margin-left: 20px; + margin-right: 20px; + } + + #dimpmain { + position: relative; + left: 0 !important; + margin-left: 0; + top: 0; + } + + #previewPane { + height: auto !important; + overflow: visible !important; + } + + #msgHeaders, .dispaddrlist { + display: block !important; + } + + .msgfullread .msgBody { + border-top: 1px solid silver; + } + + .label { + min-width: 60px; + text-align: right; + font-weight: bold; + } + + #msgHeadersColl, .context, .address img, .noprint, .mimeStatusMessage, .largeaddrlist, #msgAtc, table.msgActionTable, #messages h1.header, table.navbaractions { + display: none !important; + } + + a.address { + left: 0; + padding: 0; + text-decoration: none; + } +} diff --git a/imp/thread.php b/imp/thread.php index f44203c64..01882f7a4 100644 --- a/imp/thread.php +++ b/imp/thread.php @@ -104,11 +104,11 @@ foreach ($loop_array as $mbox => $idxlist) { if (IMP::isSpecialFolder($mbox)) { $curr_msg['addr_to'] = true; - $curr_msg['addr'] = _("To:") . ' ' . $imp_ui->buildAddressLinks($envelope['to'], Horde::selfUrl(true), true); + $curr_msg['addr'] = _("To:") . ' ' . $imp_ui->buildAddressLinks($envelope['to'], Horde::selfUrl(true)); $addr = _("To:") . ' ' . htmlspecialchars(Horde_Mime_Address::addrObject2String(reset($envelope['to'])), ENT_COMPAT, $charset); } else { $curr_msg['addr_to'] = false; - $curr_msg['addr'] = $imp_ui->buildAddressLinks($envelope['from'], Horde::selfUrl(true), true); + $curr_msg['addr'] = $imp_ui->buildAddressLinks($envelope['from'], Horde::selfUrl(true)); $addr = htmlspecialchars(Horde_Mime_Address::addrObject2String(reset($envelope['from'])), ENT_COMPAT, $charset); } -- 2.11.0