Merge branch 'master' into issue-714

html/ajax_rulesuggest.php

@@ -67,10 +67,16 @@ if( isset($_GET['term'],$_GET['device_id']) ) {
 			$chk = $memcache->get('rule-suggest_'.$term[0]);
 		}
 		if( !(sizeof($chk) > 0) || $chk === false ) {
-			$tmp = dbFetchRows('SHOW COLUMNS FROM '.$term[0]);
-			foreach( $tmp as $tst ) {
-				if( isset($tst['Field']) ) {
-					$chk[] = $term[0].'.'.$tst['Field'];
+			if( $term[0] == "macros" ) {
+				foreach( $config['alert']['macros']['rule'] as $macro=>$v ) {
+					$chk[] = "macros.".$macro;
+				}
+			} else {
+				$tmp = dbFetchRows('SHOW COLUMNS FROM '.$term[0]);
+				foreach( $tmp as $tst ) {
+					if( isset($tst['Field']) ) {
+						$chk[] = $term[0].'.'.$tst['Field'];
+					}
 				}
 			}
 		}
@@ -84,6 +90,8 @@ if( isset($_GET['term'],$_GET['device_id']) ) {
 			foreach( $tmp as $tst ) {
 				$chk[] = $tst['TABLE_NAME'].'.';
 			}
+			$chk[] = 'macros.';
+			$chk[] = 'bills.';
 		}
 	}
 	if( sizeof($chk) > 0 ) {

html/ajax_search.php

@@ -31,9 +31,9 @@ if (isset($_REQUEST['search']))
 
     if( $_REQUEST['type'] == 'group' ) {
       include_once('../includes/device-groups.inc.php');
-      foreach( dbFetchRows("SELECT name FROM device_groups WHERE name LIKE '%".$search."%'") as $group ) {
+      foreach( dbFetchRows("SELECT id,name FROM device_groups WHERE name LIKE '%".$search."%'") as $group ) {
         if( $_REQUEST['map'] ) {
-          $results[] = array('name'=>'g:'.$group['name']);
+          $results[] = array('name'=>'g:'.$group['name'],'group_id'=>$group['id']);
         } else {
           $results[] = array('name'=>$group['name']);
         }
@@ -47,7 +47,11 @@ if (isset($_REQUEST['search']))
     } elseif($_REQUEST['type'] == 'device') {
 
       // Device search
-      $results = dbFetchRows("SELECT * FROM `devices` WHERE `hostname` LIKE '%" . $search . "%' OR `location` LIKE '%" . $search . "%' ORDER BY hostname LIMIT 8");
+      if (is_admin() === TRUE || is_read() === TRUE) {
+          $results = dbFetchRows("SELECT * FROM `devices` WHERE `hostname` LIKE '%" . $search . "%' OR `location` LIKE '%" . $search . "%' ORDER BY hostname LIMIT 8");
+      } else {
+          $results = dbFetchRows("SELECT * FROM `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` AND (`hostname` LIKE '%" . $search . "%' OR `location` LIKE '%" . $search . "%') ORDER BY hostname LIMIT 8", array($_SESSION['user_id']));
+      }
       if (count($results))
       {
         $found = 1;
@@ -72,8 +76,13 @@ if (isset($_REQUEST['search']))
           {
             $highlight_colour = '#008000';
           }
-          $num_ports = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE device_id = ?", array($result['device_id']));
+          if (is_admin() === TRUE || is_read() === TRUE) {
+              $num_ports = dbFetchCell("SELECT COUNT(*) FROM `ports` WHERE device_id = ?", array($result['device_id']));
+          } else {
+              $num_ports = dbFetchCell("SELECT COUNT(*) FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` AND `I`.`device_id` = `D`.`device_id` AND device_id = ?", array($_SESSION['user_id'],$result['device_id']));
+          }
           $device[]=array('name'=>$name,
+          'device_id'=>$result['device_id'],
           'url'=> generate_device_url($result),
           'colours'=>$highlight_colour,
           'device_ports'=>$num_ports,
@@ -90,7 +99,11 @@ if (isset($_REQUEST['search']))
     
     } elseif($_REQUEST['type'] == 'ports') {
       // Search ports
-      $results = dbFetchRows("SELECT `ports`.*,`devices`.* FROM `ports` LEFT JOIN `devices` ON  `ports`.`device_id` =  `devices`.`device_id` WHERE `ifAlias` LIKE '%" . $search . "%' OR `ifDescr` LIKE '%" . $search . "%' ORDER BY ifDescr LIMIT 8");
+      if (is_admin() === TRUE || is_read() === TRUE) {
+          $results = dbFetchRows("SELECT `ports`.*,`devices`.* FROM `ports` LEFT JOIN `devices` ON  `ports`.`device_id` =  `devices`.`device_id` WHERE `ifAlias` LIKE '%" . $search . "%' OR `ifDescr` LIKE '%" . $search . "%' ORDER BY ifDescr LIMIT 8");
+      } else {
+          $results = dbFetchRows("SELECT DISTINCT(`I`.`port_id`), `I`.*, `D`.`hostname` FROM `ports` AS `I`, `devices` AS `D`, `devices_perms` AS `P`, `ports_perms` AS `PP` WHERE ((`P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id`) OR (`PP`.`user_id` = ? AND `PP`.`port_id` = `I`.`port_id` AND `I`.`device_id` = `D`.`device_id`)) AND `D`.`device_id` = `I`.`device_id` AND (`ifAlias` LIKE '%" . $search . "%' OR `ifDescr` LIKE '%" . $search . "%') ORDER BY ifDescr LIMIT 8", array($_SESSION['user_id'],$_SESSION['user_id']));
+      }
 
       if (count($results))
       {
@@ -143,7 +156,11 @@ if (isset($_REQUEST['search']))
 
     } elseif($_REQUEST['type'] == 'bgp') {
       // Search bgp peers
-      $results = dbFetchRows("SELECT `bgpPeers`.*,`devices`.* FROM `bgpPeers` LEFT JOIN `devices` ON  `bgpPeers`.`device_id` =  `devices`.`device_id` WHERE `astext` LIKE '%" . $search . "%' OR `bgpPeerIdentifier` LIKE '%" . $search . "%' OR `bgpPeerRemoteAs` LIKE '%" . $search . "%' ORDER BY `astext` LIMIT 8");
+      if (is_admin() === TRUE || is_read() === TRUE) {
+          $results = dbFetchRows("SELECT `bgpPeers`.*,`devices`.* FROM `bgpPeers` LEFT JOIN `devices` ON  `bgpPeers`.`device_id` =  `devices`.`device_id` WHERE `astext` LIKE '%" . $search . "%' OR `bgpPeerIdentifier` LIKE '%" . $search . "%' OR `bgpPeerRemoteAs` LIKE '%" . $search . "%' ORDER BY `astext` LIMIT 8");
+      } else {
+          $results = dbFetchRows("SELECT `bgpPeers`.*,`D`.* FROM `bgpPeers`, `devices` AS `D`, `devices_perms` AS `P` WHERE `P`.`user_id` = ? AND `P`.`device_id` = `D`.`device_id` AND  `bgpPeers`.`device_id`=`D`.`device_id` AND  (`astext` LIKE '%" . $search . "%' OR `bgpPeerIdentifier` LIKE '%" . $search . "%' OR `bgpPeerRemoteAs` LIKE '%" . $search . "%') ORDER BY `astext` LIMIT 8", array($_SESSION['user_id']));
+      }
       if (count($results))
       {
         $found = 1;

html/ajax_table.php

@@ -39,6 +39,7 @@ if (isset($_POST['sort']) && is_array($_POST['sort'])) {
 }
 $searchPhrase = mres($_POST['searchPhrase']);
 $id = mres($_POST['id']);
+$response = array();
 
 if (isset($id)) {
     if (file_exists("includes/table/$id.inc.php")) {

html/api_v0.php

@@ -29,6 +29,7 @@ $app->setName('api');
 $app->group('/api', function() use ($app) {
   $app->group('/v0', function() use ($app) {
     $app->get('/bgp', 'authToken', 'list_bgp')->name('list_bgp');//api/v0/bgp
+    $app->get('/oxidized', 'authToken', 'list_oxidized')->name('list_oxidized');
     $app->group('/devices', function() use ($app) {
       $app->delete('/:hostname', 'authToken', 'del_device')->name('del_device');//api/v0/devices/$hostname
       $app->get('/:hostname', 'authToken', 'get_device')->name('get_device');//api/v0/devices/$hostname

html/css/dark.css

@@ -17,3 +17,80 @@
 .twitter-typeahead .tt-hint {
     border-color: #000 !important;
 }
+
+.pace {
+  -webkit-pointer-events: none;
+  pointer-events: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+
+.pace-inactive {
+  display: none;
+}
+
+.pace .pace-progress {
+  background: #e30613;
+  position: fixed;
+  z-index: 2000;
+  top: 0;
+  right: 100%;
+  width: 100%;
+  height: 2px;
+}
+
+.pace .pace-progress-inner {
+  display: block;
+  position: absolute;
+  right: 0px;
+  width: 100px;
+  height: 100%;
+  box-shadow: 0 0 10px #e30613, 0 0 5px #e30613;
+  opacity: 1.0;
+  -webkit-transform: rotate(3deg) translate(0px, -4px);
+  -moz-transform: rotate(3deg) translate(0px, -4px);
+  -ms-transform: rotate(3deg) translate(0px, -4px);
+  -o-transform: rotate(3deg) translate(0px, -4px);
+  transform: rotate(3deg) translate(0px, -4px);
+}
+
+.pace .pace-activity {
+  display: block;
+  position: fixed;
+  z-index: 2000;
+  top: 16px;
+  right: 45px;
+  width: 20px;
+  height: 20px;
+  border: solid 2px transparent;
+  border-top-color: #e30613;
+  border-left-color: #e30613;
+  border-radius: 10px;
+  -webkit-animation: pace-spinner 400ms linear infinite;
+  -moz-animation: pace-spinner 400ms linear infinite;
+  -ms-animation: pace-spinner 400ms linear infinite;
+  -o-animation: pace-spinner 400ms linear infinite;
+  animation: pace-spinner 400ms linear infinite;
+}
+
+@-webkit-keyframes pace-spinner {
+  0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-moz-keyframes pace-spinner {
+  0% { -moz-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -moz-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-o-keyframes pace-spinner {
+  0% { -o-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -o-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-ms-keyframes pace-spinner {
+  0% { -ms-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -ms-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@keyframes pace-spinner {
+  0% { transform: rotate(0deg); transform: rotate(0deg); }
+  100% { transform: rotate(360deg); transform: rotate(360deg); }
+}

html/css/light.css

@@ -1,5 +1,5 @@
 .fa-nav-icons {
-    color: #e30613;
+    color: #383637;
 }
 
 .fa-col-success {
@@ -14,3 +14,79 @@
     color: #357ebd;
 }
 
+.pace {
+  -webkit-pointer-events: none;
+  pointer-events: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+
+.pace-inactive {
+  display: none;
+}
+
+.pace .pace-progress {
+  background: #29d;
+  position: fixed;
+  z-index: 2000;
+  top: 0;
+  right: 100%;
+  width: 100%;
+  height: 2px;
+}
+
+.pace .pace-progress-inner {
+  display: block;
+  position: absolute;
+  right: 0px;
+  width: 100px;
+  height: 100%;
+  box-shadow: 0 0 10px #29d, 0 0 5px #29d;
+  opacity: 1.0;
+  -webkit-transform: rotate(3deg) translate(0px, -4px);
+  -moz-transform: rotate(3deg) translate(0px, -4px);
+  -ms-transform: rotate(3deg) translate(0px, -4px);
+  -o-transform: rotate(3deg) translate(0px, -4px);
+  transform: rotate(3deg) translate(0px, -4px);
+}
+
+.pace .pace-activity {
+  display: block;
+  position: fixed;
+  z-index: 2000;
+  top: 16px;
+  right: 45px;
+  width: 20px;
+  height: 20px;
+  border: solid 2px transparent;
+  border-top-color: #29d;
+  border-left-color: #29d;
+  border-radius: 10px;
+  -webkit-animation: pace-spinner 400ms linear infinite;
+  -moz-animation: pace-spinner 400ms linear infinite;
+  -ms-animation: pace-spinner 400ms linear infinite;
+  -o-animation: pace-spinner 400ms linear infinite;
+  animation: pace-spinner 400ms linear infinite;
+}
+
+@-webkit-keyframes pace-spinner {
+  0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-moz-keyframes pace-spinner {
+  0% { -moz-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -moz-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-o-keyframes pace-spinner {
+  0% { -o-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -o-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-ms-keyframes pace-spinner {
+  0% { -ms-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -ms-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@keyframes pace-spinner {
+  0% { transform: rotate(0deg); transform: rotate(0deg); }
+  100% { transform: rotate(360deg); transform: rotate(360deg); }
+}

html/css/mono.css

@@ -17,3 +17,80 @@
 .twitter-typeahead .tt-hint {
     border-color: #000 !important;
 }
+
+.pace {
+  -webkit-pointer-events: none;
+  pointer-events: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
+
+.pace-inactive {
+  display: none;
+}
+
+.pace .pace-progress {
+  background: #fff;
+  position: fixed;
+  z-index: 2000;
+  top: 0;
+  right: 100%;
+  width: 100%;
+  height: 2px;
+}
+
+.pace .pace-progress-inner {
+  display: block;
+  position: absolute;
+  right: 0px;
+  width: 100px;
+  height: 100%;
+  box-shadow: 0 0 10px #d6cdbe, 0 0 5px #d6cdbe;
+  opacity: 1.0;
+  -webkit-transform: rotate(3deg) translate(0px, -4px);
+  -moz-transform: rotate(3deg) translate(0px, -4px);
+  -ms-transform: rotate(3deg) translate(0px, -4px);
+  -o-transform: rotate(3deg) translate(0px, -4px);
+  transform: rotate(3deg) translate(0px, -4px);
+}
+
+.pace .pace-activity {
+  display: block;
+  position: fixed;
+  z-index: 2000;
+  top: 16px;
+  right: 45px;
+  width: 20px;
+  height: 20px;
+  border: solid 2px transparent;
+  border-top-color: #9a968f;
+  border-left-color: #9a968f;
+  border-radius: 10px;
+  -webkit-animation: pace-spinner 400ms linear infinite;
+  -moz-animation: pace-spinner 400ms linear infinite;
+  -ms-animation: pace-spinner 400ms linear infinite;
+  -o-animation: pace-spinner 400ms linear infinite;
+  animation: pace-spinner 400ms linear infinite;
+}
+
+@-webkit-keyframes pace-spinner {
+  0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-moz-keyframes pace-spinner {
+  0% { -moz-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -moz-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-o-keyframes pace-spinner {
+  0% { -o-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -o-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-ms-keyframes pace-spinner {
+  0% { -ms-transform: rotate(0deg); transform: rotate(0deg); }
+  100% { -ms-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@keyframes pace-spinner {
+  0% { transform: rotate(0deg); transform: rotate(0deg); }
+  100% { transform: rotate(360deg); transform: rotate(360deg); }
+}

html/css/styles.css

@@ -1560,20 +1560,6 @@ tr.search:nth-child(odd) {
     overflow-x: hidden;
 }
 
-.tt-dropdown-menu
-{
-    min-width: 500px;
-    left: -400px !important;
-}
-
-.twitter-typeahead .tt-hint {
-    display: block;
-    height: 34px;
-    padding: 8px 12px;
-    font-size: 14px;
-    line-height: 1.428571429;
-    border: 1px solid transparent;
-}
 
 .ui-autocomplete {
     max-height: 100px;
@@ -1603,5 +1589,68 @@ tr.search:nth-child(odd) {
 
 #visualization {
     width: 90%;
-    height: 600px;
+    min-height: 600px;
 }
+
+.threeqtr-width {
+    display:block;
+    min-width: 75%;
+}
+
+.tt-menu {
+  position: absolute;
+  top: 95%;
+  left: 2.5%;
+  z-index: 100;
+  display: none;
+  min-width: 400px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #fff;
+  -webkit-border-radius: 8px;
+     -moz-border-radius: 8px;
+          border-radius: 8px;
+          box-shadow: 0px 0px 0px 1px green;
+  -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+     -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+          box-shadow: 0 5px 10px rgba(0,0,0,.2);
+}
+
+.tt-open {
+  position: absolute;
+  top: 95%;
+  left: 2.5%;
+  z-index: 100;
+  display: none;
+  min-width: 400px;
+  left: -400px !important;
+  margin-bottom: 20px;
+  overflow: hidden;
+  padding: 8px;
+  background-color: #fff;
+  -webkit-border-radius: 8px;
+     -moz-border-radius: 8px;
+          border-radius: 8px;
+          box-shadow: 0px 0px 0px 1px green;
+  -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+     -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+          box-shadow: 0 5px 10px rgba(0,0,0,.2);
+}
+
+.typeahead-left {
+    left: 0px !important;
+}
+
+.tt-selectable {
+  cursor: pointer;
+}
+
+.tt-suggestion:hover a {
+     color: #ffffff !important;
+}
+
+.tt-suggestion:hover {
+	background-color: #0097CF;
+	color: #FFFFFF;
+}
+

html/css/typeahead.js-bootstrap.css

@@ -1,49 +0,0 @@
-.twitter-typeahead .tt-query,
-.twitter-typeahead .tt-hint {
-  margin-bottom: 0;
-}
-
-.tt-dropdown-menu {
-  min-width: 160px;
-  margin-top: 2px;
-  padding: 5px 0;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
-     -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
-          box-shadow: 0 5px 10px rgba(0,0,0,.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-}
-
-.tt-suggestion {
-  display: block;
-  padding: 3px 20px;
-}
-
-.tt-suggestion.tt-is-under-cursor {
-  color: #fff;
-  background-color: #0081c2;
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0)
-}
-
-.tt-suggestion.tt-is-under-cursor a {
-  color: #fff;
-}
-
-.tt-suggestion p {
-  margin: 0;
-}

html/csv.php

@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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 (strpos($_SERVER['PATH_INFO'], "debug"))
+{
+  $debug = "1";
+  ini_set('display_errors', 1);
+  ini_set('display_startup_errors', 1);
+  ini_set('log_errors', 1);
+  ini_set('error_reporting', E_ALL);
+} else {
+  $debug = FALSE;
+  ini_set('display_errors', 0);
+  ini_set('display_startup_errors', 0);
+  ini_set('log_errors', 0);
+  ini_set('error_reporting', 0);
+}
+
+include "../includes/defaults.inc.php";
+include "../config.php";
+include_once "../includes/definitions.inc.php";
+include "../includes/functions.php";
+include "includes/functions.inc.php";
+include "includes/vars.inc.php";
+include "includes/authenticate.inc.php";
+
+$report = mres($vars['report']);
+if( !empty($report) && file_exists("includes/reports/$report.csv.inc.php")) {
+	if( $debug == false ) {
+		header("Content-Type: text/csv");
+		header('Content-Disposition: attachment; filename="'.$report.'-'.date('Ymd').'.csv"');
+	}
+	$csv = array();
+	include_once "includes/reports/$report.csv.inc.php";
+	foreach( $csv as $line ) {
+		echo implode(',',$line)."\n";
+	}
+} else {
+	echo "Report not found.\n";
+}
+?>

html/forms/callback-clear.inc.php

@@ -0,0 +1,15 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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.
+ */
+
+dbUpdate(array('value' => '2'), 'callback', '`name` = "enabled"', array());

html/forms/callback-statistics.inc.php

@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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 ($_POST['state'] == 'true') {
+    $state = 1;
+} elseif ($_POST['state'] == 'false') {
+    $state = 0;
+} else {
+    $state = 0;
+}
+
+if( dbUpdate(array('value' => $state), 'callback', '`name` = "enabled"', array()) == 0) {
+    dbInsert(array('value' => $state,'name' => 'enabled'), 'callback');
+}

html/forms/delete-device-group.inc.php

@@ -21,6 +21,12 @@ if(!is_numeric($_POST['group_id'])) {
     exit;
 } else {
     if(dbDelete('device_groups', "`id` =  ?", array($_POST['group_id']))) {
+      if( dbFetchCell('SELECT COUNT(id) FROM alert_map WHERE target = ?',array('g'.$_POST['group_id'])) >= 1 ) {
+        foreach( dbFetchRows('SELECT id FROM alert_map WHERE target = ?',array('g'.$_POST['group_id'])) as $map ) {
+          $_POST['map_id'] = $map['id'];
+          include('forms/delete-alert-map.inc.php');
+        }
+      }
       echo('group has been deleted.');
       exit;
     } else {

html/forms/schedule-maintenance.inc.php

@@ -0,0 +1,109 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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(is_admin() === false) {
+    die('ERROR: You need to be admin');
+}
+
+$sub_type = $_POST['sub_type'];
+
+if ($sub_type == 'new-maintenance') {
+
+    // Defaults
+    $status = 'error';
+    $update = 0;
+
+    $schedule_id = mres($_POST['schedule_id']);
+    if ($schedule_id > 0) {
+        $update = 1;
+    }
+    $title = mres($_POST['title']);
+    $notes = mres($_POST['notes']);
+    $start = mres($_POST['start']);
+    $end   = mres($_POST['end']);
+    $maps  = mres($_POST['maps']);
+
+    if (empty($title)) {
+        $message = "Missing title<br />";
+    }
+    if (empty($start)) {
+        $message .= "Missing start date<br />";
+    }
+    if (empty($end)) {
+        $message .= "Missing end date<br />";
+    }
+    if( !is_array($_POST['maps']) ) {
+        $message .= "Not mapped to any groups or devices<br />";
+    }
+
+    if (empty($message)) {
+        if (empty($schedule_id)) {
+            $schedule_id = dbInsert(array('start'=>$start,'end'=>$end,'title'=>$title,'notes'=>$notes),'alert_schedule');
+        } else {
+            dbUpdate(array('start'=>$start,'end'=>$end,'title'=>$title,'notes'=>$notes),'alert_schedule','`schedule_id`=?',array($schedule_id));
+        }
+        if ($schedule_id > 0) {
+            $items = array();
+            $fail = 0;
+ 
+            if ($update == 1) {
+                dbDelete('alert_schedule_items', '`schedule_id`=?', array($schedule_id));
+            }
+
+            foreach( $_POST['maps'] as $target ) {
+                $target = target_to_id($target);
+                $item = dbInsert(array('schedule_id'=>$schedule_id,'target'=>$target),'alert_schedule_items');
+                if ($item > 0) {
+                     array_push($items,$item);
+                } else {
+                    $fail = 1;
+                }
+            }
+            if ($fail == 1 && $update == 0) {
+                foreach ($items as $item) {
+                    dbDelete('alert_schedule_items', '`item_id`=?', array($item));
+                }
+                dbDelete('alert_schedule', '`schedule_id`=?', array($schedule_id));
+                $message = 'Issue scheduling maintenance';
+            } else {
+                $status = 'ok';
+                $message = 'Scheduling maintenance ok';
+            }
+        } else {
+            $message = "Issue scheduling maintenance";
+        }
+    }
+
+    $response = array('status'=>$status,'message'=>$message);
+
+} elseif ($sub_type == 'parse-maintenance') {
+
+    $schedule_id = mres($_POST['schedule_id']);
+    $schedule = dbFetchRow("SELECT * FROM `alert_schedule` WHERE `schedule_id`=?",array($schedule_id));
+    $items = array();
+    foreach (dbFetchRows("SELECT `target` FROM `alert_schedule_items` WHERE `schedule_id`=?",array($schedule_id)) as $targets) {
+        $targets = id_to_target($targets['target']);
+        array_push($items,$targets);
+    }
+    $response = array('start'=>$schedule['start'],'end'=>$schedule['end'],'title'=>$schedule['title'],'notes'=>$schedule['notes'],'targets'=>$items);
+} elseif ($sub_type == 'del-maintenance') {
+    $schedule_id = mres($_POST['del_schedule_id']);
+    dbDelete('alert_schedule_items','`schedule_id`=?',array($schedule_id));
+    dbDelete('alert_schedule','`schedule_id`=?', array($schedule_id));
+    $status = 'ok';
+    $message = 'Maintenance schedule has been removed';
+    $response = array('status'=>$status,'message'=>$message);
+}
+
+echo _json_encode($response);