From a27085243a6f4a431ecf45647dbffc067bc12fc3 Mon Sep 17 00:00:00 2001
From: Anthony F McInerney <afm404@gmail.com>
Date: Sat, 19 Sep 2020 01:29:20 +0100
Subject: [PATCH] Add service templates

---
 .../2020_09_18_230114_create_services_template_table.php    | 2 +-
 includes/html/forms/discover-service-template.inc.php       | 6 +++---
 includes/html/forms/parse-service-template.inc.php          | 2 +-
 includes/services.inc.php                                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/database/migrations/2020_09_18_230114_create_services_template_table.php b/database/migrations/2020_09_18_230114_create_services_template_table.php
index a67c23cdad..429cfed776 100644
--- a/database/migrations/2020_09_18_230114_create_services_template_table.php
+++ b/database/migrations/2020_09_18_230114_create_services_template_table.php
@@ -24,7 +24,7 @@ class CreateServicesTemplateTable extends Migration
             $table->tinyInteger('service_template_status')->default(0);
             $table->unsignedInteger('service_template_changed')->default(0);
             $table->boolean('service_template_disabled')->default(0);
-            $table->index(['services_template_device_group_id_index','device_group_id']);
+            #$table->index(['services_template_device_group_id_index','device_group_id']);
         });
     }
 
diff --git a/includes/html/forms/discover-service-template.inc.php b/includes/html/forms/discover-service-template.inc.php
index edc24e50ca..1159abaf67 100644
--- a/includes/html/forms/discover-service-template.inc.php
+++ b/includes/html/forms/discover-service-template.inc.php
@@ -19,10 +19,10 @@ if (!Auth::user()->hasGlobalAdmin()) {
     } elseif (!is_numeric($vars['device_group_id'])) {
             $status = array('status' =>1, 'message' => 'No Device Group has been selected');
     } else {
-        if (discover_service_template($vars['device_group_id'],$vars['service_template_id'])) {
-            $status = array('status' =>0, 'message' => 'Device Group: <i>'.$vars['device_group_id'].',Service Template: <i>'.$vars['service_template_id'].', has been discovered.</i>');
+        if (discover_service_template($vars['device_group_id'], $vars['service_template_id'])) {
+            $status = array('status' =>0, 'message' => 'Device Group: <i>'.$vars['device_group_id'].', Service Template: <i>'.$vars['service_template_id'].', has been discovered.</i>');
         } else {
-            $status = array('status' =>1, 'message' => 'Device Group: <i>'.$vars['device_group_id'].',Service Template: <i>'.$vars['service_template_id'].', has been discovered.</i>');
+            $status = array('status' =>1, 'message' => 'Device Group: <i>'.$vars['device_group_id'].', Service Template: <i>'.$vars['service_template_id'].', has been discovered.</i>');
         }
     }
 }
diff --git a/includes/html/forms/parse-service-template.inc.php b/includes/html/forms/parse-service-template.inc.php
index 41d2e89570..d201d1a9c7 100644
--- a/includes/html/forms/parse-service-template.inc.php
+++ b/includes/html/forms/parse-service-template.inc.php
@@ -27,7 +27,7 @@ if (is_numeric($service_template_id) && $service_template_id > 0) {
         'desc'      => $service[0]['service_desc'],
         'param'     => $service[0]['service_param'],
         'ignore'    => $service[0]['service_ignore'],
-        'disabled'  => $service[0]['service_disabled']        
+        'disabled'  => $service[0]['service_disabled']
     );
 
     header('Content-Type: application/json');
diff --git a/includes/services.inc.php b/includes/services.inc.php
index be6fa8aca1..b492d85d05 100644
--- a/includes/services.inc.php
+++ b/includes/services.inc.php
@@ -187,7 +187,7 @@ function discover_service_template($device_group, $service_template)
         $device_ids = dbFetchColumn("SELECT `device_id` FROM `device_group_device` WHERE `device_group_id`=" . $_POST['device_group_id']);
         foreach ($device_ids as $device) {
             add_service($device, $service);
-        }    
+        }
         log_event('Autodiscovered service: type ' . mres($service), $device, 'service', 2);
         echo '+';
     }