diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php index 4889c73d..e4dcd7cb 100644 --- a/src/includes/functions.inc.php +++ b/src/includes/functions.inc.php @@ -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 $constants = get_defined_constants(true); - array_merge($vars, $constants['user']); + $vars = array_merge($vars, $constants['user']); + +print_r($vars); foreach ($vars as $k => $v) { $message = str_replace('%'.strtoupper($k).'%', $v, $message); diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index db118c44..98eabec9 100644 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -374,9 +374,9 @@ $sm_lang = array( 'combi_on_telegram_message' => '- Server: %LABEL%
- IP: %IP%
- Port: %PORT%
- Downtime: %LAST_OFFLINE_DURATION%
- Date: %DATE%

', 'combi_email_subject' => 'IMPORTANT: \'%UP%\' servers UP again, \'%DOWN%\' servers DOWN', 'combi_pushover_subject' => '\'%UP%\' servers UP again, \'%DOWN%\' servers DOWN', - 'combi_email_message' => 'The following servers went down:
%DOWN_SERVERS%
The following servers are up again:
%UP_SERVERS%

Source: %PSM_BASE_URL%', - 'combi_pushover_message' => 'The following servers went down:
%DOWN_SERVERS%
The following servers are up again:
%UP_SERVERS%

Source: %PSM_BASE_URL%', - 'combi_telegram_message' => 'The following servers went down:
%DOWN_SERVERS%
The following servers are up again:
%UP_SERVERS%

Source: %PSM_BASE_URL%', + 'combi_email_message' => 'The following servers went down:
%DOWN_SERVERS%
The following servers are up again:
%UP_SERVERS%
Source: %PSM_BASE_URL%', + 'combi_pushover_message' => 'The following servers went down:
%DOWN_SERVERS%
The following servers are up again:
%UP_SERVERS%
Source: %PSM_BASE_URL%', + 'combi_telegram_message' => 'The following servers went down:
%DOWN_SERVERS%
The following servers are up again:
%UP_SERVERS%
Source: %PSM_BASE_URL%', ), 'login' => array( 'welcome_usermenu' => 'Welcome, %user_name%',