echosystem.fr
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge d56b2856e5 into fccc264107

This commit is contained in:
Thomas Kristensen 2023-09-01 20:21:10 -06:00 committed by GitHub
parent fccc264107 d56b2856e5
commit 7ce34505f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 7 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
.settings/
/.vscode
/.vs

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

@ -1087,7 +1087,7 @@ namespace {
* Send Webhook
*
* @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 = "";
$success = 1;
$jsonMessage = $this->json;
$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_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->setUrl($user->webhook_url);
$webhook->setJson($user->webhook_json);
$message = (psm_get_lang('config', 'test_message'));
$message = ['#message' => (psm_get_lang('config', 'test_message'))];
$result = $webhook->sendWebhook($message);
if ($result==1) {
$this->addMessage(psm_get_lang('config', 'webhook_sent'), 'success');

8
src/psm/Util/Server/Updater/StatusNotifier.php
View File

@ -424,10 +424,12 @@ class StatusNotifier
psm_parse_msg($this->status_new, 'email_subject', $this->server);
$mail->Priority = 1;
$publicUrl = PSM_BASE_URL.'/public.php';
$body = key_exists('message', $combi) ?
$combi['message'] :
psm_parse_msg($this->status_new, 'email_body', $this->server);
if ((bool)psm_get_conf('email_add_url')) $body .= PHP_EOL.PHP_EOL.'<a href="'.PSM_BASE_URL.'">'.PSM_BASE_URL.'</a>';
if ((bool)psm_get_conf('email_add_url')) $body .= PHP_EOL.PHP_EOL.'<a href="'.$publicUrl.'">'.$publicUrl.'</a>';
$mail->Body = $body;
$mail->AltBody = str_replace('<br/>', "\n", $body);
@ -609,6 +611,7 @@ class StatusNotifier
}
$webhook = psm_build_webhook();
$subject = key_exists('subject', $combi) ? $combi['subject'] : psm_parse_msg($this->status_new, 'email_subject', $this->server);
$message = key_exists('message', $combi) ?
$combi['message'] :
@ -638,7 +641,8 @@ class StatusNotifier
'#server_label' => $this->server['label'],
'#server_error' => $this->server['error'],
'#server_last_offline_duration' => $this->status_new ? $this->server['last_offline_duration'] : '',
'#status' => $this->status_new ? 'online' : 'offline'
'#status' => $this->status_new ? 'online' : 'offline',
'#subject' => $subject
]);
}
}

5
src/templates/default/main/body.tpl.html
View File

@ -16,7 +16,7 @@
<meta name="msapplication-TileImage" content="phpservermon.png">
<meta name="msapplication-TileColor" content="#424242">
<!-- TODO add base url -->
<!-- <link rel="canonical" href=""> -->
<!-- <link rel="canonical" href=""> -->
<meta name="theme-color" content="#424242">
<link rel="icon" type="image/x-icon" href="favicon.ico" />
<link rel="icon" type="image/png" href="favicon.png" />
@ -24,8 +24,9 @@
<link href="src/templates/default/static/css/bootstrap.min.css" rel="stylesheet">
<link href="src/templates/default/static/plugin/bootstrap-select/dist/css/bootstrap-select.min.css" rel="stylesheet">
<link href="src/templates/default/static/css/style.min.css" rel="stylesheet">
<link href="src/templates/default/static/css/custom.css" rel="stylesheet">
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
</head>

4
src/templates/default/static/css/custom.css Normal file
View File

@ -0,0 +1,4 @@
/*# Used to override main styles for custom layout adjustments and colors. */
.container-fluid {
max-width: 100%;
}