diff options
author | Julian0815 <37510054+Julian0815@users.noreply.github.com> | 2018-03-26 12:20:41 +0300 |
---|---|---|
committer | Julian0815 <37510054+Julian0815@users.noreply.github.com> | 2018-03-26 12:20:41 +0300 |
commit | 063f232ba87958cd44198d3ab5ead834446b484b (patch) | |
tree | 17b666a5ccbf1fa2ead784fd174fc620ba1940b9 | |
parent | 81eea881167628148120cef34bf3e550a0e223bc (diff) |
Fix handling of NULL in spfresult and dkimresult
-rw-r--r-- | dmarcts-report-viewer.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dmarcts-report-viewer.php b/dmarcts-report-viewer.php index 41b99af..7ee2849 100644 --- a/dmarcts-report-viewer.php +++ b/dmarcts-report-viewer.php @@ -472,7 +472,7 @@ if( $sortorder ) { // Include the rcount via left join, so we do not have to make an sql query // for every single report. // -------------------------------------------------------------------------- -$sql = "SELECT report.* , sum(rptrecord.rcount) AS rcount, MIN(rptrecord.dkimresult) AS dkimresult, MIN(rptrecord.spfresult) AS spfresult FROM `report` LEFT JOIN rptrecord ON report.serial = rptrecord.serial $where GROUP BY serial ORDER BY mindate $sort,maxdate $sort ,org"; +$sql = "SELECT report.* , sum(rptrecord.rcount) AS rcount, MIN(rptrecord.dkimresult) AS dkimresult, MIN(rptrecord.spfresult) AS spfresult FROM report LEFT JOIN (SELECT rcount, COALESCE(dkimresult, 'neutral') AS dkimresult, COALESCE(spfresult, 'neutral') AS spfresult, serial FROM rptrecord) AS rptrecord ON report.serial = rptrecord.serial $where GROUP BY serial ORDER BY mindate $sort, maxdate $sort , org"; // Debug //echo "sql reports = $sql"; |