From 44ac62a069e368f54c5b3fdafacfcd0e5f788484 Mon Sep 17 00:00:00 2001
From: Anthony F McInerney <afm404@gmail.com>
Date: Wed, 14 Oct 2020 13:16:42 +0100
Subject: [PATCH] service templates - move to blade -wip

---
 app/Http/Controllers/Widgets/ServiceTemplateController.php | 2 +-
 includes/discovery/services.inc.php                        | 1 +
 includes/html/forms/discover-service-template.inc.php      | 5 ++---
 includes/services.inc.php                                  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Widgets/ServiceTemplateController.php b/app/Http/Controllers/Widgets/ServiceTemplateController.php
index defb330ccd..f11c557531 100644
--- a/app/Http/Controllers/Widgets/ServiceTemplateController.php
+++ b/app/Http/Controllers/Widgets/ServiceTemplateController.php
@@ -54,7 +54,7 @@ class ServiceTemplateController extends Controller
         $this->validate($request, [
             'service_template_name' => 'required|string|unique:service_templates',
             'device_group_id' => 'integer',
-            'service_template_type' => 'required|in:dynamic,static',
+            'service_template_type' => 'string',
             'service_template_param' => 'string',
             'service_template_ip' => 'string',
             'service_template_desc' => 'string',
diff --git a/includes/discovery/services.inc.php b/includes/discovery/services.inc.php
index 0c69902cbf..2b54c14781 100644
--- a/includes/discovery/services.inc.php
+++ b/includes/discovery/services.inc.php
@@ -1,6 +1,7 @@
 <?php
 
 use LibreNMS\Config;
+use App\Models\ServiceTemplate;
 
 if (Config::get('discover_services')) {
     // Autodiscover Service Templates
diff --git a/includes/html/forms/discover-service-template.inc.php b/includes/html/forms/discover-service-template.inc.php
index c44dc548da..1579c1a3b4 100644
--- a/includes/html/forms/discover-service-template.inc.php
+++ b/includes/html/forms/discover-service-template.inc.php
@@ -16,10 +16,9 @@ if (! Auth::user()->hasGlobalAdmin()) {
 }
 
 $service_template_id = $vars['service_template_id'];
-$device_group_id = $vars['device_group_id'];
 
-if (is_numeric($service_template_id) && is_numeric($device_group_id)) {
-    if (discover_service_template($device_group_id, $service_template_id)) {
+if (is_numeric($service_template_id)) {
+    if (discover_service_template($service_template_id)) {
         $status = ['status' =>0, 'message' => 'Services for Service Template: <i>' . $service_template_id . ', have been created or updated.</i>'];
     } else {
         $status = ['status' =>1, 'message' => 'Services for Service Template: <i>' . $service_template_id . ', have NOT been created or updated.</i>'];
diff --git a/includes/services.inc.php b/includes/services.inc.php
index bcb0b3c07f..df5e0a43fe 100644
--- a/includes/services.inc.php
+++ b/includes/services.inc.php
@@ -166,11 +166,11 @@ function delete_service_template($service_template = null)
     return dbDelete('services_template', '`service_template_id` =  ?', [$service_template]);
 }
 
-function discover_service_template($device_group = null, $service_template = null)
+function discover_service_template($service_template = null)
 {
     $services_template = service_template_get($service_template);
     $status = null;
-    foreach (DB::table('device_group_device')->where('device_group_id', $device_group)->pluck('device_id') as $device) {
+    foreach (DB::table('device_group_device')->where('device_group_id', $services_template[0]['device_group_id'])->pluck('device_id') as $device) {
         foreach (DB::table('services')->where('service_template_id', $service_template)->where('device_id', $device)->where('service_template_changed', '!=', $services_template[0]['service_template_changed'])->pluck('service_id') as $service) {
             $update = ['service_desc' => $services_template[0]['service_template_desc'], 'service_ip' => $services_template[0]['service_template_ip'], 'service_param' => $services_template[0]['service_template_param'], 'service_ignore' => $services_template[0]['service_template_ignore'], 'service_disabled' => $services_template[0]['service_template_disabled'], 'service_template_id' => $services_template[0]['service_template_id'], 'service_name' => $services_template[0]['service_template_name'], 'service_template_changed' => $services_template[0]['service_template_changed']];
             edit_service($update, $service['service_id']);