From e5ad6a26d5d5fb1d2305697cfc185a7b867daaa0 Mon Sep 17 00:00:00 2001 From: Alan Date: Tue, 11 Jul 2023 15:13:46 +0800 Subject: [PATCH] fix #7696 - fill in to_email on failure - so that email will get blacklisted eventually --- NotifySend.php | 4 ++++ Pman.Dialog.Image.bjs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NotifySend.php b/NotifySend.php index caa6ec4e..9e46249f 100644 --- a/NotifySend.php +++ b/NotifySend.php @@ -236,6 +236,7 @@ class Pman_Core_NotifySend extends Pman $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent..... $w->msgid = ''; $w->event_id = $ev->id; + $w->to_email = $p->email; $w->update($ww); $this->errorHandler(date('Y-m-d h:i:s ') . (isset($email['error']) ? @@ -284,6 +285,7 @@ class Pman_Core_NotifySend extends Pman $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent..... $w->msgid = ''; $w->event_id = $ev->id; + $w->to_email = $p->email; $w->update($ww); $this->errorHandler(date('Y-m-d h:i:s ') . "INVALID ADDRESS: " . $p->email. "\n"); @@ -331,6 +333,7 @@ class Pman_Core_NotifySend extends Pman $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent..... $w->msgid = ''; $w->event_id = $ev->id; + $w->to_email = $p->email; $w->update($ww); $this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - BAD EMAIL - {$p->email} \n"); @@ -345,6 +348,7 @@ class Pman_Core_NotifySend extends Pman $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent..... $w->msgid = ''; $w->event_id = $ev->id; + $w->to_email = $p->email; $w->update($ww); $this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - GAVE UP TO OLD - {$p->email} \n"); } diff --git a/Pman.Dialog.Image.bjs b/Pman.Dialog.Image.bjs index d0be4428..b7332694 100644 --- a/Pman.Dialog.Image.bjs +++ b/Pman.Dialog.Image.bjs @@ -383,7 +383,7 @@ "upload_max_filesize_value" : "eb5d45750c7ab13aa8e6bacc80315a30" }, "parent" : "", - "path" : "/home/alan/gitlive/Pman.Core/Pman.Dialog.Image.bjs", + "path" : "/home/leon/gitlive/web.MediaOutreach/Pman/Core/Pman.Dialog.Image.bjs", "permname" : "", "strings" : { "1243daf593fa297e07ab03bf06d925af" : "Searching...", -- 2.39.2