From 106d26632fc8afaa5aa19224175269cbb77e758c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 17 Jan 2017 12:51:02 +0100
Subject: [sysconfig] Handle invalid chars in logfile when doing
 htmlspecialchars()

---
 modules-available/systemstatus/page.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules-available/systemstatus/page.inc.php b/modules-available/systemstatus/page.inc.php
index bcce816b..59a69267 100644
--- a/modules-available/systemstatus/page.inc.php
+++ b/modules-available/systemstatus/page.inc.php
@@ -266,7 +266,7 @@ class Page_SystemStatus extends Page
 		} else {
 			$start = strpos($data, "\n") + 1;
 		}
-		echo '<pre>', htmlspecialchars(substr($data, $start)), '</pre>';
+		echo '<pre>', htmlspecialchars(substr($data, $start), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'), '</pre>';
 	}
 
 	protected function ajaxLdadpLog()
@@ -303,7 +303,7 @@ class Page_SystemStatus extends Page
 			} else {
 				$start = strpos($data, "\n") + 1;
 			}
-			echo '<pre>', htmlspecialchars(substr($data, $start)), '</pre>';
+			echo '<pre>', htmlspecialchars(substr($data, $start), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'), '</pre>';
 		}
 	}
 
@@ -319,7 +319,7 @@ class Page_SystemStatus extends Page
 		else
 			$data = 'Taskmanager error';
 
-		echo '<pre>', htmlspecialchars($data), '</pre>';
+		echo '<pre>', htmlspecialchars($data, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'), '</pre>';
 	}
 
 	protected function ajaxPsList()
@@ -334,7 +334,7 @@ class Page_SystemStatus extends Page
 		else
 			$data = 'Taskmanager error';
 
-		echo '<pre>', htmlspecialchars($data), '</pre>';
+		echo '<pre>', htmlspecialchars($data, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'), '</pre>';
 	}
 
 	private function usageColor($percent)
-- 
cgit v1.2.3-55-g7522