mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
Modify some locations to be more organised and move uptime tracking to a seperate table.
git-svn-id: http://www.observium.org/svn/observer/trunk@38 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
@@ -1,16 +1,25 @@
|
||||
<?
|
||||
|
||||
$updated = '1';
|
||||
|
||||
$descr = $_POST['descr'];
|
||||
$apache = $_POST['apache'];
|
||||
$temp = $_POST['temp'];
|
||||
$ignore = $_POST['ignore'];
|
||||
$type = $_POST['type'];
|
||||
|
||||
$sql = "UPDATE `devices` SET `purpose` = '$descr', `apache` = '$apache', `temp` = '$temp', `type` = '$type', `ignore` = '$ignore' WHERE `id` = '$_GET[id]'";
|
||||
$sql = "UPDATE `devices` SET `purpose` = '$descr', `apache` = '$apache', `type` = '$type', `ignore` = '$ignore' WHERE `id` = '$_GET[id]'";
|
||||
$query = mysql_query($sql);
|
||||
|
||||
$affected = mysql_affected_rows() . "records affected";
|
||||
$rows_updated = mysql_affected_rows();
|
||||
|
||||
if($rows_updated > 0) {
|
||||
$update_message = mysql_affected_rows() . " Device record updated.";
|
||||
$updated = 1;
|
||||
} elseif ($rows_updated = '-1') {
|
||||
$update_message = "Device record unchanged. No update necessary.";
|
||||
$updated = -1;
|
||||
} else {
|
||||
$update_message = "Device record update error.";
|
||||
$updated = 0;
|
||||
}
|
||||
|
||||
?>
|
||||
|
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
|
||||
|
||||
$sql = mysql_query("SELECT * FROM `devices` WHERE `uptime` > '0' AND `uptime` < '86400'");
|
||||
$sql = mysql_query("SELECT * FROM `devices` AS D, `device_uptime` AS U WHERE D.id = U.device_id AND U.device_uptime > '0' AND U.device_uptime < '86400'");
|
||||
while($device = mysql_fetch_array($sql)){
|
||||
$rebooted[] = "$device[id]";
|
||||
}
|
||||
|
@@ -87,7 +87,7 @@ echo("</ul>");
|
||||
echo("
|
||||
<div class=contentstyle>");
|
||||
|
||||
include("includes/$section.inc");
|
||||
include("pages/$page/$section.inc");
|
||||
|
||||
echo("</div>
|
||||
");
|
||||
|
@@ -1,12 +1,10 @@
|
||||
<?php
|
||||
|
||||
if($_GET['ignore']) { mysql_query("UPDATE devices SET `ignore` = '1' WHERE `id` = '$_GET[ignore]'"); }
|
||||
if($_GET['unignore']) { mysql_query("UPDATE devices SET `ignore` = '0' WHERE `id` = '$_GET[unignore]'"); }
|
||||
if($_GET['location']) { $where = "AND location = '$_GET[location]'"; }
|
||||
if($_GET['location'] == "Unset") { $where = "AND location = ''"; }
|
||||
if ($_GET['type']) { $where = "AND type = '$_GET[type]'"; }
|
||||
|
||||
if($_GET['location']) { $where = "WHERE location = '$_GET[location]'"; }
|
||||
if($_GET['location'] == "Unset") { $where = "WHERE location = ''"; }
|
||||
if ($_GET['type']) { $where = "WHERE type = '$_GET[type]'"; }
|
||||
$sql = "select * from devices $where ORDER BY `ignore`, STATUS, os, hostname";
|
||||
$sql = "select *, U.device_uptime as uptime from devices AS D, device_uptime AS U WHERE D.id = U.device_id $where ORDER BY `ignore`, `status`, `os`, `hostname`";
|
||||
$device_query = mysql_query($sql);
|
||||
|
||||
echo("<table cellpadding=7 cellspacing=0 class=devicetable width=100%>");
|
||||
|
Reference in New Issue
Block a user