Save null value to database when response body is empty and translate…

… it in view to proper text
dhilst · Apr 14, 2020 · b25c98e · b25c98e
1 parent 57e4c5b
commit b25c98e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/bundles/WebhookBundle/Model/WebhookModel.php b/app/bundles/WebhookBundle/Model/WebhookModel.php
@@ -320,7 +320,7 @@ public function processWebhook(Webhook $webhook, WebhookQueue $queue = null)
 
             $responseBody = $response->getBody()->getContents();
             if (!$responseBody) {
-                $responseBody = '<<< Empty response body received >>>'; // Empty response body mark for log
+                $responseBody = null; // Save null value to database
             }
 
             $responseStatusCode = $response->getStatusCode();

diff --git a/app/bundles/WebhookBundle/Translations/en_US/messages.ini b/app/bundles/WebhookBundle/Translations/en_US/messages.ini
@@ -24,6 +24,7 @@ mautic.webhook.webhook.header.edit="Edit Webhook"
 mautic.webhook.webhook.header.new="Create New Webhook"
 mautic.webhook.webhook.logs.desc="These are the logs for this hook. Each time an event triggers this hook to be activated we record the HTTP response header. A successful response should be a 200 header. All other responses are considered an error."
 mautic.webhook.webhook.logs.title="Webhook Response Log"
+mautic.webhook.webhook.logs.empty.response="Empty response body received"
 mautic.webhook.webhook.menu.index="Webhooks"
 mautic.webhook.webhook_url="Webhook Url"
 mautic.webhook.webhooks="Webhooks"

diff --git a/app/bundles/WebhookBundle/Views/Webhook/details.html.php b/app/bundles/WebhookBundle/Views/Webhook/details.html.php
@@ -87,7 +87,14 @@
                                             ]);
                                             ?>
                                         </td>
-                                        <td><?php echo $log->getNote(); ?></td>
+                                        <td><?php
+                                            $note = $log->getNote();
+                                            if ($note) :
+                                                echo $note;
+                                            else :
+                                                echo $view['translator']->trans('mautic.webhook.webhook.logs.empty.response');
+                                            endif;
+                                        ?></td>
                                         <td><?php echo $log->getRuntime(); ?> s</td>
                                         <td><?php echo $view['date']->toFull($log->getDateAdded()); ?></td>
                                     </tr>