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

Fix my code editor's "improvements" 

Sorry about that
pull/791/head
ICTman1076 2019-10-01 19:49:13 +01:00
parent 53c5ac7273
commit d1694b4bd2
No known key found for this signature in database
GPG Key ID: 2FB4A4C27981637F
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
<?php <?php
/** /**
* PHP Server Monitor * PHP Server Monitor
* Monitor your servers and websites. * Monitor your servers and websites.
@ -32,8 +31,7 @@ namespace psm\Util\Server;
/** /**
* The ServerValidator helps you to check input data for servers. * The ServerValidator helps you to check input data for servers.
*/ */
class ServerValidator class ServerValidator {
{
/** /**
* Database service * Database service
@ -41,8 +39,7 @@ class ServerValidator
*/ */
protected $db; protected $db;
public function __construct(\psm\Service\Database $db) public function __construct(\psm\Service\Database $db) {
{
$this->db = $db; $this->db = $db;
} }
@ -52,8 +49,7 @@ class ServerValidator
* @return boolean * @return boolean
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function serverId($server_id) public function serverId($server_id) {
{
$server = $this->db->selectRow(PSM_DB_PREFIX . 'servers', array('server_id' => $server_id), array('server_id')); $server = $this->db->selectRow(PSM_DB_PREFIX . 'servers', array('server_id' => $server_id), array('server_id'));
if (empty($server)) { if (empty($server)) {
@ -68,8 +64,7 @@ class ServerValidator
* @return boolean * @return boolean
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function label($label) public function label($label) {
{
$label = trim($label); $label = trim($label);
if (empty($label) || strlen($label) > 255) { if (empty($label) || strlen($label) > 255) {
throw new \InvalidArgumentException('server_label_bad_length'); throw new \InvalidArgumentException('server_label_bad_length');
@ -84,8 +79,7 @@ class ServerValidator
* @return boolean * @return boolean
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function ip($value, $type = null) public function ip($value, $type = null) {
{
$value = trim($value); $value = trim($value);
if (empty($value) || strlen($value) > 255) { if (empty($value) || strlen($value) > 255) {
@ -101,13 +95,10 @@ class ServerValidator
break; break;
case 'service': case 'service':
case 'ping': case 'ping':
if ( if (!filter_var($value, FILTER_VALIDATE_IP)
!filter_var($value, FILTER_VALIDATE_IP)
// domain regex as per http://stackoverflow.com/questions/106179/regular-expression-to-match-hostname-or-ip-address : // domain regex as per http://stackoverflow.com/questions/106179/regular-expression-to-match-hostname-or-ip-address :
&& !preg_match("/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/", $value) && !preg_match("/^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/", $value)
) { ) {throw new \InvalidArgumentException('server_ip_bad_service');}
throw new \InvalidArgumentException('server_ip_bad_service');
}
break; break;
} }
@ -120,8 +111,7 @@ class ServerValidator
* @return boolean * @return boolean
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function type($type) public function type($type) {
{
if (!in_array($type, array('ping', 'service', 'website'))) { if (!in_array($type, array('ping', 'service', 'website'))) {
throw new \InvalidArgumentException('server_type_invalid'); throw new \InvalidArgumentException('server_type_invalid');
} }
@ -134,8 +124,7 @@ class ServerValidator
* @return boolean * @return boolean
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function warningThreshold($value) public function warningThreshold($value) {
{
if (!is_numeric($value) || intval($value) == 0) { if (!is_numeric($value) || intval($value) == 0) {
throw new \InvalidArgumentException('server_warning_threshold_invalid'); throw new \InvalidArgumentException('server_warning_threshold_invalid');
} }