- added rrd_pipes to check script

- renamed service_* to *_service

html/includes/forms/create-service.inc.php

@@ -26,7 +26,7 @@ $device_id = mres($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);
-    if (service_edit($update, $service_id)) {
+    if (edit_service($update, $service_id)) {
         $status = array('status' =>0, 'message' => 'Modified Service: <i>'.$service_id.': '.$type.'</i>');
     }
     else {
@@ -35,7 +35,7 @@ if (is_numeric($service_id) && $service_id > 0) {
 }
 else {
     // Need to add.
-    $service_id = service_add($device_id, $type, $desc, $ip, $param);
+    $service_id = add_service($device_id, $type, $desc, $ip, $param);
     if ($service_id == false) {
         $status = array('status' =>1, 'message' => 'ERROR: Failed to add Service: <i>'.$type.'</i>');
     }

html/includes/forms/delete-service.inc.php

@@ -19,7 +19,7 @@ else {
         $status = array('status' =>1, 'message' => 'No Service has been selected');
     }
     else {
-        if (service_delete($vars['service_id'])) {
+        if (delete_service($vars['service_id'])) {
             $status = array('status' =>0, 'message' => 'Service: <i>'.$vars['service_id'].', has been deleted.</i>');
         }
         else {

html/includes/print-menubar.php

@@ -3,7 +3,7 @@ require $config['install_dir'].'/includes/object-cache.inc.php';
 
 // FIXME - this could do with some performance improvements, i think. possible rearranging some tables and setting flags at poller time (nothing changes outside of then anyways)
 
-$service_status = service_status();
+$service_status = get_service_status();
 $if_alerts      = dbFetchCell("SELECT COUNT(port_id) FROM `ports` WHERE `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up' AND `ignore` = '0'");
 
 if ($_SESSION['userlevel'] >= 5) {

html/pages/addsrv.inc.php

@@ -8,7 +8,7 @@ else {
         if ($_SESSION['userlevel'] >= '10') {
             $updated = '1';
 
-            $service_id = service_add($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0);
+            $service_id = add_service($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0);
             if ($service_id) {
                 $message       .= $message_break.'Service added ('.$service_id.')!';
                 $message_break .= '<br />';

html/pages/device/edit/services.inc.php

@@ -5,7 +5,7 @@ if (is_admin() === true || is_read() === true) {
         if ($_SESSION['userlevel'] >= '10') {
             $updated = '1';
 
-            $service_id = service_add($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0);
+            $service_id = add_service($vars['device'], $vars['type'], $vars['descr'], $vars['ip'], $vars['params'], 0);
             if ($service_id) {
                 $message       .= $message_break.'Service added ('.$service_id.')!';
                 $message_break .= '<br />';

html/pages/device/overview.inc.php

@@ -7,7 +7,7 @@ $ports['up']       = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE device_id =
 $ports['down']     = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE device_id = ? AND `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up'", array($device['device_id']));
 $ports['disabled'] = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE device_id = ? AND `ifAdminStatus` = 'down'", array($device['device_id']));
 
-$services = service_status($device['device_id']);
+$services = get_service_status($device['device_id']);
 $services['total'] = array_sum($services);
 
 if ($services[0]) {

html/pages/services.inc.php

@@ -4,6 +4,9 @@ $pagetitle[] = 'Services';
 
 print_optionbar_start();
 
+require_once 'includes/modal/new_service.inc.php';
+require_once 'includes/modal/delete_service.inc.php';
+
 echo "<span style='font-weight: bold;'>Services</span> &#187; ";
 
 $menu_options = array(
@@ -86,15 +89,16 @@ if (isset($state)) {
 }
 
 ?>
-<div class="row col-sm-12" id="nagios-services">
-    <table class="table table-hover table-condensed table-striped">
-        <tr>
-            <th>Device</th>
-            <th>Service</th>
-            <th>Changed</th>
-            <th>Message</th>
-            <th>Description</th>
-        </tr>
+<div class="row col-sm-12"><span id="message"></span></div>
+<table class="table table-hover table-condensed table-striped">
+    <tr>
+        <th>Device</th>
+        <th>Service</th>
+        <th>Changed</th>
+        <th>Message</th>
+        <th>Description</th>
+        <th>&nbsp;</th>
+    </tr>
 <?php
 if ($_SESSION['userlevel'] >= '5') {
     $host_sql = 'SELECT * FROM devices AS D, services AS S WHERE D.device_id = S.device_id GROUP BY D.hostname ORDER BY D.hostname';
@@ -109,7 +113,7 @@ $shift = 1;
 foreach (dbFetchRows($host_sql, $host_par) as $device) {
     $device_id       = $device['device_id'];
     $device_hostname = $device['hostname'];
-    $devlink = generate_device_link($device);
+    $devlink = generate_device_link($device,null,array('tab' => 'services'));
     if ($shift == 1) {
         array_unshift($sql_param, $device_id);
         $shift = 0;
@@ -129,18 +133,21 @@ foreach (dbFetchRows($host_sql, $host_par) as $device) {
             $status = "<span class='grey'><b>".$service['service_type']."</b></span>";
         }
 ?>
-        <tr>
-            <td><?=$devlink?></td>
-            <td><?=$status?></td>
-            <td><?=formatUptime(time() - $service['service_changed'])?></td>
-            <td><span class='box-desc'><?=nl2br(trim($service['service_message']))?></span></td>
-            <td><span class='box-desc'><?=nl2br(trim($service['service_desc']))?></span></td>
-        </tr>
+    <tr id="row_<?=$service['service_id']?>">
+        <td><?=$devlink?></td>
+        <td><?=$status?></td>
+        <td><?=formatUptime(time() - $service['service_changed'])?></td>
+        <td><span class='box-desc'><?=nl2br(trim($service['service_message']))?></span></td>
+        <td><span class='box-desc'><?=nl2br(trim($service['service_desc']))?></span></td>
+        <td>
+            <button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-service' data-service_id='<?=$service['service_id']?>' name='edit-service'><span class='glyphicon glyphicon-pencil' aria-hidden='true'></span></button>
+            <button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-service_id='<?=$service['service_id']?>' name='delete-service'><span class='glyphicon glyphicon-trash' aria-hidden='true'></span></button>
+        </td>
+    </tr>
 <?php
     }//end foreach
 
     unset($samehost);
 }//end foreach
 ?>
-    </table>
-</div>
+</table>