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

Removed one of the line breaks from email output.

pull/663/head
damian 2018-10-01 16:54:06 +10:00
parent 03014de725
commit ce03ed0be5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,7 +335,9 @@ function psm_parse_msg($status, $type, $vars, $combi = false) {
// merge the constants into the $vars so we can do a %LOOKUP% from language packs // merge the constants into the $vars so we can do a %LOOKUP% from language packs
$constants = get_defined_constants(true); $constants = get_defined_constants(true);
array_merge($vars, $constants['user']); $vars = array_merge($vars, $constants['user']);
print_r($vars);
foreach ($vars as $k => $v) { foreach ($vars as $k => $v) {
$message = str_replace('%'.strtoupper($k).'%', $v, $message); $message = str_replace('%'.strtoupper($k).'%', $v, $message);

6
src/lang/en_US.lang.php
View File

@ -374,9 +374,9 @@ $sm_lang = array(
'combi_on_telegram_message' => '- Server: %LABEL%<br/>- IP: %IP%<br/>- Port: %PORT%<br/>- Downtime: %LAST_OFFLINE_DURATION%<br/>- Date: %DATE%<br/><br/>', 'combi_on_telegram_message' => '- Server: %LABEL%<br/>- IP: %IP%<br/>- Port: %PORT%<br/>- Downtime: %LAST_OFFLINE_DURATION%<br/>- Date: %DATE%<br/><br/>',
'combi_email_subject' => 'IMPORTANT: \'%UP%\' servers UP again, \'%DOWN%\' servers DOWN', 'combi_email_subject' => 'IMPORTANT: \'%UP%\' servers UP again, \'%DOWN%\' servers DOWN',
'combi_pushover_subject' => '\'%UP%\' servers UP again, \'%DOWN%\' servers DOWN', 'combi_pushover_subject' => '\'%UP%\' servers UP again, \'%DOWN%\' servers DOWN',
'combi_email_message' => '<b>The following servers went down:</b><br/>%DOWN_SERVERS%<br/><b>The following servers are up again:</b><br/>%UP_SERVERS%<br/><br/>Source: %PSM_BASE_URL%', 'combi_email_message' => '<b>The following servers went down:</b><br/>%DOWN_SERVERS%<br/><b>The following servers are up again:</b><br/>%UP_SERVERS%<br/>Source: %PSM_BASE_URL%',
'combi_pushover_message' => '<b>The following servers went down:</b><br/>%DOWN_SERVERS%<br/><b>The following servers are up again:</b><br/>%UP_SERVERS%<br/><br/>Source: %PSM_BASE_URL%', 'combi_pushover_message' => '<b>The following servers went down:</b><br/>%DOWN_SERVERS%<br/><b>The following servers are up again:</b><br/>%UP_SERVERS%<br/>Source: %PSM_BASE_URL%',
'combi_telegram_message' => '<b>The following servers went down:</b><br/>%DOWN_SERVERS%<br/><b>The following servers are up again:</b><br/>%UP_SERVERS%<br/><br/>Source: %PSM_BASE_URL%', 'combi_telegram_message' => '<b>The following servers went down:</b><br/>%DOWN_SERVERS%<br/><b>The following servers are up again:</b><br/>%UP_SERVERS%<br/>Source: %PSM_BASE_URL%',
), ),
'login' => array( 'login' => array(
'welcome_usermenu' => 'Welcome, %user_name%', 'welcome_usermenu' => 'Welcome, %user_name%',