From e48f8945b32ab5b67f1cdeb53a37d3d196e31e4d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 20 May 2016 05:19:01 -0400
Subject: [PATCH] Fix bug where message list columns could be in wrong order after column drag-n-drop and list sorting
---
program/steps/utils/html2text.inc | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc
index f97e1c6..1115b3e 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, Roundcube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | 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. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Convert HTML message to plain text |
@@ -14,15 +17,23 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
-$converter = new html2text($HTTP_RAW_POST_DATA);
+$html = stream_get_contents(fopen('php://input', 'r'));
-header('Content-Type: text/plain; charset=UTF-8');
-print trim($converter->get_text());
+// strip slashes if magic_quotes enabled
+if (get_magic_quotes_gpc() || get_magic_quotes_runtime()) {
+ $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);
+
+$text = $RCMAIL->html2text($html, $params);
+
+header('Content-Type: text/plain; charset=' . RCUBE_CHARSET);
+print $text;
exit;
-
-
--
Gitblit v1.9.1