From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names

---
 program/lib/Roundcube/rcube_text2html.php |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/program/lib/Roundcube/rcube_text2html.php b/program/lib/Roundcube/rcube_text2html.php
index 363f1b2..2ffe530 100644
--- a/program/lib/Roundcube/rcube_text2html.php
+++ b/program/lib/Roundcube/rcube_text2html.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2008-2014, The Roundcube Dev Team                       |
@@ -45,18 +45,24 @@
      */
     protected $config = array(
         // non-breaking space
-        'space'  => "\xC2\xA0",
+        'space' => "\xC2\xA0",
+        // word-joiner (zero-width no-break space)
+        // 'wordjoiner' => "\xEF\xBB\xBF", // U+2060
+        // use deprecated U+FEFF character because of webkit issue with displaying U+2060 (#1490353)
+        'wordjoiner' => "\xEF\xBB\xBF", // U+FEFF
         // enables format=flowed parser
         'flowed' => false,
         // enables wrapping for non-flowed text
-        'wrap'   => true,
+        'wrap' => true,
         // line-break tag
-        'break'  => "<br>\n",
+        'break' => "<br>\n",
         // prefix and suffix (wrapper element)
-        'begin'  => '<div class="pre">',
-        'end'    => '</div>',
+        'begin' => '<div class="pre">',
+        'end'   => '</div>',
         // enables links replacement
-        'links'  => true,
+        'links' => true,
+        // string replacer class
+        'replacer' => 'rcube_string_replacer',
     );
 
 
@@ -127,10 +133,8 @@
      */
     protected function _convert()
     {
-        $text = stripslashes($this->text);
-
         // Convert TXT to HTML
-        $this->html       = $this->_converter($text);
+        $this->html       = $this->_converter($this->text);
         $this->_converted = true;
     }
 
@@ -143,7 +147,7 @@
     {
         // make links and email-addresses clickable
         $attribs  = array('link_attribs' => array('rel' => 'noreferrer', 'target' => '_blank'));
-        $replacer = new rcmail_string_replacer($attribs);
+        $replacer = new $this->config['replacer']($attribs);
 
         if ($this->config['flowed']) {
             $flowed_char = 0x01;
@@ -278,6 +282,7 @@
         $text = strtr($text, $table);
 
         $nbsp = $this->config['space'];
+        $nobr = $this->config['wordjoiner'];
 
         // replace some whitespace characters
         $text = str_replace(array("\r", "\t"), array('', '    '), $text);
@@ -299,9 +304,15 @@
 
             $text = $copy;
         }
+        // make the whole line non-breakable
         else {
-            // make the whole line non-breakable
-            $text = str_replace(array(' ', '-', '/'), array($nbsp, '-&#8288;', '/&#8288;'), $text);
+            $repl = array(
+                ' ' => $nbsp,
+                '-' => $nobr . '-' . $nobr,
+                '/' => $nobr . '/',
+            );
+
+            $text = str_replace(array_keys($repl), array_values($repl), $text);
         }
 
         return $text;

--
Gitblit v1.9.1