From 47ec19e8a7ff76129fba45dfd08a8e1198e15626 Mon Sep 17 00:00:00 2001
From: Daniel Ramsay <daniel@dretzq.org.uk>
Date: Sun, 31 Oct 2021 15:56:28 +0000
Subject: [PATCH] results process fixes #120

---
 api/1.2/libs/email.php      | 6 +++---
 backend/process_results.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/1.2/libs/email.php b/api/1.2/libs/email.php
index 3bff2b1..225e67f 100644
--- a/api/1.2/libs/email.php
+++ b/api/1.2/libs/email.php
@@ -3,7 +3,7 @@
 function sendISPReport($mailname, $name, $email, $network, $url, $message, $report_type, $category, $renderer) {
     if (defined('SEND_EMAIL') && SEND_EMAIL == false) {
         // disable email flag for debug/testing
-        return;
+        return true;
     }
     $msg = new PHPMailer();
     if (FEATURE_EMAIL_TRACKING) {
@@ -43,7 +43,7 @@ function sendISPReport($mailname, $name, $email, $network, $url, $message, $repo
 function sendISPReminder($row, $network, $url, $renderer) {
     if (defined('SEND_EMAIL') && SEND_EMAIL == false) {
         // disable email flag for debug/testing
-        return;
+        return true;
     }
     $msg = new PHPMailer();
 
@@ -107,7 +107,7 @@ function sendBBFCReport($mailname, $name, $email, $network, $original_network, $
 
     if (defined('SEND_EMAIL') && SEND_EMAIL == false) {
         // disable email flag for debug/testing
-        return;
+        return true;
     }
 
    $msg = new PHPMailer();
diff --git a/backend/process_results.php b/backend/process_results.php
index 53c8d37..062c549 100644
--- a/backend/process_results.php
+++ b/backend/process_results.php
@@ -42,7 +42,7 @@
     if ($row['status'] != 'pending') {
         # we might have already seen this result, if there have been multiple results for a url/network since the
         # last reporting run
-        error_log("Report {$row['report_id']} already processed: ${row['status']}.");
+        error_log("Report {$result['report_id']} already processed: ${row['status']}.");
         continue;
     }