From 46f7b7096450939fe03c95aa81ce06ae4bfca89d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Mon, 28 Mar 2016 06:51:43 -0400 Subject: [PATCH] Enable reply/reply-all/forward buttons also in preview frame of message/rfc822 --- program/steps/utils/html2text.inc | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc index c6481b1..251eaf7 100644 --- a/program/steps/utils/html2text.inc +++ b/program/steps/utils/html2text.inc @@ -1,11 +1,11 @@ <?php -/* +/** +-----------------------------------------------------------------------+ | program/steps/utils/html2text.inc | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2012, The Roundcube Dev Team | + | Copyright (C) 2005-2015, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -19,13 +19,18 @@ +-----------------------------------------------------------------------+ */ -$html = $HTTP_RAW_POST_DATA; +$html = stream_get_contents(fopen('php://input', 'r')); -// Replace emoticon images with its text representation -$html = rcmail_replace_emoticons($html); +// strip slashes if magic_quotes enabled +if (get_magic_quotes_gpc() || get_magic_quotes_runtime()) { + $html = stripslashes($html); +} -$converter = new rcube_html2text($html, false, true, 0); +$params['links'] = (bool) rcube_utils::get_input_value('_do_links', rcube_utils::INPUT_GET); +$params['width'] = (int) rcube_utils::get_input_value('_width', rcube_utils::INPUT_GET); -header('Content-Type: text/plain; charset=UTF-8'); -print rtrim($converter->get_text()); +$text = $RCMAIL->html2text($html, $params); + +header('Content-Type: text/plain; charset=' . RCUBE_CHARSET); +print $text; exit; -- Gitblit v1.9.1