Merge branch 'develop' of https://github.com/Halvra/phpservermon into Halvra-develop

src/includes/psmconfig.inc.php

@@ -29,7 +29,7 @@
 /**
  * Current PSM version
  */
-define('PSM_VERSION', '3.1.0-dev');
+define('PSM_VERSION', '3.1.1-dev');
 
 /**
  * URL to check for updates. Will not be checked if turned off on config page.

src/lang/en_US.lang.php

@@ -111,6 +111,7 @@ $sm_lang = array(
 		'status' => 'Status',
 		'label' => 'Label',
 		'domain' => 'Domain/IP',
+		'timeout' => 'Timeout',
 		'port' => 'Port',
 		'type' => 'Type',
 		'type_website' => 'Website',

src/lang/fr_FR.lang.php

@@ -111,6 +111,7 @@ $sm_lang = array(
 		'status' => 'État',
 		'label' => 'Nom',
 		'domain' => 'Domaine/IP',
+		'timeout' => 'Timeout',
 		'port' => 'Port',
 		'type' => 'Type',
 		'type_website' => 'Site Web',

src/psm/Module/Server/Controller/AbstractServerController.class.php

@@ -74,7 +74,8 @@ abstract class AbstractServerController extends AbstractController {
 					`s`.`email`,
 					`s`.`sms`,
 					`s`.`warning_threshold`,
-					`s`.`warning_threshold_counter`
+					`s`.`warning_threshold_counter`,
+					`s`.`timeout`
 				FROM `".PSM_DB_PREFIX."servers` AS `s`
 				{$sql_join}
 				{$sql_where}

src/psm/Module/Server/Controller/ServerController.class.php

@@ -190,6 +190,7 @@ class ServerController extends AbstractServerController {
 			'edit_value_label' => $edit_server['label'],
 			'edit_value_ip' => $edit_server['ip'],
 			'edit_value_port' => $edit_server['port'],
+			'edit_value_timeout' => $edit_server['timeout'],
 			'edit_value_pattern' => $edit_server['pattern'],
 			'edit_value_warning_threshold' => $edit_server['warning_threshold'],
 			'edit_type_selected_' . $edit_server['type'] => 'selected="selected"',
@@ -216,6 +217,7 @@ class ServerController extends AbstractServerController {
 		$clean = array(
 			'label' => trim(strip_tags(psm_POST('label', ''))),
 			'ip' => trim(strip_tags(psm_POST('ip', ''))),
+			'timeout' => intval(psm_POST('timeout', 0)),
 			'port' => intval(psm_POST('port', 0)),
 			'type' => psm_POST('type', ''),
 			'pattern' => psm_POST('pattern', ''),
@@ -362,6 +364,7 @@ class ServerController extends AbstractServerController {
 				'label_label' => psm_get_lang('servers', 'label'),
 				'label_status' => psm_get_lang('servers', 'status'),
 				'label_domain' => psm_get_lang('servers', 'domain'),
+				'label_timeout' => psm_get_lang('servers', 'timeout'),
 				'label_port' => psm_get_lang('servers', 'port'),
 				'label_type' => psm_get_lang('servers', 'type'),
 				'label_website' => psm_get_lang('servers', 'type_website'),

src/psm/Util/Install/Installer.class.php

@@ -78,7 +78,7 @@ class Installer {
 
 		// different DB version, check if the version requires any changes
 		// @todo this is currently a manual check for each version, similar to upgrade().. not a clean way
-		if(version_compare($version_db, '3.0.0', '<')) {
+		if(version_compare($version_db, '3.1.1', '<')) {
 			return true;
 		} else {
 			// change database version to current version so this check won't be required next time
@@ -218,6 +218,7 @@ class Installer {
 						  `sms` enum('yes','no') NOT NULL default 'no',
                           `warning_threshold` mediumint(1) unsigned NOT NULL DEFAULT '1',
                           `warning_threshold_counter` mediumint(1) unsigned NOT NULL DEFAULT '0',
+                          `timeout` int(1) NOT NULL DEFAULT '10',
 						  PRIMARY KEY  (`server_id`)
 						) ENGINE=MyISAM  DEFAULT CHARSET=utf8;",
 			PSM_DB_PREFIX . 'servers_uptime' => "CREATE TABLE IF NOT EXISTS `" . PSM_DB_PREFIX . "servers_uptime` (
@@ -274,6 +275,10 @@ class Installer {
 			// upgrade to 3.1.0
 			$this->upgrade310();
 		}
+		if(version_compare($version_from, '3.1.1', '<')) {
+			// upgrade to 3.1.1
+			$this->upgrade311();
+		}
 		psm_update_conf('version', $version_to);
 	}
 
@@ -399,4 +404,10 @@ class Installer {
 					  ) ENGINE=MyISAM DEFAULT CHARSET=utf8;";
 		$this->execSQL($queries);
 	}
+	
+	protected function upgrade311() {
+		$queries = array();
+		$queries[] = "ALTER TABLE `" . PSM_DB_PREFIX . "servers` ADD `timeout` INT( 1 ) NOT NULL DEFAULT '10';";
+		$this->execSQL($queries);
+	}
 }

src/psm/Util/Updater/StatusUpdater.class.php

@@ -82,7 +82,7 @@ class StatusUpdater {
 		$this->server = $this->db->selectRow(PSM_DB_PREFIX . 'servers', array(
 			'server_id' => $server_id,
 		), array(
-			'server_id', 'ip', 'port', 'label', 'type', 'pattern', 'status', 'active', 'warning_threshold', 'warning_threshold_counter',
+			'server_id', 'ip', 'port', 'label', 'type', 'pattern', 'status', 'active', 'warning_threshold', 'warning_threshold_counter', 'timeout',
 		));
 		if(empty($this->server)) {
 			return false;
@@ -175,7 +175,8 @@ class StatusUpdater {
 		$curl_result = psm_curl_get(
 			$this->server['ip'],
 			true,
-			($this->server['pattern'] == '' ? false : true)
+			($this->server['pattern'] == '' ? false : true),
+			$this->server['timeout']
 		);
 
 		$this->rtime = (microtime(true) - $starttime);

src/templates/server/server.tpl.html

@@ -92,6 +92,12 @@
 				<input type="text" id="ip" name="ip" value="{edit_value_ip}" maxlength="100" />
 			</div>
 		</div>
+		<div class="control-group">
+			<label class="control-label" for="timeout">{label_timeout}</label>
+			<div class="controls">
+				<input class="input-mini" type="text" id="timeout" name="timeout" value="{edit_value_timeout}" maxlength="10" />
+			</div>
+		</div>
 		<div class="control-group">
 			<label class="control-label" for="type">{label_type}</label>
 			<div class="controls">

src/templates/server/view.tpl.html

@@ -39,6 +39,10 @@
 			<td>{label_domain}:</td>
 			<td>{ip}</td>
 		</tr>
+		<tr>
+			<td>{label_timeout}:</td>
+			<td>{timeout}</td>
+		</tr>
 		<tr>
 			<td>{label_port}:</td>
 			<td>{port}</td>