add config flag to disable email sending #120

openrightsgroup · Oct 31, 2021 · 9fc4f74 · 9fc4f74
1 parent 0b19ab5
commit 9fc4f74
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/api/1.2/api.php b/api/1.2/api.php
@@ -1752,7 +1752,7 @@ function result_callback($msg, $queue) {
             # send email here
 
             if (($contact['verified'] || $network_name == 'ORG') && $network_name != 'BBFC' && $age_limit == false && $hold == false) {
-                false && sendISPReport(
+                sendISPReport(
                     $mailname,
                     $data['reporter']['name'],
                     $data['reporter']['email'],

diff --git a/api/1.2/libs/config.docker.php b/api/1.2/libs/config.docker.php
@@ -37,6 +37,8 @@
 
 $REQUEUE_EXCLUDE_SOURCES = array();
 
+define('SEND_EMAIL', false);
+
 #define('AWS_DYNAMODB_ACCESS_KEY', 'asdasd');
 #define('AWS_DYNAMODB_SECRET_KEY', '');
 #define('AWS_DYNAMODB_URL', 'http://localhost:8000');

diff --git a/api/1.2/libs/email.php b/api/1.2/libs/email.php
@@ -1,6 +1,10 @@
 <?php
 
 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;
+    }
     $msg = new PHPMailer();
     if (FEATURE_EMAIL_TRACKING) {
         $msg->setFrom($mailname . '@' . MAIL_DOMAIN, $name . ' via Blocked.org.uk');
@@ -37,6 +41,10 @@ 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;
+    }
     $msg = new PHPMailer();
 
     if (FEATURE_EMAIL_TRACKING) {
@@ -97,6 +105,11 @@ function sendBBFCReport($mailname, $name, $email, $network, $original_network, $
     //         "nature_of_the_complaint" => $message
     //         );
 
+    if (defined('SEND_EMAIL') && SEND_EMAIL == false) {
+        // disable email flag for debug/testing
+        return;
+    }
+
    $msg = new PHPMailer();
     if (FEATURE_EMAIL_TRACKING) {
         $msg->setFrom($mailname . '@' . MAIL_DOMAIN, $name . ' via Blocked.org.uk');
@@ -136,6 +149,10 @@ function sendBBFCReport($mailname, $name, $email, $network, $original_network, $
 }
 
 function sendUserVerification($email, $name, $token, $attempt, $renderer) {
+    if (defined('SEND_EMAIL') && SEND_EMAIL == false) {
+        // disable email flag for debug/testing
+        return;
+    }
     $msg = new PHPMailer();
     $msg->setFrom(SITE_EMAIL, SITE_NAME);
     $msg->addAddress(