From ad7051f2e0a1539212dcdcd938bb8800247f58c9 Mon Sep 17 00:00:00 2001
From: ivan <ivan@opensupports.com>
Date: Mon, 11 Jun 2018 18:28:36 -0300
Subject: [PATCH] Remove htmlentities, use html-to-text

---
 client/package.json                          | 1 +
 client/src/app-components/ticket-info.js     | 5 +++--
 server/controllers/system/add-department.php | 2 +-
 server/controllers/ticket/create.php         | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/package.json b/client/package.json
index 1897e18a..fc459857 100644
--- a/client/package.json
+++ b/client/package.json
@@ -60,6 +60,7 @@
     "draft-js": "^0.10.0",
     "draft-js-export-html": "^0.5.2",
     "history": "^3.0.0",
+    "html-to-text": "^4.0.0",
     "jquery": "^2.1.4",
     "keycode": "^2.1.4",
     "localStorage": "^1.0.3",
diff --git a/client/src/app-components/ticket-info.js b/client/src/app-components/ticket-info.js
index 530f8c8d..439b6c88 100644
--- a/client/src/app-components/ticket-info.js
+++ b/client/src/app-components/ticket-info.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import _ from 'lodash';
+import htmlToText from 'html-to-text';
 
 import i18n from 'lib-app/i18n';
 import Icon from 'core-components/icon';
@@ -19,7 +20,7 @@ class TicketInfo extends React.Component {
                     </span>
                 </div>
                 <div className="ticket-info__description">
-                    {this.props.ticket.content}
+                    {htmlToText.fromString(this.props.ticket.content)}
                 </div>
 
                 <div className="ticket-info__author">
@@ -90,4 +91,4 @@ class TicketInfo extends React.Component {
     }
 }
 
-export default TicketInfo;
\ No newline at end of file
+export default TicketInfo;
diff --git a/server/controllers/system/add-department.php b/server/controllers/system/add-department.php
index 7ea0ee14..0d42846b 100755
--- a/server/controllers/system/add-department.php
+++ b/server/controllers/system/add-department.php
@@ -33,7 +33,7 @@ class AddDepartmentController extends Controller {
     }
 
     public function handler() {
-        $name = htmlentities(Controller::request('name'));
+        $name = Controller::request('name');
 
         $departmentInstance = new Department();
 
diff --git a/server/controllers/ticket/create.php b/server/controllers/ticket/create.php
index f04c1bbe..34f252a9 100755
--- a/server/controllers/ticket/create.php
+++ b/server/controllers/ticket/create.php
@@ -85,8 +85,8 @@ class CreateController extends Controller {
     }
 
     public function handler() {
-        $this->title = htmlentities(Controller::request('title'));
-        $this->content = htmlentities(Controller::request('content', true));
+        $this->title = Controller::request('title');
+        $this->content = Controller::request('content', true);
         $this->departmentId = Controller::request('departmentId');
         $this->language = Controller::request('language');
         $this->email = Controller::request('email');