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

Merge 8e4f98c5da into 50ab06640e

pull/480/merge
Matthew 2017-06-06 00:57:16 +00:00 committed by GitHub
parent 50ab06640e 8e4f98c5da
commit 0c6c3f8737
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,15 +289,15 @@ $sm_lang = array(
),
// for newlines in the email messages use <br/>
'notifications' => array(
'off_sms' => 'Server \'%LABEL%\' is DOWN: ip=%IP%, port=%PORT%. Error=%ERROR%',
'off_email_subject' => 'IMPORTANT: Server \'%LABEL%\' is DOWN',
'off_sms' => '[CNM] Warning: \'%LABEL%\' is Offline!',
'off_email_subject' => '[CNM] Warning: \'%LABEL%\' is Offline!',
'off_email_body' => "Failed to connect to the following server:<br/><br/>Server: %LABEL%<br/>IP: %IP%<br/>Port: %PORT%<br/>Error: %ERROR%<br/>Date: %DATE%",
'off_pushover_title' => 'Server \'%LABEL%\' is DOWN',
'off_pushover_title' => '[CNM] Warning: \'%LABEL%\' is Offline!',
'off_pushover_message' => "Failed to connect to the following server:<br/><br/>Server: %LABEL%<br/>IP: %IP%<br/>Port: %PORT%<br/>Error: %ERROR%<br/>Date: %DATE%",
'on_sms' => 'Server \'%LABEL%\' is RUNNING: ip=%IP%, port=%PORT%',
'on_email_subject' => 'IMPORTANT: Server \'%LABEL%\' is RUNNING',
'on_email_body' => "Server '%LABEL%' is running again:<br/><br/>Server: %LABEL%<br/>IP: %IP%<br/>Port: %PORT%<br/>Date: %DATE%",
'on_pushover_title' => 'Server \'%LABEL%\' is RUNNING',
'on_sms' => '[CNM] Notice: \'%LABEL%\' is back online.',
'on_email_subject' => '[CNM] Notice: \'%LABEL%\' is back online.',
'on_email_body' => "'%LABEL%' is running again:<br/><br/>Server: %LABEL%<br/>IP: %IP%<br/>Port: %PORT%<br/>Date: %DATE%",
'on_pushover_title' => '[CNM] \'%LABEL%\' is back online.',
'on_pushover_message' => 'Server \'%LABEL%\' is running again:<br/><br/>Server: %LABEL%<br/>IP: %IP%<br/>Port: %PORT%<br/>Date: %DATE%',
),
'login' => array(

0
src/psm/Txtmsg/FreeVoipDeal.php Executable file → Normal file
View File

7
src/psm/Util/Server/ServerValidator.php
View File

@ -92,7 +92,7 @@ class ServerValidator {
throw new \InvalidArgumentException('server_ip_bad_website');
}
break;
case 'service':
case 'service' or 'ping':
if(
!filter_var($value, FILTER_VALIDATE_IP)
// domain regex as per http://stackoverflow.com/questions/106179/regular-expression-to-match-hostname-or-ip-address :
@ -101,11 +101,6 @@ class ServerValidator {
throw new \InvalidArgumentException('server_ip_bad_service');
}
break;
case 'ping':
if(!filter_var($value, FILTER_VALIDATE_IP)) {
throw new \InvalidArgumentException('server_ip_bad_service');
}
break;
}
return true;

2
src/templates/default/module/server/status/index.tpl.html
View File

@ -71,4 +71,4 @@ setInterval(function(){
});
}, {{ auto_refresh_seconds }} * 1000);
</script>
{% endif %}
{% endif %}