From 345f5c8b8e162f2aaa2c5ce00463ba3e6b75a4fa Mon Sep 17 00:00:00 2001 From: Anthony F McInerney Date: Tue, 15 Sep 2020 16:05:43 +0100 Subject: [PATCH] Add service templates --- .../forms/create-service-template.inc.php | 46 +++++++++++++++++++ .../html/modal/new_service_template.inc.php | 26 +++++------ .../html/pages/services-templates.inc.php | 2 +- .../html/print-service-add-template.inc.php | 8 ++++ includes/services.inc.php | 8 ++-- sql-schema/282.sql | 2 +- 6 files changed, 73 insertions(+), 19 deletions(-) create mode 100644 includes/html/forms/create-service-template.inc.php diff --git a/includes/html/forms/create-service-template.inc.php b/includes/html/forms/create-service-template.inc.php new file mode 100644 index 0000000000..6b5eca0fa9 --- /dev/null +++ b/includes/html/forms/create-service-template.inc.php @@ -0,0 +1,46 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +if (!Auth::user()->hasGlobalAdmin()) { + die('ERROR: You need to be admin'); +} + +$service_template_id = $vars['service_template_id']; +$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_group_id = $vars['device_group_id']; + +if (is_numeric($service_template_id) && $service_template_id > 0) { + // Need to edit. + $update = array('service_template_desc' => $desc, 'service_template_ip' => $ip, 'service_template_param' => $param, 'service_template_ignore' => $ignore, 'service_template_disabled' => $disabled); + if (is_numeric(edit_service($update, $service_template_id))) { + $status = array('status' =>0, 'message' => 'Modified Service Template: '.$service_template_id.': '.$type.''); + } else { + $status = array('status' =>1, 'message' => 'ERROR: Failed to modify Service Template: '.$service_template_id.''); + } +} else { + // Need to add. + $service_template_id = add_service_template($device_group_id, $type, $desc, $ip, $param, $ignore, $disabled); + if ($service_template_id == false) { + $status = array('status' =>1, 'message' => 'ERROR: Failed to add Service Template: '.$service_template_id.': '.$type.''); + } else { + $status = array('status' =>0, 'message' => 'Added Service Template: '.$service_template_id.': '.$type.''); + } +} +header('Content-Type: application/json'); +echo _json_encode($status); diff --git a/includes/html/modal/new_service_template.inc.php b/includes/html/modal/new_service_template.inc.php index 967ef3a40c..a60f297cad 100644 --- a/includes/html/modal/new_service_template.inc.php +++ b/includes/html/modal/new_service_template.inc.php @@ -34,17 +34,17 @@ if (Auth::user()->hasGlobalAdmin()) {
-
+ - + -
+
 
-
+
-
+
-
+
'/>
-
+
-
+
-
+
-
+
- +
@@ -116,7 +116,7 @@ $('#create-service-template').on('show.bs.modal', function (e) { $.ajax({ type: "POST", url: "ajax_form.php", - data: { type: "parse-service", service_template_id: service_template_id }, + data: { type: "parse-service-template", service_template_id: service_template_id }, dataType: "json", success: function(output) { $('#stype').val(output['stype']); @@ -143,7 +143,7 @@ $('#service-template-submit').click('', function(e) { $.ajax({ type: "POST", url: "ajax_form.php", - data: $('form.service-form').serialize(), + data: $('form.service-template-form').serialize(), success: function(result){ if (result.status == 0) { // Yay. diff --git a/includes/html/pages/services-templates.inc.php b/includes/html/pages/services-templates.inc.php index 222c17d15c..0130b0e49d 100644 --- a/includes/html/pages/services-templates.inc.php +++ b/includes/html/pages/services-templates.inc.php @@ -24,7 +24,7 @@ require_once 'includes/html/modal/delete_service_template.inc.php';
- Services » + Services Templates »
+
+ +
+ +
+
+
+
diff --git a/includes/services.inc.php b/includes/services.inc.php index 89bb927088..d1d1cd1212 100644 --- a/includes/services.inc.php +++ b/includes/services.inc.php @@ -112,13 +112,13 @@ function add_service_template($device_group, $type, $desc, $param = "", $ignore # $device_group = device_group_by_id_cache($device_group); # } - $insert = array('device_group_id' => $device_group['device_group_id'], 'service_template_type' => $type, 'service_template_changed' => array('UNIX_TIMESTAMP(NOW())'), 'service_template_desc' => $desc, 'service_template_param' => $param, 'service_template_ignore' => $ignore, 'service_template_disabled' => $disabled); + $insert = array('device_group_id' => $device_group['device_group_id'], 'service_template_ip' => $ip, 'service_template_type' => $type, 'service_template_changed' => array('UNIX_TIMESTAMP(NOW())'), 'service_template_desc' => $desc, 'service_template_param' => $param, 'service_template_ignore' => $ignore, 'service_template_disabled' => $disabled); return dbInsert($insert, 'services_template'); } function service_template_get($device_group = null, $service_template = null) { - $sql_query = "SELECT `service_template_id`,`device_group_id`,`service_template_type`,`service_template_desc`,`service_template_param`,`service_template_ignore`,`service_template_changed`,`service_template_disabled` FROM `services_template` WHERE"; + $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 = array(); $add = 0; @@ -158,7 +158,7 @@ function edit_service_template($update = array(), $service_template = null) return false; } - return dbUpdate($update, 'services_template', '`service_template_id`=?', array($service)); + return dbUpdate($update, 'services_template', '`service_template_id`=?', array($service_template)); } function delete_service_template($service_template = null) @@ -167,7 +167,7 @@ function delete_service_template($service_template = null) return false; } - return dbDelete('services_template', '`service_template_id` = ?', array($service)); + return dbDelete('services_template', '`service_template_id` = ?', array($service_template)); } function discover_service($device, $service) diff --git a/sql-schema/282.sql b/sql-schema/282.sql index e42fe4029e..8f180141bc 100644 --- a/sql-schema/282.sql +++ b/sql-schema/282.sql @@ -1 +1 @@ -CREATE TABLE IF NOT EXISTS `services_template` ( `service_template_id` int unsigned NOT NULL AUTO_INCREMENT, `device_group_id` int NOT NULL, `service_template_type` varchar(255) NOT NULL, `service_template_desc` text NOT NULL, `service_template_param` text NOT NULL, `service_template_ignore` tinyint(1) NOT NULL, `service_template_changed` int unsigned NOT NULL DEFAULT '0', `service_template_disabled` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`service_template_id`), KEY `service_template_devicegroup` (`device_group_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci; +CREATE TABLE IF NOT EXISTS `services_template` ( `service_template_id` int unsigned NOT NULL AUTO_INCREMENT, `device_group_id` int NOT NULL, `service_template_type` varchar(255) NOT NULL, `service_template_ip` text NOT NULL, `service_template_desc` text NOT NULL, `service_template_param` text NOT NULL, `service_template_ignore` tinyint(1) NOT NULL, `service_template_changed` int unsigned NOT NULL DEFAULT '0', `service_template_disabled` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`service_template_id`), KEY `service_template_devicegroup` (`device_group_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_unicode_ci;