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

remove dead map.php code, rename some .inc to .inc.php files, general trailing space cleanup part 1, some reindent. No expected functionality change whatsoever ;)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1824 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-12 08:50:47 +00:00
parent 90e2dee34a
commit c6428480bc
32 changed files with 339 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/device/bits.inc.php
+20 -11
View File
@@ -5,31 +5,40 @@
$device = device_by_id_cache($id);
$query = mysql_query("SELECT * FROM `ports` WHERE `device_id` = '".$id."'");
while($int = mysql_fetch_assoc($query)) {
while ($int = mysql_fetch_assoc($query))
{
$ignore = 0;
if(is_array($config['device_traffic_iftype'])) {
foreach($config['device_traffic_iftype'] as $iftype) {
if (preg_match($iftype ."i", $int['ifType'])) {
if (is_array($config['device_traffic_iftype']))
{
foreach ($config['device_traffic_iftype'] as $iftype)
{
if (preg_match($iftype ."i", $int['ifType']))
{
$ignore = 1;
}
}
}
}
if(is_array($config['device_traffic_descr'])) {
foreach($config['device_traffic_descr'] as $ifdescr) {
if (preg_match($ifdescr."i", $int['ifDescr']) || preg_match($ifdescr."i", $int['ifName']) || preg_match($ifdescr."i", $int['portName'])) {
if (is_array($config['device_traffic_descr']))
{
foreach ($config['device_traffic_descr'] as $ifdescr)
{
if (preg_match($ifdescr."i", $int['ifDescr']) || preg_match($ifdescr."i", $int['ifName']) || preg_match($ifdescr."i", $int['portName']))
{
$ignore = 1;
}
}
}
if(is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd")) && $ignore != 1) {
if (is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd")) && $ignore != 1)
{
$rrd_filenames[] = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd");
}
unset($ignore);
}
$rra_in = "INOCTETS";
$rra_out = "OUTOCTETS";
$rra_out = "OUTOCTETS";
$colour_line_in = "006600";
$colour_line_out = "000099";
@@ -38,4 +47,4 @@ $colour_area_out = "C3D9FF";
include ("includes/graphs/generic_multi_bits.inc.php");
?>
?>
html/includes/graphs/device/current.inc.php
+14 -14
View File
@@ -8,37 +8,37 @@ $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_array($sql))
{
switch ($iter)
{
case "1":
$colour= "CC0000";
break;
$colour= "CC0000";
break;
case "2":
$colour= "008C00";
break;
$colour= "008C00";
break;
case "3":
$colour= "4096EE";
break;
$colour= "4096EE";
break;
case "4":
$colour= "73880A";
$colour= "73880A";
break;
case "5":
$colour= "D01F3C";
$colour= "D01F3C";
break;
case "6":
$colour= "36393D";
break;
case "7":
$colour= "36393D";
break;
case "7":
default:
$colour= "FF0084";
$colour= "FF0084";
unset($iter);
break;
}
$hostname = gethostbyid($current['device_id']);
$descr = substr(str_pad($current['sensor_descr'], 15),0,15);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("current-" . $current['sensor_descr'] . ".rrd");
html/includes/graphs/device/fanspeeds.inc.php
+13 -13
View File
@@ -9,31 +9,31 @@ $rrd_options .= " -l 0 -E ";
$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))
while($fanspeed = mysql_fetch_array($sql))
{
switch ($iter)
{
case "1":
$colour= "CC0000";
break;
$colour= "CC0000";
break;
case "2":
$colour= "008C00";
break;
$colour= "008C00";
break;
case "3":
$colour= "4096EE";
break;
$colour= "4096EE";
break;
case "4":
$colour= "73880A";
$colour= "73880A";
break;
case "5":
$colour= "D01F3C";
$colour= "D01F3C";
break;
case "6":
$colour= "36393D";
break;
case "7":
$colour= "36393D";
break;
case "7":
default:
$colour= "FF0084";
$colour= "FF0084";
unset($iter);
break;
}
html/includes/graphs/device/frequencies.inc.php
+14 -14
View File
@@ -8,37 +8,37 @@ $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_array($sql))
{
switch ($iter)
{
case "1":
$colour= "CC0000";
break;
$colour= "CC0000";
break;
case "2":
$colour= "008C00";
break;
$colour= "008C00";
break;
case "3":
$colour= "4096EE";
break;
$colour= "4096EE";
break;
case "4":
$colour= "73880A";
$colour= "73880A";
break;
case "5":
$colour= "D01F3C";
$colour= "D01F3C";
break;
case "6":
$colour= "36393D";
break;
case "7":
$colour= "36393D";
break;
case "7":
default:
$colour= "FF0084";
$colour= "FF0084";
unset($iter);
break;
}
$hostname = gethostbyid($frequency['device_id']);
$descr = substr(str_pad($frequency['sensor_descr'], 15),0,15);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("freq-" . $frequency['sensor_descr'] . ".rrd");
$sensor_id = $frequency['sensor_id'];
html/includes/graphs/device/humidity.inc.php
+14 -14
View File
@@ -8,35 +8,35 @@ $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_array($sql))
{
switch ($iter)
{
case "1":
$colour= "CC0000";
break;
$colour= "CC0000";
break;
case "2":
$colour= "008C00";
break;
$colour= "008C00";
break;
case "3":
$colour= "4096EE";
break;
$colour= "4096EE";
break;
case "4":
$colour= "73880A";
$colour= "73880A";
break;
case "5":
$colour= "D01F3C";
$colour= "D01F3C";
break;
case "6":
$colour= "36393D";
break;
case "7":
$colour= "36393D";
break;
case "7":
default:
$colour= "FF0084";
$colour= "FF0084";
unset($iter);
break;
}
$humidity['sensor_descr_fixed'] = substr(str_pad($humidity['sensor_descr'], 22),0,22);
$humidityrrd = $config['rrd_dir'] . "/".$device['hostname']."/".safename("humidity-" . safename($humidity['sensor_type']."-".$humidity['sensor_index']) . ".rrd");
$rrd_options .= " DEF:sensor" . $humidity['sensor_id'] . "=$humidityrrd:sensor:AVERAGE ";
html/includes/graphs/device/temperatures.inc.php
+14 -14
View File
@@ -9,35 +9,35 @@ $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_array($sql))
{
switch ($iter)
{
case "1":
$colour= "CC0000";
break;
$colour= "CC0000";
break;
case "2":
$colour= "008C00";
break;
$colour= "008C00";
break;
case "3":
$colour= "4096EE";
break;
$colour= "4096EE";
break;
case "4":
$colour= "73880A";
$colour= "73880A";
break;
case "5":
$colour= "D01F3C";
$colour= "D01F3C";
break;
case "6":
$colour= "36393D";
break;
case "7":
$colour= "36393D";
break;
case "7":
default:
$colour= "FF0084";
$colour= "FF0084";
unset($iter);
break;
}
$temperature['sensor_descr_fixed'] = substr(str_pad($temperature['sensor_descr'], $descr_len),0,$descr_len);
$rrd_file = $config['rrd_dir'] . "/" . $device['hostname'] . "/temperature-" . safename($temperature['sensor_type']."-".$temperature['sensor_index']) . ".rrd";
$rrd_options .= " DEF:sensor" . $temperature['sensor_id'] . "=$rrd_file:sensor:AVERAGE ";
html/includes/graphs/device/toner.inc.php
+16 -16
View File
@@ -8,41 +8,42 @@ $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_array($sql))
{
switch ($iter)
{
case "1":
$colour= "000000";
break;
$colour= "000000";
break;
case "2":
$colour= "008C00";
break;
$colour= "008C00";
break;
case "3":
$colour= "4096EE";
break;
$colour= "4096EE";
break;
case "4":
$colour= "73880A";
$colour= "73880A";
break;
case "5":
$colour= "D01F3C";
$colour= "D01F3C";
break;
case "6":
$colour= "36393D";
break;
case "7":
$colour= "36393D";
break;
case "7":
default:
$colour= "FF0000";
$colour= "FF0000";
unset($iter);
break;
}
if (stripos($toner['toner_descr'],"cyan" ) !== false || substr($toner['toner_descr'],-1) == 'C') { $colour = "55D6D3"; }
if (stripos($toner['toner_descr'],"magenta") !== false || substr($toner['toner_descr'],-1) == 'M') { $colour = "F24AC8"; }
if (stripos($toner['toner_descr'],"yellow" ) !== false || substr($toner['toner_descr'],-1) == 'Y') { $colour = "FFF200"; }
if (stripos($toner['toner_descr'],"black" ) !== false || substr($toner['toner_descr'],-1) == 'K') { $colour = "000000"; }
$hostname = gethostbyid($toner['device_id']);
$descr = substr(str_pad($toner['toner_descr'], 16),0,16);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("toner-" . $toner['toner_descr'] . ".rrd");
$toner_id = $toner['toner_id'];
@@ -56,5 +57,4 @@ while($toner = mysql_fetch_array($sql))
$iter++;
}
?>
html/includes/graphs/device/voltages.inc.php
+14 -14
View File
@@ -10,36 +10,36 @@ $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_array($sql))
{
switch ($iter)
{
case "1":
$colour= "CC0000";
break;
$colour= "CC0000";
break;
case "2":
$colour= "008C00";
break;
$colour= "008C00";
break;
case "3":
$colour= "4096EE";
break;
$colour= "4096EE";
break;
case "4":
$colour= "73880A";
$colour= "73880A";
break;
case "5":
$colour= "D01F3C";
$colour= "D01F3C";
break;
case "6":
$colour= "36393D";
break;
case "7":
$colour= "36393D";
break;
case "7":
default:
$colour= "FF0084";
$colour= "FF0084";
unset($iter);
break;
}
$sensor['sensor_descr_fixed'] = substr(str_pad($sensor['sensor_descr'], $descr_len),0,$descr_len);
$sensor['sensor_descr_fixed'] = str_replace(':','\:',str_replace('\*','*',$sensor['sensor_descr_fixed']));