github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix Uncaught TypeError: Cannot access offset of type string on string in PHP8 in sendWebHook method.

pull/1204/head
Thomas Ulsø Kristensen 2022-06-10 07:16:42 +02:00
parent 04a4d959fd
commit 3ee7a7380d
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ __MACOSX/
.buildpath .buildpath
.settings/ .settings/
/.vscode /.vscode
/.vs

9
src/includes/functions.inc.php
View File

@ -1087,7 +1087,7 @@ namespace {
* Send Webhook * Send Webhook
* *
* @return bool|string * @return bool|string
* @var array $replacements an array of the replacements * @var array $replacements should be an array of key value as strings where key is the placeholder name to replace in json template with the value
* *
*/ */
@ -1096,8 +1096,13 @@ namespace {
$error = ""; $error = "";
$success = 1; $success = 1;
$jsonMessage = $this->json;
$replacements['#message'] = $this->stripTagsFromMessage($replacements['#message']); $replacements['#message'] = $this->stripTagsFromMessage($replacements['#message']);
$jsonMessage = strtr($this->json, $replacements);
foreach($replacements as $key => $val) {
$jsonMessage = str_replace($key, $val, $jsonMessage);
}
$curl = curl_init($this->url); $curl = curl_init($this->url);
curl_setopt($curl, CURLOPT_POST, 1); curl_setopt($curl, CURLOPT_POST, 1);

2
src/psm/Module/Config/Controller/ConfigController.php
View File

@ -470,7 +470,7 @@ class ConfigController extends AbstractController
$webhook = psm_build_webhook(); $webhook = psm_build_webhook();
$webhook->setUrl($user->webhook_url); $webhook->setUrl($user->webhook_url);
$webhook->setJson($user->webhook_json); $webhook->setJson($user->webhook_json);
$message = (psm_get_lang('config', 'test_message')); $message = ['#message' => (psm_get_lang('config', 'test_message'))];
$result = $webhook->sendWebhook($message); $result = $webhook->sendWebhook($message);
if ($result==1) { if ($result==1) {
$this->addMessage(psm_get_lang('config', 'webhook_sent'), 'success'); $this->addMessage(psm_get_lang('config', 'webhook_sent'), 'success');