mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some formatting cleanups, introduce some more FIXMEs to look at, plus replace mysql_fetch_array by mysql_fetch_assoc, for great justice

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2029 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-04-06 13:54:50 +00:00
parent 51e242b896
commit f55a30f744
163 changed files with 476 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/device/current.inc.php
+1 -1
View File
@@ -8,7 +8,7 @@ $rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='current' AND device_id = '$id'");
$rrd_options .= " COMMENT:' Cur Min Max\\n'";
while ($current = mysql_fetch_array($sql))
while ($current = mysql_fetch_assoc($sql))
{
switch ($iter)
{
html/includes/graphs/device/diskio_bits.inc.php
+1 -1
View File
@@ -6,7 +6,7 @@ if ($_GET['device']) { $id = mres($_GET['device']); }
$i = 1;
$query = mysql_query("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE D.device_id = '".$id."' AND U.device_id = D.device_id");
while ($disk = mysql_fetch_array($query))
while ($disk = mysql_fetch_assoc($query))
{
$rrd_filename = $config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safename($disk['diskio_descr'] . ".rrd");
if (is_file($rrd_filename))
html/includes/graphs/device/diskio_ops.inc.php
+1 -1
View File
@@ -7,7 +7,7 @@ $i = 1;
$query = mysql_query("SELECT * FROM `ucd_diskio` AS U, `devices` AS D WHERE D.device_id = '".$id."' AND U.device_id = D.device_id");
while ($disk = mysql_fetch_array($query))
while ($disk = mysql_fetch_assoc($query))
{
$rrd_filename = $config['rrd_dir'] . "/" . $disk['hostname'] . "/ucd_diskio-" . safename($disk['diskio_descr'] . ".rrd");
if (is_file($rrd_filename))
html/includes/graphs/device/fanspeeds.inc.php
+2 -1
View File
@@ -10,7 +10,8 @@ $iter = "1";
$sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='fanspeed' AND device_id = '$id'");
$rrd_options .= " COMMENT:'RPM Cur Min Max\\n'";
while ($fanspeed = mysql_fetch_array($sql))
# FIXME generic colour function
while ($fanspeed = mysql_fetch_assoc($sql))
{
switch ($iter)
{
html/includes/graphs/device/frequencies.inc.php
+3 -1
View File
@@ -8,8 +8,10 @@ $rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='freq' AND device_id = '$id'");
$rrd_options .= " COMMENT:' Cur Min Max\\n'";
while ($frequency = mysql_fetch_array($sql))
while ($frequency = mysql_fetch_assoc($sql))
{
# FIXME generic colour function
switch ($iter)
{
case "1":
html/includes/graphs/device/humidity.inc.php
+2 -1
View File
@@ -8,8 +8,9 @@ $rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='humidity' AND device_id = '$id' ORDER BY sensor_index");
$rrd_options .= " COMMENT:' Cur Min Max\\n'";
while ($humidity = mysql_fetch_array($sql))
while ($humidity = mysql_fetch_assoc($sql))
{
# FIXME generic colour function
switch ($iter)
{
case "1":
html/includes/graphs/device/mempools.inc.php
+2 -1
View File
@@ -10,8 +10,9 @@ $rrd_options .= " -u 100 -l 0 -E -b 1024 ";
$iter = "1"; $i=1;
$rrd_options .= " COMMENT:' Min Cur Max\\n'";
while ($mempool = mysql_fetch_array($query))
while ($mempool = mysql_fetch_assoc($query))
{
# FIXME generic colour function
if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
elseif ($iter=="4") { $colour="73880A"; } elseif ($iter=="5") { $colour="D01F3C"; } elseif ($iter=="6") { $colour="36393D"; }
elseif ($iter=="7") { $colour="FF0084"; unset($iter); }
html/includes/graphs/device/processors.inc.php
+1 -1
View File
@@ -5,7 +5,7 @@ $query = mysql_query("SELECT * FROM `processors` where `device_id` = '".$id."'")
$i = 0;
while ($proc = mysql_fetch_array($query))
while ($proc = mysql_fetch_assoc($query))
{
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
html/includes/graphs/device/storage.inc.php
+2 -1
View File
@@ -11,8 +11,9 @@ $iter = "1";
$sql = mysql_query("SELECT * FROM storage where device_id = '$id'");
$rrd_options .= " COMMENT:' Size Used %age\\l'";
while ($storage = mysql_fetch_array($sql))
while ($storage = mysql_fetch_assoc($sql))
{
# FIXME generic colour function
if ($iter=="1") { $colour="CC0000"; } elseif ($iter=="2") { $colour="008C00"; } elseif ($iter=="3") { $colour="4096EE"; }
elseif ($iter=="4") { $colour="73880A"; } elseif ($iter=="5") { $colour="D01F3C"; } elseif ($iter=="6") { $colour="36393D"; }
elseif ($iter=="7") { $colour="FF0084"; $iter = "0"; }
html/includes/graphs/device/temperatures.inc.php
+2 -1
View File
@@ -9,8 +9,9 @@ $rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='temperature' AND device_id = '$id' ORDER BY sensor_index");
$rrd_options .= " COMMENT:'".str_pad('',$descr_len)." Cur Min Max\\n'";
while ($temperature = mysql_fetch_array($sql))
while ($temperature = mysql_fetch_assoc($sql))
{
# FIXME generic colour function
switch ($iter)
{
case "1":
html/includes/graphs/device/toner.inc.php
+2 -1
View File
@@ -8,8 +8,9 @@ $rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM toner where device_id = '$id'");
$rrd_options .= " COMMENT:'Toner level Cur Min Max\\n'";
while ($toner = mysql_fetch_array($sql))
while ($toner = mysql_fetch_assoc($sql))
{
# FIXME generic colour function
switch ($iter)
{
case "1":
html/includes/graphs/device/voltages.inc.php
+2 -1
View File
@@ -10,8 +10,9 @@ $rrd_options .= " COMMENT:'".str_pad('',$descr_len)." Cur Min Max\\
$iter = "1";
$sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='voltage' AND device_id = '$id'");
while ($sensor = mysql_fetch_array($sql))
while ($sensor = mysql_fetch_assoc($sql))
{
# FIXME generic colour function
switch ($iter)
{
case "1":