Merge branch 'master' into css-styling

techsneeze · May 7, 2021 · 9b887ef · 9b887ef
2 parents 2b7ebfa + 1e13d77
commit 9b887ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/dmarcts-report-viewer-report-list.php b/dmarcts-report-viewer-report-list.php
@@ -228,7 +228,7 @@ function tmpl_reportList($reports, $sort) {
 // Report Status
 // --------------------------------------------------------------------------
 if ( $report_status != "all" && $report_status != "" ) {
-	$where .= ( $where <> '' ? " AND" : " WHERE" ) . " " . $dmarc_result[$report_status]['status_sql_where'];
+	$where .= ( $where <> '' ? " AND" : " WHERE" ) . " " . $mysqli->real_escape_string($dmarc_result[$report_status]['status_sql_where']);
 }
 
 // Domains
@@ -272,10 +272,6 @@ function tmpl_reportList($reports, $sort) {
 			SELECT
 				SUM(rcount) AS rcount,
 				serial,
-				dkim_align,
-				spf_align,
-				dkimresult,
-				spfresult,
 				MIN(
 					(CASE
 						WHEN dkim_align = 'fail' THEN 0
@@ -345,8 +341,6 @@ function tmpl_reportList($reports, $sort) {
 	ON
 		report.serial = rptrecord.serial
 $where
-GROUP BY
-	serial
 ORDER BY
     " . $cookie_options['sort_column'] . ( $cookie_options['sort'] ? " ASC" : " DESC" )
 ;

diff --git a/dmarcts-report-viewer.php b/dmarcts-report-viewer.php
@@ -231,7 +231,7 @@ function html ($domains = array(), $orgs = array(), $periods = array() ) {
 // --------------------------------------------------------------------------
 configure();
 
-setcookie("dmarcts-options-tmp", "", "01 Jan 1970 00:00:00 UTC", "/");
+setcookie("dmarcts-options-tmp", "", time() - 3600, "/");
 
 // Make a MySQL Connection using mysqli
 // --------------------------------------------------------------------------