Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 13494)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 13495)
@@ -19,4 +19,5 @@
 """
 # XXX: All csv ops should move to a dedicated module soon
+import cgi
 import unicodecsv as csv
 import grok
@@ -1734,6 +1735,6 @@
             return
         try:
-            self.result = ''.join(
-                self.context.queryLogfiles(logname, query))
+            lines = self.context.queryLogfiles(logname, query)
+            self.result = ''.join([cgi.escape(line) for line in lines])
         except ValueError:
             self.flash(_('Invalid search expression.'), type='danger')
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 13494)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 13495)
@@ -1,2 +1,3 @@
+# -*- coding: utf-8 -*-
 ## $Id$
 ## 
@@ -114,4 +115,36 @@
         return
 
+    def test_logs_listed(self):
+        # existing logfiles are listed in logs overview
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        log_path = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'myspecial.log')
+        with open(log_path, "a") as fd:
+            fd.write("SOME FOO IN LOGFILE")
+        self.browser.open(self.datacenter_path + "/logs")
+        assert "myspecial.log" in self.browser.contents
+
+    def test_view_log(self):
+        # single logfiles can be watched (with filter regexp)
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        log_path = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'myspecial.log')
+        with open(log_path, "a") as fd:
+            fd.write("SOME FOO IN LOGFILE")
+        self.browser.open(
+            self.datacenter_path + "/@@show/?logname=myspecial.log&query=.*")
+        assert "SOME FOO IN LOGFILE" in self.browser.contents
+
+    def test_html_in_logs_escaped(self):
+        # HTML code in logfiles is escaped before output.
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        log_path = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'myspecial.log')
+        with open(log_path, "a") as fd:
+            fd.write("SOME <TAG> AND ÜMLÄUTS IN LOG")
+        self.browser.open(
+            self.datacenter_path + "/@@show/?logname=myspecial.log&query=.*")
+        assert "SOME &lt;TAG&gt; AND ÜMLÄUTS IN LOG" in self.browser.contents
+
     def test_file_download_delete(self):
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
