From bf82c47e980c5cec5b6d4f8d23d5dcbd1f702077 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Sun, 30 Jan 2022 10:46:47 -0300
Subject: [PATCH] Fix the wrong escaping on settings datatable (#2100)

* Fix the wrong escaping on settings datatable

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>

* Using utils escapeHtml function

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>

* Fix prettier

Signed-off-by: rdwebdesign <github@rdwebdesign.com.br>
---
 scripts/pi-hole/js/settings.js | 16 +++++++++++++++-
 settings.php                   |  3 ---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js
index 3663822f..2ace4551 100644
--- a/scripts/pi-hole/js/settings.js
+++ b/scripts/pi-hole/js/settings.js
@@ -268,9 +268,23 @@ $(function () {
       columnDefs: [
         { bSortable: false, orderable: false, targets: -1 },
         {
-          targets: [0, 1, 2],
+          targets: [0, 1],
           render: $.fn.dataTable.render.text(),
         },
+        {
+          targets: 2,
+          render: function (data) {
+            // Show "unknown", when host is "*"
+            var str;
+            if (data === "*") {
+              str = "<i>unknown</i>";
+            } else {
+              str = typeof data === "string" ? utils.escapeHtml(data) : data;
+            }
+
+            return str;
+          },
+        },
       ],
       paging: true,
       order: [[2, "asc"]],
diff --git a/settings.php b/settings.php
index ec75d9e8..ba933e09 100644
--- a/settings.php
+++ b/settings.php
@@ -595,9 +595,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "dns", "piho
                                         }
 
                                         $host = htmlentities($line[3]);
-                                        if ($host == "*") {
-                                            $host = "<i>unknown</i>";
-                                        }
 
                                         $clid = $line[4];
                                         if ($clid == "*") {