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

Merge branch 'develop' into feature/264

pull/626/head
Tim 2018-09-05 22:57:40 +02:00 committed by GitHub
parent 1cd93862c8 b26f85d975
commit 894d06d922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 241 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CHANGELOG.rst
View File

@ -5,11 +5,19 @@ Changelog
Not yet released Not yet released
---------------- ----------------
#626: Added redirect check. * #626: Added redirect check.
b49659f: Added question to notification faq about not recieving notifications. * #627: Latest server output, error and output during a failure will be saved and are shown on the server page.
ef28908: Indentation fix. * #631: Added option to specify the request method.
#605: Added Norwegian language. * #628: Added the option to mark specific HTTP status codes as online.
f6173d4: Added license to composer.json file. * #640: Removed () after last offline value when the last offline duration is unknown.
* #637: Added php extensions to composer required list, spelling fixes in changelog and composer update.
* #635: Changed server order on ?&mod=user&action=edit&id=x.
* #634: Changed ' to " in sql query, both were used.
* #629: Fix bug that made it impossible to check rdp:// and fixed port update.
* b49659f: Added question to notification faq about not receiving notifications.
* ef28908: Indentation fix.
* #605: Added Norwegian language.
* f6173d4: Added license to composer.json file.
v3.3.1 (released August 10, 2018) v3.3.1 (released August 10, 2018)
-------------------------------- --------------------------------
@ -40,7 +48,7 @@ v3.3.1 (released August 10, 2018)
v3.3.0 (released May 30, 2018) v3.3.0 (released May 30, 2018)
-------------------------------- --------------------------------
* 57f4c36: Added support voor the following SMS gateways: Plivo, SolutionsInfini, Callr and GAtewayAPI. * 57f4c36: Added support for the following SMS gateways: Plivo, SolutionsInfini, Callr and GatewayAPI.
* c3751e7: Moved Clickatell api key to password field. * c3751e7: Moved Clickatell api key to password field.
* #590: Rollback Twig version update to work with PHP5. * #590: Rollback Twig version update to work with PHP5.
* #589: Enlarge select pattern_online width. * #589: Enlarge select pattern_online width.
@ -66,7 +74,7 @@ v3.3.0 (released May 30, 2018)
* #541: Fix method declaration error in PHP7.2. * #541: Fix method declaration error in PHP7.2.
* #515: Run archive and cleanup per server to reduce memory use. * #515: Run archive and cleanup per server to reduce memory use.
* #516: Fixed #500 ping latency. * #516: Fixed #500 ping latency.
* 2471767: Fixed preinstalled server query. * 2471767: Fixed pre installed server query.
v3.2.2 (released March 27, 2018) v3.2.2 (released March 27, 2018)
-------------------------------- --------------------------------
@ -84,7 +92,7 @@ v3.2.2 (released March 27, 2018)
v3.2.1 (released March 27, 2018) v3.2.1 (released March 27, 2018)
-------------------------------- --------------------------------
* #343: Added optinal header value check. * #343: Added optional header value check.
* #433: Changed baseurl repoforgeextras. * #433: Changed baseurl repoforgeextras.
* #432: Changed baseurl repoforge. * #432: Changed baseurl repoforge.
* #437: Octopush.class.php updates to Octopush.php. * #437: Octopush.class.php updates to Octopush.php.

5
composer.json
View File

@ -2,9 +2,12 @@
"name": "phpservermon/phpservermon", "name": "phpservermon/phpservermon",
"description": "PHP Server Monitor", "description": "PHP Server Monitor",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"homepage": "http://www.phpservermonitor.org", "homepage": "https://www.phpservermonitor.org",
"require": { "require": {
"php": ">=5.5.9", "php": ">=5.5.9",
"ext-curl": "*",
"ext-pdo": "*",
"ext-xml": "*",
"phpmailer/phpmailer": "~6.0", "phpmailer/phpmailer": "~6.0",
"symfony/config": "~3.4", "symfony/config": "~3.4",
"symfony/dependency-injection": "~3.4", "symfony/dependency-injection": "~3.4",

82
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "280e04b14bf6e80bca192b48a12bb342", "content-hash": "b116489d45aab7506cedf3f94fb60ee4",
"packages": [ "packages": [
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
@ -202,7 +202,7 @@
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
"version": "v3.4.14", "version": "v3.4.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/config.git", "url": "https://github.com/symfony/config.git",
@ -266,16 +266,16 @@
}, },
{ {
"name": "symfony/dependency-injection", "name": "symfony/dependency-injection",
"version": "v3.4.14", "version": "v3.4.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/dependency-injection.git", "url": "https://github.com/symfony/dependency-injection.git",
"reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1" "reference": "09d7df7bf06c1393b6afc85875993cbdbdf897a0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1c0e679e522591fd744fdf242fec41a43d62b2b1", "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/09d7df7bf06c1393b6afc85875993cbdbdf897a0",
"reference": "1c0e679e522591fd744fdf242fec41a43d62b2b1", "reference": "09d7df7bf06c1393b6afc85875993cbdbdf897a0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -333,11 +333,11 @@
], ],
"description": "Symfony DependencyInjection Component", "description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-07-29T15:19:31+00:00" "time": "2018-08-08T11:42:34+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v3.4.14", "version": "v3.4.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
@ -400,16 +400,16 @@
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v4.1.3", "version": "v4.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "2e30335e0aafeaa86645555959572fe7cea22b43" "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/2e30335e0aafeaa86645555959572fe7cea22b43", "url": "https://api.github.com/repos/symfony/filesystem/zipball/c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e",
"reference": "2e30335e0aafeaa86645555959572fe7cea22b43", "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -446,20 +446,20 @@
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-07-26T11:24:31+00:00" "time": "2018-08-18T16:52:46+00:00"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v3.4.14", "version": "v3.4.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6" "reference": "2fb33cb6eefe6e790e4023f7c534a9e4214252fc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2fb33cb6eefe6e790e4023f7c534a9e4214252fc",
"reference": "19a3267828046a2a4a05e3dc2954bbd2e0ad9fa6", "reference": "2fb33cb6eefe6e790e4023f7c534a9e4214252fc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -500,29 +500,32 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-08-01T14:04:26+00:00" "time": "2018-08-27T17:45:33+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.8.0", "version": "v1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
"reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"suggest": {
"ext-ctype": "For best performance"
},
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.8-dev" "dev-master": "1.9-dev"
} }
}, },
"autoload": { "autoload": {
@ -555,20 +558,20 @@
"polyfill", "polyfill",
"portable" "portable"
], ],
"time": "2018-04-30T19:57:29+00:00" "time": "2018-08-06T14:22:27+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.8.0", "version": "v1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "3296adf6a6454a050679cde90f95350ad604b171" "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
"reference": "3296adf6a6454a050679cde90f95350ad604b171", "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -580,7 +583,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.8-dev" "dev-master": "1.9-dev"
} }
}, },
"autoload": { "autoload": {
@ -614,30 +617,30 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2018-04-26T10:06:28+00:00" "time": "2018-08-06T14:22:27+00:00"
}, },
{ {
"name": "symfony/polyfill-php70", "name": "symfony/polyfill-php70",
"version": "v1.8.0", "version": "v1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php70.git", "url": "https://github.com/symfony/polyfill-php70.git",
"reference": "77454693d8f10dd23bb24955cffd2d82db1007a6" "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6", "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
"reference": "77454693d8f10dd23bb24955cffd2d82db1007a6", "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"paragonie/random_compat": "~1.0|~2.0", "paragonie/random_compat": "~1.0|~2.0|~9.99",
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.8-dev" "dev-master": "1.9-dev"
} }
}, },
"autoload": { "autoload": {
@ -673,7 +676,7 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2018-04-26T10:06:28+00:00" "time": "2018-08-06T14:22:27+00:00"
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
@ -751,7 +754,10 @@
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": ">=5.5.9" "php": ">=5.5.9",
"ext-curl": "*",
"ext-pdo": "*",
"ext-xml": "*"
}, },
"platform-dev": [] "platform-dev": []
} }

BIN
composer.phar
View File

Binary file not shown.

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

@ -343,9 +343,10 @@ function psm_parse_msg($status, $type, $vars) {
* @param boolean $add_agent add user agent? * @param boolean $add_agent add user agent?
* @param string|bool $website_username Username website * @param string|bool $website_username Username website
* @param string|bool $website_password Password website * @param string|bool $website_password Password website
* @param string|bool $request_method Request method like GET, POST etc.
* @return string cURL result * @return string cURL result
*/ */
function psm_curl_get($href, $header = false, $body = true, $timeout = null, $add_agent = true, $website_username = false, $website_password = false) { function psm_curl_get($href, $header = false, $body = true, $timeout = null, $add_agent = true, $website_username = false, $website_password = false, $request_method = null) {
$timeout = $timeout == null ? PSM_CURL_TIMEOUT : intval($timeout); $timeout = $timeout == null ? PSM_CURL_TIMEOUT : intval($timeout);
$ch = curl_init(); $ch = curl_init();
@ -358,6 +359,10 @@ function psm_curl_get($href, $header = false, $body = true, $timeout = null, $ad
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout); curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
curl_setopt($ch, CURLOPT_ENCODING, ''); curl_setopt($ch, CURLOPT_ENCODING, '');
if (!empty($request_method)) {
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $request_method);
}
if ($website_username !== false && $website_password !== false && !empty($website_username) && !empty($website_password)) { if ($website_username !== false && $website_password !== false && !empty($website_username) && !empty($website_password)) {
curl_setopt($ch, CURLOPT_USERPWD, $website_username.":".$website_password); curl_setopt($ch, CURLOPT_USERPWD, $website_username.":".$website_password);

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

@ -49,7 +49,9 @@ $sm_lang = array(
'ok' => 'OK', 'ok' => 'OK',
'bad' => 'bad', 'bad' => 'bad',
'cancel' => 'Cancel', 'cancel' => 'Cancel',
'none' => 'None',
'activate' => 'Activate', 'activate' => 'Activate',
'advanced' => 'Advanced',
// date/time format according the strftime php function format parameter http://php.net/manual/function.strftime.php // date/time format according the strftime php function format parameter http://php.net/manual/function.strftime.php
'short_day_format' => '%B %e', 'short_day_format' => '%B %e',
'long_day_format' => '%B %e, %Y', 'long_day_format' => '%B %e, %Y',
@ -161,6 +163,9 @@ $sm_lang = array(
'port' => 'Port', 'port' => 'Port',
'custom_port' => 'Custom Port', 'custom_port' => 'Custom Port',
'popular_ports' => 'Popular Ports', 'popular_ports' => 'Popular Ports',
'request_method' => 'Request method',
'custom_request_method' => 'Custom request method',
'popular_request_methods' => 'Popular request methods',
'please_select' => 'Please select', 'please_select' => 'Please select',
'type' => 'Type', 'type' => 'Type',
'type_website' => 'Website', 'type_website' => 'Website',
@ -172,12 +177,17 @@ $sm_lang = array(
'pattern_online_description' => 'Online: If this pattern is not found on the website, the server will be marked online. Offline: If this pattern is not found on the website, the server will be marked offline.', 'pattern_online_description' => 'Online: If this pattern is not found on the website, the server will be marked online. Offline: If this pattern is not found on the website, the server will be marked offline.',
'redirect_check' => 'Redirecting to another domain is', 'redirect_check' => 'Redirecting to another domain is',
'redirect_check_description' => 'Redirect to another domain is usually a bad sign.', 'redirect_check_description' => 'Redirect to another domain is usually a bad sign.',
'allow_http_status' => 'Allow HTTP status code',
'allow_http_status_description' => 'Mark website as online. HTTP Status codes lower then 400 are marked as online by default. Seperate with |. Example: 401|403.',
'header' => 'Header', 'header' => 'Header',
'header_name_description' => 'Header name (case-sensitive)', 'header_name_description' => 'Header name (case-sensitive)',
'header_value_description' => 'Header value. Regular expressions are allowed.', 'header_value_description' => 'Header value. Regular expressions are allowed.',
'last_check' => 'Last check', 'last_check' => 'Last check',
'last_online' => 'Last online', 'last_online' => 'Last online',
'last_offline' => 'Last offline', 'last_offline' => 'Last offline',
'last_output' => 'Last positive output',
'last_error' => 'Last error',
'last_error_output' => 'Last error output',
'monitoring' => 'Monitoring', 'monitoring' => 'Monitoring',
'no_monitoring' => 'No monitoring', 'no_monitoring' => 'No monitoring',
'email' => 'Email', 'email' => 'Email',

2
src/lang/nl_NL.lang.php
View File

@ -148,6 +148,8 @@ $sm_lang = array(
'pattern_description' => 'Als dit patroon niet gevonden wordt op de website, zal de server als offline gemarkeerd worden. Regular expressions zijn toegestaan.', 'pattern_description' => 'Als dit patroon niet gevonden wordt op de website, zal de server als offline gemarkeerd worden. Regular expressions zijn toegestaan.',
'redirect_check' => 'Omleiden naar een ander domein is', 'redirect_check' => 'Omleiden naar een ander domein is',
'redirect_check_description' => 'Een omleiding naar een ander domein is meestal een slecht teken.', 'redirect_check_description' => 'Een omleiding naar een ander domein is meestal een slecht teken.',
'allow_http_status' => 'Sta HTTP status code toe',
'allow_http_status_description' => 'Markeer website als online. HTTP status code lager dan 400 worden standaard als online gemarkeerd. Scheiden met |. Bijvoorbeeld: 401|403.',
'last_check' => 'Laatst gecontroleerd', 'last_check' => 'Laatst gecontroleerd',
'last_online' => 'Laatst online', 'last_online' => 'Laatst online',
'last_offline' => 'Laatst offline', 'last_offline' => 'Laatst offline',

14
src/psm/Module/Server/Controller/AbstractServerController.php
View File

@ -61,11 +61,13 @@ abstract class AbstractServerController extends AbstractController {
`s`.`server_id`, `s`.`server_id`,
`s`.`ip`, `s`.`ip`,
`s`.`port`, `s`.`port`,
`s`.`request_method`,
`s`.`type`, `s`.`type`,
`s`.`label`, `s`.`label`,
`s`.`pattern`, `s`.`pattern`,
`s`.`pattern_online`, `s`.`pattern_online`,
`s`.`redirect_check`, `s`.`redirect_check`,
`s`.`allow_http_status`,
`s`.`header_name`, `s`.`header_name`,
`s`.`header_value`, `s`.`header_value`,
`s`.`status`, `s`.`status`,
@ -84,7 +86,10 @@ abstract class AbstractServerController extends AbstractController {
`s`.`warning_threshold_counter`, `s`.`warning_threshold_counter`,
`s`.`timeout`, `s`.`timeout`,
`s`.`website_username`, `s`.`website_username`,
`s`.`website_password` `s`.`website_password`,
`s`.`last_error`,
`s`.`last_error_output`,
`s`.`last_output`
FROM `".PSM_DB_PREFIX."servers` AS `s` FROM `".PSM_DB_PREFIX."servers` AS `s`
{$sql_join} {$sql_join}
{$sql_where} {$sql_where}
@ -108,7 +113,8 @@ abstract class AbstractServerController extends AbstractController {
$server['last_online'] = psm_timespan($server['last_online']); $server['last_online'] = psm_timespan($server['last_online']);
$server['last_offline'] = psm_timespan($server['last_offline']); $server['last_offline'] = psm_timespan($server['last_offline']);
if ($server['last_offline'] != psm_get_lang('system', 'never')) { if ($server['last_offline'] != psm_get_lang('system', 'never')) {
$server['last_offline_duration'] = "(".$server['last_offline_duration'].")"; $server['last_offline_duration'] = is_null($server['last_offline_duration']) ?
null : "(".$server['last_offline_duration'].")";
} }
$server['last_check'] = psm_timespan($server['last_check']); $server['last_check'] = psm_timespan($server['last_check']);
$server['active'] = psm_get_lang('system', $server['active']); $server['active'] = psm_get_lang('system', $server['active']);
@ -125,6 +131,10 @@ abstract class AbstractServerController extends AbstractController {
$server['type'] = psm_get_lang('servers', 'type_'.$server['type']); $server['type'] = psm_get_lang('servers', 'type_'.$server['type']);
$server['timeout'] = ($server['timeout'] > 0) ? $server['timeout'] : PSM_CURL_TIMEOUT; $server['timeout'] = ($server['timeout'] > 0) ? $server['timeout'] : PSM_CURL_TIMEOUT;
$server['last_error'] = htmlentities($server['last_error']);
$server['last_error_output'] = htmlentities($server['last_error_output']);
$server['last_output'] = htmlentities($server['last_output']);
$url_actions = array('delete', 'edit', 'view'); $url_actions = array('delete', 'edit', 'view');
foreach ($url_actions as $action) { foreach ($url_actions as $action) {
$server['url_'.$action] = psm_build_url(array( $server['url_'.$action] = psm_build_url(array(

23
src/psm/Module/Server/Controller/ServerController.php
View File

@ -196,11 +196,13 @@ class ServerController extends AbstractServerController {
'edit_value_label' => $edit_server['label'], 'edit_value_label' => $edit_server['label'],
'edit_value_ip' => $edit_server['ip'], 'edit_value_ip' => $edit_server['ip'],
'edit_value_port' => $edit_server['port'], 'edit_value_port' => $edit_server['port'],
'edit_value_request_method' => $edit_server['request_method'],
'edit_value_timeout' => $edit_server['timeout'], 'edit_value_timeout' => $edit_server['timeout'],
'default_value_timeout' => PSM_CURL_TIMEOUT, 'default_value_timeout' => PSM_CURL_TIMEOUT,
'edit_value_pattern' => $edit_server['pattern'], 'edit_value_pattern' => $edit_server['pattern'],
'edit_pattern_selected_'.$edit_server['pattern_online'] => 'selected="selected"', 'edit_pattern_selected_'.$edit_server['pattern_online'] => 'selected="selected"',
'edit_redirect_check_selected_'.$edit_server['redirect_check'] => 'selected="selected"', 'edit_redirect_check_selected_'.$edit_server['redirect_check'] => 'selected="selected"',
'edit_value_allow_http_status' => $edit_server['allow_http_status'],
'edit_value_header_name' => $edit_server['header_name'], 'edit_value_header_name' => $edit_server['header_name'],
'edit_value_header_value' => $edit_server['header_value'], 'edit_value_header_value' => $edit_server['header_value'],
'edit_value_warning_threshold' => $edit_server['warning_threshold'], 'edit_value_warning_threshold' => $edit_server['warning_threshold'],
@ -265,10 +267,12 @@ class ServerController extends AbstractServerController {
'website_username' => psm_POST('website_username'), 'website_username' => psm_POST('website_username'),
'website_password' => $encrypted_password, 'website_password' => $encrypted_password,
'port' => intval(psm_POST('port', 0)), 'port' => intval(psm_POST('port', 0)),
'request_method' => empty(psm_POST('request_method')) ? null : psm_POST('request_method'),
'type' => psm_POST('type', ''), 'type' => psm_POST('type', ''),
'pattern' => psm_POST('pattern', ''), 'pattern' => psm_POST('pattern', ''),
'pattern_online' => in_array($_POST['pattern_online'], array('yes', 'no')) ? $_POST['pattern_online'] : 'yes', 'pattern_online' => in_array($_POST['pattern_online'], array('yes', 'no')) ? $_POST['pattern_online'] : 'yes',
'redirect_check' => in_array($_POST['redirect_check'], array('ok', 'bad')) ? $_POST['redirect_check'] : 'bad', 'redirect_check' => in_array($_POST['redirect_check'], array('ok', 'bad')) ? $_POST['redirect_check'] : 'bad',
'allow_http_status' => psm_POST('allow_http_status', ''),
'header_name' => psm_POST('header_name', ''), 'header_name' => psm_POST('header_name', ''),
'header_value' => psm_POST('header_value', ''), 'header_value' => psm_POST('header_value', ''),
'rtime' => psm_POST('rtime', '0.0000000'), 'rtime' => psm_POST('rtime', '0.0000000'),
@ -280,15 +284,15 @@ class ServerController extends AbstractServerController {
'telegram' => in_array($_POST['telegram'], array('yes', 'no')) ? $_POST['telegram'] : 'no', 'telegram' => in_array($_POST['telegram'], array('yes', 'no')) ? $_POST['telegram'] : 'no',
); );
// make sure websites start with http:// // make sure websites start with http://
if ($clean['type'] == 'website' && substr($clean['ip'], 0, 4) != 'http') { if ($clean['type'] == 'website' && substr($clean['ip'], 0, 4) != 'http' && substr($clean['ip'], 0, 3) != 'rdp') {
$clean['ip'] = 'http://'.$clean['ip']; $clean['ip'] = 'http://'.$clean['ip'];
} }
// validate the lot // validate the lot
$server_validator = new \psm\Util\Server\ServerValidator($this->db); $server_validator = new \psm\Util\Server\ServerValidator($this->db);
// format port from http/s url // format port from http, https or rdp url
if ($clean['type'] == 'website' && empty($clean['port'])) { if ($clean['type'] == 'website') {
$tmp = parse_url($clean["ip"]); $tmp = parse_url($clean["ip"]);
if (isset($tmp["port"])) { if (isset($tmp["port"])) {
$clean["port"] = $tmp["port"]; $clean["port"] = $tmp["port"];
@ -465,8 +469,12 @@ class ServerController extends AbstractServerController {
'label_fieldset_permissions' => psm_get_lang('servers', 'fieldset_permissions'), 'label_fieldset_permissions' => psm_get_lang('servers', 'fieldset_permissions'),
'label_port' => psm_get_lang('servers', 'port'), 'label_port' => psm_get_lang('servers', 'port'),
'label_custom_port' => psm_get_lang('servers', 'custom_port'), 'label_custom_port' => psm_get_lang('servers', 'custom_port'),
'label_please_select' => psm_get_lang('servers', 'please_select'),
'label_popular_ports' => psm_get_lang('servers', 'popular_ports'), 'label_popular_ports' => psm_get_lang('servers', 'popular_ports'),
'label_request_method' => psm_get_lang('servers', 'request_method'),
'label_custom_request_method' => psm_get_lang('servers', 'custom_request_method'),
'label_popular_request_methods' => psm_get_lang('servers', 'popular_request_methods'),
'label_none' => psm_get_lang('system', 'none'),
'label_please_select' => psm_get_lang('servers', 'please_select'),
'label_type' => psm_get_lang('servers', 'type'), 'label_type' => psm_get_lang('servers', 'type'),
'label_website' => psm_get_lang('servers', 'type_website'), 'label_website' => psm_get_lang('servers', 'type_website'),
'label_service' => psm_get_lang('servers', 'type_service'), 'label_service' => psm_get_lang('servers', 'type_service'),
@ -477,6 +485,8 @@ class ServerController extends AbstractServerController {
'label_pattern_online_description' => psm_get_lang('servers', 'pattern_online_description'), 'label_pattern_online_description' => psm_get_lang('servers', 'pattern_online_description'),
'label_redirect_check' => psm_get_lang('servers', 'redirect_check'), 'label_redirect_check' => psm_get_lang('servers', 'redirect_check'),
'label_redirect_check_description' => psm_get_lang('servers', 'redirect_check_description'), 'label_redirect_check_description' => psm_get_lang('servers', 'redirect_check_description'),
'label_allow_http_status' => psm_get_lang('servers', 'allow_http_status'),
'label_allow_http_status_description' => psm_get_lang('servers', 'allow_http_status_description'),
'label_header' => psm_get_lang('servers', 'header'), 'label_header' => psm_get_lang('servers', 'header'),
'label_header_name_description' => psm_get_lang('servers', 'header_name_description'), 'label_header_name_description' => psm_get_lang('servers', 'header_name_description'),
'label_header_value_description' => psm_get_lang('servers', 'header_value_description'), 'label_header_value_description' => psm_get_lang('servers', 'header_value_description'),
@ -484,6 +494,9 @@ class ServerController extends AbstractServerController {
'label_rtime' => psm_get_lang('servers', 'latency'), 'label_rtime' => psm_get_lang('servers', 'latency'),
'label_last_online' => psm_get_lang('servers', 'last_online'), 'label_last_online' => psm_get_lang('servers', 'last_online'),
'label_last_offline' => psm_get_lang('servers', 'last_offline'), 'label_last_offline' => psm_get_lang('servers', 'last_offline'),
'label_last_output' => psm_get_lang('servers', 'last_output'),
'label_last_error' => psm_get_lang('servers', 'last_error'),
'label_last_error_output' => psm_get_lang('servers', 'last_error_output'),
'label_monitoring' => psm_get_lang('servers', 'monitoring'), 'label_monitoring' => psm_get_lang('servers', 'monitoring'),
'label_email' => psm_get_lang('servers', 'email'), 'label_email' => psm_get_lang('servers', 'email'),
'label_send_email' => psm_get_lang('servers', 'send_email'), 'label_send_email' => psm_get_lang('servers', 'send_email'),
@ -502,6 +515,7 @@ class ServerController extends AbstractServerController {
'label_yes' => psm_get_lang('system', 'yes'), 'label_yes' => psm_get_lang('system', 'yes'),
'label_no' => psm_get_lang('system', 'no'), 'label_no' => psm_get_lang('system', 'no'),
'label_add_new' => psm_get_lang('system', 'add_new'), 'label_add_new' => psm_get_lang('system', 'add_new'),
'label_advanced' => psm_get_lang('system', 'advanced'),
'label_online' => psm_get_lang('system', 'online'), 'label_online' => psm_get_lang('system', 'online'),
'label_offline' => psm_get_lang('system', 'offline'), 'label_offline' => psm_get_lang('system', 'offline'),
'label_ok' => psm_get_lang('system', 'ok'), 'label_ok' => psm_get_lang('system', 'ok'),
@ -527,4 +541,3 @@ class ServerController extends AbstractServerController {
return $result; return $result;
} }
} }

3
src/psm/Module/User/Controller/UserController.php
View File

@ -49,7 +49,7 @@ class UserController extends AbstractController {
} }
public function run($action = NULL) { public function run($action = NULL) {
$servers = $this->db->select(PSM_DB_PREFIX.'servers', null, array('server_id', 'label'), '', "ORDER BY `active` ASC, `status` DESC, `label` ASC"); $servers = $this->db->select(PSM_DB_PREFIX.'servers', null, array('server_id', 'label'), '', "ORDER BY `label` ASC");
// change the indexes to reflect their server ids // change the indexes to reflect their server ids
foreach ($servers as $server) { foreach ($servers as $server) {
$this->servers[$server['server_id']] = $server; $this->servers[$server['server_id']] = $server;
@ -110,6 +110,7 @@ class UserController extends AbstractController {
'label' => $servers_labels[$server_id] 'label' => $servers_labels[$server_id]
); );
} }
sort($user['emp_servers']);
$user['url_delete'] = psm_build_url(array( $user['url_delete'] = psm_build_url(array(
'mod' => 'user', 'mod' => 'user',

14
src/psm/Util/Install/Installer.php
View File

@ -225,11 +225,13 @@ class Installer {
`server_id` int(11) unsigned NOT NULL AUTO_INCREMENT, `server_id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`ip` varchar(500) NOT NULL, `ip` varchar(500) NOT NULL,
`port` int(5) unsigned NOT NULL, `port` int(5) unsigned NOT NULL,
`request_method` varchar(50) unsigned NULL,
`label` varchar(255) NOT NULL, `label` varchar(255) NOT NULL,
`type` enum('ping','service','website') NOT NULL default 'service', `type` enum('ping','service','website') NOT NULL default 'service',
`pattern` varchar(255) NOT NULL, `pattern` varchar(255) NOT NULL default '',
`pattern_online` enum('yes','no') NOT NULL default 'yes', `pattern_online` enum('yes','no') NOT NULL default 'yes',
`redirect_check` enum('ok','bad') NOT NULL default 'bad', `redirect_check` enum('ok','bad') NOT NULL default 'bad',
`allow_http_status` varchar(255) NOT NULL default '',
`header_name` varchar(255) NOT NULL default '', `header_name` varchar(255) NOT NULL default '',
`header_value` varchar(255) NOT NULL default '', `header_value` varchar(255) NOT NULL default '',
`status` enum('on','off') NOT NULL default 'on', `status` enum('on','off') NOT NULL default 'on',
@ -249,6 +251,9 @@ class Installer {
`timeout` smallint(1) unsigned NULL DEFAULT NULL, `timeout` smallint(1) unsigned NULL DEFAULT NULL,
`website_username` varchar(255) DEFAULT NULL, `website_username` varchar(255) DEFAULT NULL,
`website_password` varchar(255) DEFAULT NULL, `website_password` varchar(255) DEFAULT NULL,
`last_error` varchar(255) DEFAULT NULL,
`last_error_output` varchar(255) DEFAULT NULL,
`last_output` varchar(255) DEFAULT NULL,
PRIMARY KEY (`server_id`) PRIMARY KEY (`server_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;", ) ENGINE=MyISAM DEFAULT CHARSET=utf8;",
PSM_DB_PREFIX.'servers_uptime' => "CREATE TABLE IF NOT EXISTS `".PSM_DB_PREFIX."servers_uptime` ( PSM_DB_PREFIX.'servers_uptime' => "CREATE TABLE IF NOT EXISTS `".PSM_DB_PREFIX."servers_uptime` (
@ -555,8 +560,13 @@ class Installer {
* If you have a lot of server that are redirecting, * If you have a lot of server that are redirecting,
* this will make sure you're servers stay online. * this will make sure you're servers stay online.
*/ */
$queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` ADD `redirect_check` ENUM( 'ok','bad' ) NOT NULL DEFAULT 'ok' AFTER `pattern_online`;"; $queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` ADD COLUMN `allow_http_status` VARCHAR(255) NOT NULL DEFAULT '' AFTER `pattern_online`;";
$queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` ADD `redirect_check` ENUM( 'ok','bad' ) NOT NULL DEFAULT 'ok' AFTER `allow_http_status`;";
$queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` CHANGE `redirect_check` `redirect_check` ENUM('ok','bad') NOT NULL DEFAULT 'bad';"; $queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` CHANGE `redirect_check` `redirect_check` ENUM('ok','bad') NOT NULL DEFAULT 'bad';";
$queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` ADD COLUMN `last_error` VARCHAR(255) NULL AFTER `website_password`;";
$queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` ADD COLUMN `last_error_output` TEXT NULL AFTER `last_error`;";
$queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` ADD COLUMN `last_output` TEXT NULL AFTER `last_error_output`;";
$queries[] = "ALTER TABLE `".PSM_DB_PREFIX."servers` ADD COLUMN `request_method` varchar(50) NULL AFTER `port`;";
$this->execSQL($queries); $this->execSQL($queries);
} }
} }

4
src/psm/Util/Server/HistoryGraph.php
View File

@ -179,8 +179,8 @@ class HistoryGraph {
} }
$records = $this->db->execute( $records = $this->db->execute(
'SELECT * "SELECT *
FROM `'.PSM_DB_PREFIX."servers_$type` FROM `".PSM_DB_PREFIX."servers_$type`
WHERE `server_id` = :server_id AND `date` BETWEEN :start_time AND :end_time ORDER BY `date` ASC", WHERE `server_id` = :server_id AND `date` BETWEEN :start_time AND :end_time ORDER BY `date` ASC",
array( array(
'server_id' => $server_id, 'server_id' => $server_id,

25
src/psm/Util/Server/Updater/StatusUpdater.php
View File

@ -37,6 +37,8 @@ use psm\Service\Database;
class StatusUpdater { class StatusUpdater {
public $error = ''; public $error = '';
public $header = '';
public $rtime = 0; public $rtime = 0;
public $status_new = false; public $status_new = false;
@ -69,6 +71,9 @@ class StatusUpdater {
* *
* Please note: if the server is down but has not met the warning threshold, this will return true * Please note: if the server is down but has not met the warning threshold, this will return true
* to avoid any "we are down" events. * to avoid any "we are down" events.
*
* @todo Get last_output when there is a HPPT 50x error.
*
* @param int $server_id * @param int $server_id
* @param int $max_runs how many times should the script recheck the server if unavailable. default is 2 * @param int $max_runs how many times should the script recheck the server if unavailable. default is 2
* @return boolean TRUE if server is up, FALSE otherwise * @return boolean TRUE if server is up, FALSE otherwise
@ -76,13 +81,14 @@ class StatusUpdater {
public function update($server_id, $max_runs = 2) { public function update($server_id, $max_runs = 2) {
$this->server_id = $server_id; $this->server_id = $server_id;
$this->error = ''; $this->error = '';
$this->header = '';
$this->rtime = ''; $this->rtime = '';
// get server info from db // get server info from db
$this->server = $this->db->selectRow(PSM_DB_PREFIX.'servers', array( $this->server = $this->db->selectRow(PSM_DB_PREFIX.'servers', array(
'server_id' => $server_id, 'server_id' => $server_id,
), array( ), array(
'server_id', 'ip', 'port', 'label', 'type', 'pattern', 'pattern_online', 'redirect_check', 'header_name', 'header_value', 'status', 'active', 'warning_threshold', 'server_id', 'ip', 'port', 'request_method', 'label', 'type', 'pattern', 'pattern_online', 'allow_http_status', 'redirect_check', 'header_name', 'header_value', 'status', 'active', 'warning_threshold',
'warning_threshold_counter', 'timeout', 'website_username', 'website_password', 'last_offline' 'warning_threshold_counter', 'timeout', 'website_username', 'website_password', 'last_offline'
)); ));
if (empty($this->server)) { if (empty($this->server)) {
@ -105,8 +111,11 @@ class StatusUpdater {
$save = array( $save = array(
'last_check' => date('Y-m-d H:i:s'), 'last_check' => date('Y-m-d H:i:s'),
'error' => $this->error, 'error' => $this->error,
'rtime' => $this->rtime, 'rtime' => $this->rtime
); );
if(!empty($this->error)){
$save['last_error'] = $this->error;
}
// log the uptime before checking the warning threshold, // log the uptime before checking the warning threshold,
// so that the warnings can still be reviewed in the server history. // so that the warnings can still be reviewed in the server history.
@ -116,6 +125,7 @@ class StatusUpdater {
// if the server is on, add the last_online value and reset the error threshold counter // if the server is on, add the last_online value and reset the error threshold counter
$save['status'] = 'on'; $save['status'] = 'on';
$save['last_online'] = date('Y-m-d H:i:s'); $save['last_online'] = date('Y-m-d H:i:s');
$save['last_output'] = $this->header;
$save['warning_threshold_counter'] = 0; $save['warning_threshold_counter'] = 0;
if ($this->server['status'] == 'off') { if ($this->server['status'] == 'off') {
$online_date = new \DateTime($save['last_online']); $online_date = new \DateTime($save['last_online']);
@ -124,8 +134,10 @@ class StatusUpdater {
$save['last_offline_duration'] = trim(psm_format_interval($difference)); $save['last_offline_duration'] = trim(psm_format_interval($difference));
} }
} else { } else {
// server is offline, increase the error counter // server is offline, increase the error counter and set last offline
$save['warning_threshold_counter'] = $this->server['warning_threshold_counter'] + 1; $save['warning_threshold_counter'] = $this->server['warning_threshold_counter'] + 1;
$save['last_offline'] = date('Y-m-d H:i:s');
$save['last_error_output'] = empty($this->header) ? "Could not get headers. probably HTTP 50x error." : $this->header;
if ($save['warning_threshold_counter'] < $this->server['warning_threshold']) { if ($save['warning_threshold_counter'] < $this->server['warning_threshold']) {
// the server is offline but the error threshold has not been met yet. // the server is offline but the error threshold has not been met yet.
@ -229,8 +241,10 @@ class StatusUpdater {
$this->server['timeout'], $this->server['timeout'],
true, true,
$this->server['website_username'], $this->server['website_username'],
psm_password_decrypt($this->server['server_id'].psm_get_conf('password_encrypt_key'), $this->server['website_password']) psm_password_decrypt($this->server['server_id'].psm_get_conf('password_encrypt_key'), $this->server['website_password']),
$this->server['request_method']
); );
$this->header = $curl_result;
$this->rtime = (microtime(true) - $starttime); $this->rtime = (microtime(true) - $starttime);
@ -250,8 +264,9 @@ class StatusUpdater {
$code = $code_matches[1][0]; $code = $code_matches[1][0];
$msg = $code_matches[2][0]; $msg = $code_matches[2][0];
$allow_http_status = explode("|", $this->server['allow_http_status']);
// All status codes starting with a 4 or higher mean trouble! // All status codes starting with a 4 or higher mean trouble!
if (substr($code, 0, 1) >= '4') { if (substr($code, 0, 1) >= '4' && !in_array($code ,$allow_http_status)) {
$this->error = "HTTP STATUS ERROR: ".$code.' '.$msg; $this->error = "HTTP STATUS ERROR: ".$code.' '.$msg;
$result = false; $result = false;
} else { } else {

32
src/templates/default/module/server/server/update.tpl.html
View File

@ -59,6 +59,32 @@
<input class="input-mini" type="text" id="port" name="port" value="{{ edit_value_port }}" maxlength="5" /> <input class="input-mini" type="text" id="port" name="port" value="{{ edit_value_port }}" maxlength="5" />
</div> </div>
</div> </div>
<div class="control-group popularRequestMethodsGroup types typeWebsite">
<label class="control-label" for="popularRequestMethods">{{ label_request_method }}</label>
<div class="controls">
<select id="popularRequestMethods" name="popularRequestMethods">
<option value="">{{ label_none }}</option>
<optgroup label="{{ label_popular_request_methods }}">
<option value="GET">GET</option>
<option value="HEAD">HEAD</option>
<option value="POST">POST</option>
<option value="PUT">PUT</option>
<option value="DELETE">DELETE</option>
<option value="CONNECT">CONNECT</option>
<option value="OPTIONS">OPTIONS</option>
<option value="TRACE">TRACE</option>
<option value="PATCH">PATCH</option>
</optgroup>
<option value="custom">{{ label_custom_request_method }}</option>
</select>
</div>
</div>
<div class="control-group requestMethodGroup types typeWebsite">
<label class="control-label" for="requestMethod">{{ label_custom_request_method }}</label>
<div class="controls">
<input class="input" type="text" id="requestMethod" name="request_method" value="{{ edit_value_request_method }}" maxlength="50" />
</div>
</div>
<div class="control-group types typeWebsite"> <div class="control-group types typeWebsite">
<label class="control-label" for="pattern">{{ label_pattern }}</label> <label class="control-label" for="pattern">{{ label_pattern }}</label>
<div class="controls"> <div class="controls">
@ -83,6 +109,12 @@
</select> </select>
</div> </div>
</div> </div>
<div class="control-group types typeWebsite">
<label class="control-label" for="allow_http_status">{{ label_allow_http_status }}</label>
<div class="controls">
<input type="text" id="allow_http_status" name="allow_http_status" value="{{ edit_value_allow_http_status }}" maxlength="255" data-toggle="tooltip" title="{{ label_allow_http_status_description }}" />
</div>
</div>
<div class="control-group types typeWebsite"> <div class="control-group types typeWebsite">
<label class="control-label" for="header_name">{{ label_header }}</label> <label class="control-label" for="header_name">{{ label_header }}</label>
<div class="controls"> <div class="controls">

16
src/templates/default/module/server/server/view.tpl.html
View File

@ -93,6 +93,22 @@
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
<tr>
<td id="advanced">{{ label_advanced }}&nbsp;<i class="icon-expand-arrow"></i></td>
<td>&nbsp;</td>
</tr>
<tr class="advanced">
<td>{{ label_last_error }}:</td>
<td>{{ last_error }}</td>
</tr>
<tr class="advanced">
<td>{{ label_last_output }}:</td>
<td>{{ last_output }}</td>
</tr>
<tr class="advanced">
<td>{{ label_last_error_output }}:</td>
<td>{{ last_error_output }}</td>
</tr>
{% if has_admin_actions %} {% if has_admin_actions %}
<tr> <tr>
<td class="hidden-small">&nbsp;</td> <td class="hidden-small">&nbsp;</td>

3
static/css/style.css
View File

@ -676,3 +676,6 @@ legend{
.icon-telegram { .icon-telegram {
background-position: -96px -168px; background-position: -96px -168px;
} }
.icon-expand-arrow {
background-position: -312px -120px;
}

67
static/js/scripts.js
View File

@ -6,11 +6,11 @@ $().ready(function() {
} }
var $modal_id = $this.attr('data-modal-id') || 'main'; var $modal_id = $this.attr('data-modal-id') || 'main';
var $modal = $('#' + $modal_id + 'Modal'); var $modal = $('#' + $modal_id + 'Modal');
if($modal.length) { if ($modal.length) {
$modal.find('.modalOKButton').data('modal-origin', $this); $modal.find('.modalOKButton').data('modal-origin', $this);
var param = $this.attr('data-modal-param'); var param = $this.attr('data-modal-param');
if(param) { if (param) {
var ary = param.split(','); var ary = param.split(',');
for (var index = 0; index < ary.length && index < 9; ++index) { for (var index = 0; index < ary.length && index < 9; ++index) {
var value = ary[index]; var value = ary[index];
@ -56,25 +56,42 @@ $().ready(function() {
if (portInput != '') { if (portInput != '') {
var findPopularPorts = $('#popularPorts').find('option[value=' + portInput + ']'); var findPopularPorts = $('#popularPorts').find('option[value=' + portInput + ']');
if(findPopularPorts.length) { if (findPopularPorts.length) {
$(findPopularPorts).attr("selected", "selected"); $(findPopularPorts).attr("selected", "selected");
} else { } else {
$('#popularPorts').find('option[value=custom]').attr("selected", "selected"); $('#popularPorts').find('option[value=custom]').attr("selected", "selected");
$('.portGroup').slideDown(); $('.portGroup').slideDown();
} }
} }
$('#popularPorts').change(function () { $('#popularPorts').change(function () {
changePopularPorts($(this).val(), false, $('#type').val()); changePopular($(this).val(), $('#type').val());
}); });
// popularRequestMethods
// initial
$('.requestMethodGroup').hide();
var requestMethodInput = $('#requestMethod').val();
if (requestMethodInput != '') {
var findPopularRequestMethods = $('#popularRequestMethods').find('option[value=' + requestMethodInput + ']');
if (findPopularRequestMethods.length) {
$(findPopularRequestMethods).attr("selected", "selected");
} else {
$('#popularRequestMethods').find('option[value=custom]').attr("selected", "selected");
$('.requestMethodGroup').slideDown();
}
}
$('#popularRequestMethods').change(function () {
changePopular($(this).val(), $('#type').val());
});
// server type // server type
$('.types').hide(); $('.types').hide();
changeTypeSwitch($('#type').val()); changeTypeSwitch($('#type').val());
$('#type').change(function () { $('#type').change(function () {
changeTypeSwitch($('#type').val()); changeTypeSwitch($('#type').val());
changePopularPorts($('#popularPorts').val(), true, $('#type').val());
}); });
}); });
@ -83,34 +100,34 @@ function changeTypeSwitch(typeInput) {
case 'service': case 'service':
$('.types').slideUp(); $('.types').slideUp();
$('.typeService').slideDown(); $('.typeService').slideDown();
changePopular($('#popularPorts').val(), typeInput, true);
break; break;
case 'website': case 'website':
$('.types').slideUp(); $('.types').slideUp();
$('.typeWebsite').slideDown(); $('.typeWebsite').slideDown();
changePopular($('#popularRequestMethods').val(), typeInput, true);
break; break;
default: default:
$('.types').hide(); $('.types').slideUp();
} }
} }
function changePopularPorts(popularPorts, changeType, typeInput) { function changePopular(inputValue, typeInput, changedType = false) {
if (changeType === true) { if (typeInput == 'website') {
if (typeInput == 'service') { htmlClass = '.requestMethodGroup';
if (popularPorts == 'custom') { htmlID = '#requestMethod';
$('.portGroup').slideDown(); } else if (typeInput == 'service') {
} else { htmlClass = '.portGroup';
$('.portGroup').hide(); htmlID = '#port';
} }
}
if (inputValue == 'custom') {
$(htmlClass).slideDown();
} else { } else {
if (popularPorts == 'custom') { changedType ? $(htmlClass).hide() : $(htmlClass).slideUp();
$('.portGroup').slideDown(); $(htmlID).val(inputValue);
} else {
$('#port').val(popularPorts);
$('.portGroup').slideUp();
}
} }
} }
@ -173,14 +190,14 @@ function rtrim(str) {
function psm_flash_message(message) { function psm_flash_message(message) {
var flashmessage = $('#flashmessage'); var flashmessage = $('#flashmessage');
if(flashmessage.length){ if (flashmessage.length) {
if(typeof message != 'undefined') { if (typeof message != 'undefined') {
flashmessage.html(message); flashmessage.html(message);
} }
var t = flashmessage.html(); var t = flashmessage.html();
var c = trim(t); var c = trim(t);
var t = c.replace('&nbsp;', ''); var t = c.replace('&nbsp;', '');
if(t){ if (t) {
flashmessage.slideDown(); flashmessage.slideDown();
} }
} }