From f60636930957e1ae65020422da7951824c1fb90e Mon Sep 17 00:00:00 2001
From: f0o <f0o@librenms.org>
Date: Wed, 10 Feb 2016 15:40:50 +0000
Subject: [PATCH] Bulk cosmetic fixes

---
 html/includes/dev-overview-data.inc.php     | 4 ++--
 html/includes/print-alerts.inc.php          | 2 +-
 html/includes/print-syslog.inc.php          | 4 ++--
 html/includes/reports/alert-log.pdf.inc.php | 2 +-
 html/includes/table/alertlog.inc.php        | 2 +-
 html/includes/table/eventlog.inc.php        | 2 +-
 html/includes/table/syslog.inc.php          | 2 +-
 html/pages/devices.inc.php                  | 2 +-
 html/pages/syslog.inc.php                   | 8 ++++----
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/html/includes/dev-overview-data.inc.php b/html/includes/dev-overview-data.inc.php
index 04c4de3dd..defeb6d44 100644
--- a/html/includes/dev-overview-data.inc.php
+++ b/html/includes/dev-overview-data.inc.php
@@ -68,14 +68,14 @@ if ($device['sysContact']) {
         <td>Contact</td>';
     if (get_dev_attrib($device, 'override_sysContact_bool')) {
         echo '
-        <td>'.htmlspecialchars(get_dev_attrib($device, 'override_sysContact_string')).'</td>
+        <td>'.get_dev_attrib($device, 'override_sysContact_string').'</td>
       </tr>
       <tr>
         <td>SNMP Contact</td>';
     }
 
     echo '
-        <td>'.htmlspecialchars($device['sysContact']).'</td>
+        <td>'.$device['sysContact'].'</td>
       </tr>';
 }
 
diff --git a/html/includes/print-alerts.inc.php b/html/includes/print-alerts.inc.php
index d9758a0f3..ac75278fb 100644
--- a/html/includes/print-alerts.inc.php
+++ b/html/includes/print-alerts.inc.php
@@ -15,7 +15,7 @@ if (!isset($alert_entry['device'])) {
         </td>';
 }
 
-echo '<td>'.htmlspecialchars($alert_entry['name']).'</td>';
+echo '<td>'.$alert_entry['name'].'</td>';
 
 if ($alert_state != '') {
     if ($alert_state == '0') {
diff --git a/html/includes/print-syslog.inc.php b/html/includes/print-syslog.inc.php
index 0f1c1c669..26a0d5b62 100644
--- a/html/includes/print-syslog.inc.php
+++ b/html/includes/print-syslog.inc.php
@@ -8,10 +8,10 @@ if (device_permitted($entry['device_id'])) {
     if ($vars['page'] != 'device') {
         $syslog_output .= '<td>'.$entry['date'].'</td>
                         <td><strong>'.generate_device_link($entry).'</strong></td>
-                        <td><strong>'.$entry['program'].' : </strong> '.htmlspecialchars($entry['msg']).'</td>';
+                        <td><strong>'.$entry['program'].' : </strong> '.$entry['msg'].'</td>';
     }
     else {
-        $syslog_output .= '<td><i>'.$entry['date'].'</i>&nbsp;&nbsp;&nbsp;<strong>'.$entry['program'].'</strong>&nbsp;&nbsp;&nbsp;'.htmlspecialchars($entry['msg']).'</td>';
+        $syslog_output .= '<td><i>'.$entry['date'].'</i>&nbsp;&nbsp;&nbsp;<strong>'.$entry['program'].'</strong>&nbsp;&nbsp;&nbsp;'.$entry['msg'].'</td>';
     }
 
     $syslog_output .= '</tr>';
diff --git a/html/includes/reports/alert-log.pdf.inc.php b/html/includes/reports/alert-log.pdf.inc.php
index d293b474b..13b13526d 100644
--- a/html/includes/reports/alert-log.pdf.inc.php
+++ b/html/includes/reports/alert-log.pdf.inc.php
@@ -66,7 +66,7 @@ foreach (dbFetchRows($full_query, $param) as $alert_entry) {
         $data[] = array(
             $alert_entry['time_logged'],
             $hostname,
-            htmlspecialchars($alert_entry['name']),
+            $alert_entry['name'],
             $text,
         );
     }//end if
diff --git a/html/includes/table/alertlog.inc.php b/html/includes/table/alertlog.inc.php
index 8b4d94d3e..3c41acb78 100644
--- a/html/includes/table/alertlog.inc.php
+++ b/html/includes/table/alertlog.inc.php
@@ -77,7 +77,7 @@ foreach (dbFetchRows($sql, $param) as $alertlog) {
         'time_logged' => $alertlog['humandate'],
         'details'     => '<a class="glyphicon glyphicon-plus incident-toggle" style="display:none" data-toggle="collapse" data-target="#incident'.($rulei).'" data-parent="#alerts"></a>',
         'hostname'    => '<div class="incident">'.generate_device_link($dev, shorthost($dev['hostname'])).'<div id="incident'.($rulei).'" class="collapse">'.$fault_detail.'</div></div>',
-        'alert'       => htmlspecialchars($alertlog['alert']),
+        'alert'       => $alertlog['alert'],
         'status'      => "<b><span class='glyphicon glyphicon-".$glyph_icon."' style='color:".$glyph_color."'></span> $text</b>",
     );
 }//end foreach
diff --git a/html/includes/table/eventlog.inc.php b/html/includes/table/eventlog.inc.php
index 62edbbefd..6390b0d0f 100644
--- a/html/includes/table/eventlog.inc.php
+++ b/html/includes/table/eventlog.inc.php
@@ -66,7 +66,7 @@ foreach (dbFetchRows($sql, $param) as $eventlog) {
         'datetime' => $eventlog['humandate'],
         'hostname' => generate_device_link($dev, shorthost($dev['hostname'])),
         'type'     => $type,
-        'message'  => htmlspecialchars($eventlog['message']),
+        'message'  => $eventlog['message'],
     );
 }
 
diff --git a/html/includes/table/syslog.inc.php b/html/includes/table/syslog.inc.php
index 987aac65a..bd80e7b5f 100644
--- a/html/includes/table/syslog.inc.php
+++ b/html/includes/table/syslog.inc.php
@@ -66,7 +66,7 @@ foreach (dbFetchRows($sql, $param) as $syslog) {
         'timestamp' => $syslog['date'],
         'device_id' => generate_device_link($dev, shorthost($dev['hostname'])),
         'program'   => $syslog['program'],
-        'msg'       => htmlspecialchars($syslog['msg']),
+        'msg'       => $syslog['msg'],
     );
 }
 
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 6d446d5c1..eb98e18ef 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -466,7 +466,7 @@ var grid = $("#devices").bootgrid({
         return {
             id: "devices",
             format: '<?php echo mres($vars['format']); ?>',
-            hostname: '<?php echo htmlspecialchars($vars['hostname']); ?>',
+            hostname: '<?php echo mres($vars['hostname']); ?>',
             os: '<?php echo mres($vars['os']); ?>',
             version: '<?php echo mres($vars['version']); ?>',
             hardware: '<?php echo mres($vars['hardware']); ?>',
diff --git a/html/pages/syslog.inc.php b/html/pages/syslog.inc.php
index bd708c175..d0a8f905d 100644
--- a/html/pages/syslog.inc.php
+++ b/html/pages/syslog.inc.php
@@ -81,10 +81,10 @@ var grid = $("#syslog").bootgrid({
     {
         return {
             id: "syslog",
-            device: '<?php echo htmlspecialchars($vars['device']); ?>',
-            program: '<?php echo htmlspecialchars($vars['program']); ?>',
-            to: '<?php echo htmlspecialchars($vars['to']); ?>',
-            from: '<?php echo htmlspecialchars($vars['from']); ?>',
+            device: '<?php echo $vars['device']; ?>',
+            program: '<?php echo $vars['program']; ?>',
+            to: '<?php echo $vars['to']; ?>',
+            from: '<?php echo $vars['from']; ?>',
         };
     },
     url: "ajax_table.php"