From 0d23f862bed28a1ab628a36f29a6f95073284960 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 18 Nov 2023 19:02:47 +1100 Subject: [PATCH 1/2] minor fixes, lang updates --- app/Http/Controllers/TaskController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php index 8aa91f55ec4e..dd7200cf1fa0 100644 --- a/app/Http/Controllers/TaskController.php +++ b/app/Http/Controllers/TaskController.php @@ -528,7 +528,7 @@ class TaskController extends BaseController return response()->json(['message' => $hash_or_response], 200); } - $tasks->each(function ($task, $key) use ($action, $user) { + $tasks->each(function ($task) use ($action, $user) { if ($user->can('edit', $task)) { $this->task_repo->{$action}($task); } From 3e3c4e348aa81ba3580389e52dde19d2403204c2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 18 Nov 2023 19:12:54 +1100 Subject: [PATCH 2/2] Email Quarantine --- app/Http/Controllers/ClientController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index 010682e2a178..8f0d7addb982 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -386,6 +386,12 @@ class ClientController extends BaseController $response = $postmark->activateBounce((int)$bounce_id); + if($response && $response?->Message == 'OK' && !$response->Bounce->Inactive && $response->Bounce->Email){ + + $email = $response->Bounce->Email; + //remove email from quarantine. //@TODO + } + return response()->json(['message' => 'Success'], 200); } catch(\Exception $e) {