Skip to content

Removing TAB characters and avoiding debug warning on curl fail #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removing TAB characters and avoiding debug warning on curl fail #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion notification_service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,15 @@ private function execute_discord_webhook($discord_webhook_url, $color, $message,
// Clean up the message and footer text before sending by trimming whitespace from the front and end of the message and footer strings.
$message = trim($message);
$message = str_replace('"', "'", $message); // Replace " characters that would break the JSON encoding that our message must be wrapped in.
$message = str_replace("\t"," ", $message); // Replace TAB characters with a space - TAB characters breaks JSON encoding also, apparently.
if (isset($footer))
{
$footer = trim($footer);
$footer = str_replace('"', "'", $footer);
// Discord does not appear to allow newline characters in the footer. In fact, the presence of them causes the message POST
// to fail. Hence why we replace all newlines with a space here.
$footer = str_replace(array("\r", "\n"), ' ', $footer);
// Discord does not allow tab characters either, so we add those to the array of characters to be removed.
$footer = str_replace(array("\r", "\n", "\t"), ' ', $footer);
}

// Abort if we find that either of our text fields are now empty strings
Expand Down Expand Up @@ -325,6 +327,7 @@ private function execute_discord_webhook($discord_webhook_url, $color, $message,
curl_setopt($h, CURLOPT_URL, $discord_webhook_url);
curl_setopt($h, CURLOPT_POST, 1);
curl_setopt($h, CURLOPT_POSTFIELDS, $post);
curl_setopt($h, CURLOPT_RETURNTRANSFER, 1);
$response = curl_exec($h);
curl_close($h);

Expand Down