diff options
| author | jnew-gh <github@hazelden.ca> | 2021-05-07 14:59:30 +0300 |
|---|---|---|
| committer | jnew-gh <github@hazelden.ca> | 2021-05-07 14:59:30 +0300 |
| commit | 9b887ef625fcb923fb746a08a52ede5ce6fae356 (patch) | |
| tree | 1ab352c751c193862801be2970b4d7ed2a8fdc04 | |
| parent | 2b7ebfacb95aba32a3525884863a1f1e38fa71fe (diff) | |
| parent | 1e13d7784f621b1a2ed64354346ce8a7a07426cd (diff) | |
Merge branch 'master' into css-styling
| -rw-r--r-- | dmarcts-report-viewer-report-list.php | 8 | ||||
| -rw-r--r-- | dmarcts-report-viewer.php | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/dmarcts-report-viewer-report-list.php b/dmarcts-report-viewer-report-list.php index 50f15a6..1136af7 100644 --- a/dmarcts-report-viewer-report-list.php +++ b/dmarcts-report-viewer-report-list.php @@ -228,7 +228,7 @@ switch ($dmarc_select) { // 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 @@ FROM SELECT SUM(rcount) AS rcount, serial, - dkim_align, - spf_align, - dkimresult, - spfresult, MIN( (CASE WHEN dkim_align = 'fail' THEN 0 @@ -345,8 +341,6 @@ FROM 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 index 87b089e..180fee9 100644 --- a/dmarcts-report-viewer.php +++ b/dmarcts-report-viewer.php @@ -231,7 +231,7 @@ include "dmarcts-report-viewer-common.php"; // -------------------------------------------------------------------------- configure(); -setcookie("dmarcts-options-tmp", "", "01 Jan 1970 00:00:00 UTC", "/"); +setcookie("dmarcts-options-tmp", "", time() - 3600, "/"); // Make a MySQL Connection using mysqli // -------------------------------------------------------------------------- |