From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Fri, 05 Feb 2016 07:25:27 -0500 Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports --- program/steps/utils/html2text.inc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc index 90626e4..251eaf7 100644 --- a/program/steps/utils/html2text.inc +++ b/program/steps/utils/html2text.inc @@ -5,7 +5,7 @@ | 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. | @@ -26,11 +26,11 @@ $html = stripslashes($html); } -// Replace emoticon images with its text representation -$html = $RCMAIL->replace_emoticons($html); +$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); -$converter = new rcube_html2text($html, false, true, 0); +$text = $RCMAIL->html2text($html, $params); -header('Content-Type: text/plain; charset=UTF-8'); -print rtrim($converter->get_text()); +header('Content-Type: text/plain; charset=' . RCUBE_CHARSET); +print $text; exit; -- Gitblit v1.9.1