TLS reports

hMailAdmin/hm_tlsreports.php

@@ -7,7 +7,7 @@
 
 if (empty($hmail_config['tlsreport_enable'])) exit('<div class="box large"><h2>' . Translate("TLS reports") . '</h2><p class="warning" style="margin-top:18px;">' . Translate("TLS reports are not enabled in config.php") . '</p></div>') . PHP_EOL;
 
-$folder = './logs/tls';
+$folder = './logs/tls/';
 
 function get_reports($folder) {
 	global $hmail_config;
@@ -113,7 +113,7 @@ function save_json_attachment($inbox, $email_number, $part, $index, $folder) {
 
 
 /* Search directory for reports. */
-$new_report_count = get_reports();
+$new_report_count = get_reports($folder);
 $files = glob($folder . '*.json');
 $reports_count = count($files);
 if (!empty($files)) $reports = parse($files);
@@ -183,6 +183,7 @@ function parse($files){
 	<div class="box large">
 	  <h2><?php EchoTranslation("TLS reports") ?> <span>(<?php echo $reports_count ?>)</span></h2>
 <?php
+    $message = '';
 	if (!empty($new_report_count)) {
 		if (is_int($new_report_count)) {
 			$message = str_replace('#', $new_report_count, Translate('# new reports added.'));
@@ -193,9 +194,11 @@ function parse($files){
 		if (empty($reports))
 			$message = 'No reports.';
 	}
+	if ($message) {
 ?>
       <p class="warning" style="margin-top:18px;"><?php echo Translate($message); ?></p>
 <?php
+	}
 	$id = 0;
 	foreach( $reports as $report ) {
 		echo '<h3><a href="#">'.$report['domain'].' &#8211; '.$report['org'].' &#8211; '.date('Y-m-d', strtotime($report['date-range']['date-begin'])).'</a></h3>';

hMailAdmin/index.php

@@ -5,7 +5,8 @@
 header('X-Content-Type-Options: nosniff');
 header('X-Frame-Options: DENY');
 header('Content-Security-Policy: default-src \'none\'; script-src \'self\' \'unsafe-inline\'; connect-src \'self\'; img-src \'self\'; style-src \'self\' \'unsafe-inline\'; font-src \'self\' \'unsafe-inline\';');
-header('X-XSS-Protection: 1; mode=block');
+// https://github.com/OWASP/CheatSheetSeries/issues/376
+header('X-XSS-Protection: 0');
 
 if (!file_exists("config.php")) {
 	echo "Please rename config-dist.php to config.php. The file is found in the hMailAdmin root folder.";