From aaa125deb2eee3439b3ac1492a74728d8628a685 Mon Sep 17 00:00:00 2001 From: Anthony F McInerney Date: Tue, 22 Sep 2020 00:04:58 +0100 Subject: [PATCH] Add service templates --- includes/html/forms/parse-service-template.inc.php | 2 +- includes/services.inc.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/html/forms/parse-service-template.inc.php b/includes/html/forms/parse-service-template.inc.php index 0ec0ad9654..74e5746637 100644 --- a/includes/html/forms/parse-service-template.inc.php +++ b/includes/html/forms/parse-service-template.inc.php @@ -19,7 +19,7 @@ if (! Auth::user()->hasGlobalAdmin()) { $service_template_id = $vars['service_template_id']; if (is_numeric($service_template_id) && $service_template_id > 0) { - $service_template = service_template_get(null, $service_template_id); + $service_template = service_template_get($service_template_id); $output = [ 'device_group_id' => $service[0]['device_group_id'], diff --git a/includes/services.inc.php b/includes/services.inc.php index eb224169cd..128612942a 100644 --- a/includes/services.inc.php +++ b/includes/services.inc.php @@ -127,7 +127,7 @@ function add_service_template($device_group, $type, $desc, $param = '', $ignore return dbInsert($insert, 'services_template'); } -function service_template_get($device_group = null, $service_template = null) +function service_template_get($service_template = null) { $sql_query = 'SELECT `service_template_id`,`device_group_id`,`service_template_ip`,`service_template_type`,`service_template_desc`,`service_template_param`,`service_template_ignore`,`service_template_changed`,`service_template_disabled` FROM `services_template` WHERE'; $sql_param = []; @@ -184,7 +184,7 @@ function delete_service_template($service_template = null) function discover_service_template($device_group, $service_template) { if (! dbFetchCell('SELECT COUNT(service_id) FROM `services` WHERE `service_template_id`= ? AND `device_group_id` = ?', [$service_template['service_template_id'], $device_group['device_group_id']])) { - $service = service_template_get($device_group, $service_template); + $service = service_template_get($service_template); $device_ids = dbFetchColumn('SELECT `device_id` FROM `device_group_device` WHERE `device_group_id` = ?', [$device_group]); foreach ($device_ids as $device) { add_service($device, $service);