Allow setting Service Ignore and Disable in UI (#10334)

* Added disable and ignore checkboxes to services modal

* Updated add_services function to set disabled field

* Modified check-services.php respect service_disable value

* Minor code change for consistency in new_service.inc.php

* Removed unneeded includes
This commit is contained in:
Heath Barnhart
2019-07-06 10:58:06 -05:00
committed by PipoCanaja
parent 12cd540a92
commit 5a2f2497bb
5 changed files with 48 additions and 36 deletions

View File

@@ -23,11 +23,13 @@ $type = $vars['stype'];
$desc = $vars['desc'];
$ip = $vars['ip'];
$param = $vars['param'];
$ignore = isset($vars['ignore']) ? 1 : 0;
$disabled = isset($vars['disabled']) ? 1 : 0;
$device_id = $vars['device_id'];
if (is_numeric($service_id) && $service_id > 0) {
// Need to edit.
$update = array('service_desc' => $desc, 'service_ip' => $ip, 'service_param' => $param);
$update = array('service_desc' => $desc, 'service_ip' => $ip, 'service_param' => $param, 'service_ignore' => $ignore, 'service_disabled' => $disabled);
if (is_numeric(edit_service($update, $service_id))) {
$status = array('status' =>0, 'message' => 'Modified Service: <i>'.$service_id.': '.$type.'</i>');
} else {
@@ -35,7 +37,7 @@ if (is_numeric($service_id) && $service_id > 0) {
}
} else {
// Need to add.
$service_id = add_service($device_id, $type, $desc, $ip, $param);
$service_id = add_service($device_id, $type, $desc, $ip, $param, $ignore, $disabled);
if ($service_id == false) {
$status = array('status' =>1, 'message' => 'ERROR: Failed to add Service: <i>'.$type.'</i>');
} else {

View File

@@ -27,7 +27,9 @@ if (is_numeric($service_id) && $service_id > 0) {
'stype' => $service[0]['service_type'],
'ip' => $service[0]['service_ip'],
'desc' => $service[0]['service_desc'],
'param' => $service[0]['service_param']
'param' => $service[0]['service_param'],
'ignore' => $service[0]['service_ignore'],
'disabled' => $service[0]['service_disabled']
);
header('Content-Type: application/json');