From acff900c5a3a7c89faaf1141eff706ec221a4dd3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 08 Oct 2008 04:42:59 -0400
Subject: [PATCH] #1485294: Add recipients address small validation

---
 bin/html2text.php |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/bin/html2text.php b/bin/html2text.php
index 0f0e6ae..6500d28 100644
--- a/bin/html2text.php
+++ b/bin/html2text.php
@@ -1,11 +1,30 @@
 <?php
+/*
+
+ +-----------------------------------------------------------------------+
+ | bin/html2text.php                                                     |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Convert HTML message to plain text                                  |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id$
+
+*/
 
 define('INSTALL_PATH', realpath('./../') . '/');
 require INSTALL_PATH.'program/include/iniset.php';
 
-$converter = new html2text($HTTP_RAW_POST_DATA);
+$converter = new html2text(html_entity_decode($HTTP_RAW_POST_DATA, ENT_COMPAT, 'UTF-8'));
 
 header('Content-Type: text/plain; charset=UTF-8');
-print html_entity_decode($converter->get_text(), ENT_COMPAT, 'UTF-8');
+print trim($converter->get_text());
 
 ?>

--
Gitblit v1.9.1