nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-30 16:14:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move voltages to sensors table, clean up some unused functions and move web-only functions to the html includes file

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1311 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-07-07 13:58:11 +00:00
parent 260caa50b7
commit 27d1a215f3
11 changed files with 129 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/device/overview/voltages.inc.php
+11 -12
View File
@@ -1,13 +1,12 @@
<?php
unset($volt_seperator);
if(mysql_result(mysql_query("SELECT count(volt_id) from voltage WHERE device_id = '" . $device['device_id'] . "'"),0)) {
$total = mysql_result(mysql_query("SELECT count(volt_id) from voltage WHERE device_id = '" . $device['device_id'] . "'"),0);
if($total = mysql_result(mysql_query("SELECT count(sensor_id) from sensors WHERE sensor_class='voltage' AND device_id = '" . $device['device_id'] . "'"),0)) {
$rows = round($total / 2,0);
echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
echo("<p style='padding: 0px 5px 5px;' class=sectionhead><img align='absmiddle' src='".$config['base_url']."/images/icons/voltages.png'> Voltages</p>");
$i = '1';
$volts = mysql_query("SELECT * FROM voltage WHERE device_id = '" . $device['device_id'] . "'");
$volts = mysql_query("SELECT * FROM sensors WHERE sensor_class='voltage' AND device_id = '" . $device['device_id'] . "'");
echo("<table width=100% valign=top>");
echo("<tr><td width=50%>");
echo("<table width=100% cellspacing=0 cellpadding=2>");
@@ -16,21 +15,21 @@ if(mysql_result(mysql_query("SELECT count(volt_id) from voltage WHERE device_id
$graph_colour = str_replace("#", "", $row_colour);
$volt_day = "graph.php?id=" . $volt['volt_id'] . "&type=voltage&from=$day&to=$now&width=300&height=100";
$volt_week = "graph.php?id=" . $volt['volt_id'] . "&type=voltage&from=$week&to=$now&width=300&height=100";
$volt_month = "graph.php?id=" . $volt['volt_id'] . "&type=voltage&from=$month&to=$now&width=300&height=100";
$volt_year = "graph.php?id=" . $volt['volt_id'] . "&type=voltage&from=$year&to=$now&width=300&height=100";
$volt_minigraph = "<img src='graph.php?id=" . $volt['volt_id'] . "&type=voltage&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
$volt_day = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$day&to=$now&width=300&height=100";
$volt_week = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$week&to=$now&width=300&height=100";
$volt_month = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$month&to=$now&width=300&height=100";
$volt_year = "graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$year&to=$now&width=300&height=100";
$volt_minigraph = "<img src='graph.php?id=" . $volt['sensor_id'] . "&type=voltage&from=$day&to=$now&width=80&height=20&bg=$graph_colour' align='absmiddle'>";
$volt_link = "<a href='/device/".$device['device_id']."/health/voltages/' onmouseover=\"return ";
$volt_link .= "overlib('<div class=list-large>".$device['hostname']." - ".$volt['volt_descr'];
$volt_link .= "overlib('<div class=list-large>".$device['hostname']." - ".$volt['sensor_descr'];
$volt_link .= "</div><div style=\'width: 750px\'><img src=\'$volt_day\'><img src=\'$volt_week\'><img src=\'$volt_month\'><img src=\'$volt_year\'></div>', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\" >";
$volt_link_c = $volt_link . "<span " . ($volt['volt_current'] < $volt['volt_limit_low'] || $volt['volt_current'] > $volt['volt_limit'] ? "style='color: red'" : '') . '>' . $volt['volt_current'] . "V</span></a>";
$volt_link_c = $volt_link . "<span " . ($volt['sensor_current'] < $volt['sensor_limit_low'] || $volt['sensor_current'] > $volt['sensor_limit'] ? "style='color: red'" : '') . '>' . $volt['sensor_current'] . "V</span></a>";
$volt_link_b = $volt_link . $volt_minigraph . "</a>";
$volt_link_a = $volt_link . $volt['volt_descr'] . "</a>";
$volt_link_a = $volt_link . $volt['sensor_descr'] . "</a>";
$volt['volt_descr'] = truncate($volt['volt_descr'], 25, '');
$volt['sensor_descr'] = truncate($volt['sensor_descr'], 25, '');
echo("<tr bgcolor='$row_colour'><td class=tablehead><strong>$volt_link_a</strong></td><td width=80 align=right class=tablehead>$volt_link_b<td width=80 align=right class=tablehead>$volt_link_c</td></tr>");
if($i == $rows) { echo("</table></td><td valign=top><table width=100% cellspacing=0 cellpadding=2>"); }
$i++;