From a2cf7c41b97a587d90188b83e4d15da1567a54b4 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Wed, 09 Apr 2014 02:48:28 -0400 Subject: [PATCH] Fix accidental key replacements --- program/steps/utils/html2text.inc | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc index 486823f..c01443b 100644 --- a/program/steps/utils/html2text.inc +++ b/program/steps/utils/html2text.inc @@ -1,12 +1,15 @@ <?php -/* +/* +-----------------------------------------------------------------------+ | program/steps/utils/html2text.inc | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2010, The Roundcube Dev Team | - | Licensed under the GNU GPL | + | Copyright (C) 2005-2012, The Roundcube Dev Team | + | | + | Licensed under the GNU General Public License version 3 or | + | any later version with exceptions for skins & plugins. | + | See the README file for a full license statement. | | | | PURPOSE: | | Convert HTML message to plain text | @@ -14,20 +17,15 @@ +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | +-----------------------------------------------------------------------+ - - $Id$ - */ $html = $HTTP_RAW_POST_DATA; // Replace emoticon images with its text representation -$html = rcmail_replace_emoticons($html); +$html = $RCMAIL->replace_emoticons($html); -$converter = new html2text($html); +$converter = new rcube_html2text($html, false, true, 0); header('Content-Type: text/plain; charset=UTF-8'); print rtrim($converter->get_text()); exit; - - -- Gitblit v1.9.1