Remove bounce

Unsubhandler should not record a bounce as the user unsubscribed.
magicdude4eva · Aug 25, 2017 · a9a7140 · a9a7140
1 parent 3588863
commit a9a7140
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/providers/bounce-provider-mailwizz.php b/providers/bounce-provider-mailwizz.php
@@ -174,19 +174,20 @@ function MailWizz_unsubscribeSubscriberUIDFromListUID($subscriberUID, $listUID,
     $unsubscribeSuccess = true;
 
     // Call the campaign-bounce endpoint
-    $bounceresponse = $MailWizzCampaignBounceEndPoint->create($campaignUID, array(
-      'message'        => 'Port25 List-Unsubscribe', // max 250 chars
-      'bounce_type'    => 'soft',                    // hard, soft or internal
-      'subscriber_uid' => $subscriberUID             // 13 chars unique subscriber identifier
-    ));
-
-    if ($bounceresponse->body['status'] == "success") {
-      $log->lwrite('   - Bounce-update for campaign=' . $campaignUID . ' and subscriberUID=' . $subscriberUID . ' successful=' . $bounceresponse->body['status']);
-    } else if ($bounceresponse->body['status'] != "success") {
-      $log->lwrite('   - Bounce-update for campaign=' . $campaignUID . ' and subscriberUID=' . $subscriberUID . ' failed with error=' . $bounceresponse->body['error']);
+    if (!is_null($campaignUID) && !empty($campaignUID)) {
+      $bounceresponse = $MailWizzCampaignBounceEndPoint->create($campaignUID, array(
+        'message'        => 'Port25 List-Unsubscribe', // max 250 chars
+        'bounce_type'    => 'soft',                    // hard, soft or internal
+        'subscriber_uid' => $subscriberUID             // 13 chars unique subscriber identifier
+      ));
+
+      if ($bounceresponse->body['status'] == "success") {
+        $log->lwrite('   - Bounce-update for campaign=' . $campaignUID . ' and subscriberUID=' . $subscriberUID . ' successful=' . $bounceresponse->body['status']);
+      } else if ($bounceresponse->body['status'] != "success") {
+        $log->lwrite('   - Bounce-update for campaign=' . $campaignUID . ' and subscriberUID=' . $subscriberUID . ' failed with error=' . $bounceresponse->body['error']);
+      }
     }
 
-
   } else if ($unsubscriberesponse->body['status'] != "success") {
     $log->lwrite('   - Failed with status=' . $unsubscriberesponse->body['error']);
     $unsubMessage = "Failed with status=" . $unsubscriberesponse->body['error'];

diff --git a/unsubhandler.php b/unsubhandler.php
@@ -164,7 +164,7 @@
   preg_match('/(.*)\.(.*)\.(.*)@fbl-unsub\.bidorbuy\.co\.za/', $UNSUBSCRIBE_HANDLER_TO, $regs);
 
   if (!is_null($regs) && !empty($regs) && sizeof($regs) == 4) {
-    $unsubscribe = MailWizz_unsubscribeSubscriberUIDFromListUID($regs[1], $regs[2], $regs[3]);
+    $unsubscribe = MailWizz_unsubscribeSubscriberUIDFromListUID($regs[1], $regs[2], null);
 
     if ($unsubscribe[0] == true) {
       $reportingInterface->logReportRecord("bounces", 1);