diff --git a/html/includes/graphs/bill/bits.inc.php b/html/includes/graphs/bill/bits.inc.php index 180e9229f..9d900db88 100644 --- a/html/includes/graphs/bill/bits.inc.php +++ b/html/includes/graphs/bill/bits.inc.php @@ -4,8 +4,8 @@ $i=0; while($port = mysql_fetch_array($ports)) { - if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"))) { - $rrd_list[$i]['filename'] = $config['rrd_dir'] . "/" . $port['hostname'] . "/" . safename($port['ifIndex'] . ".rrd"); + if(is_file($config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd"))) { + $rrd_list[$i]['filename'] = $config['rrd_dir'] . "/" . $port['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd"); $rrd_list[$i]['descr'] = $port['ifDescr']; $i++; } diff --git a/html/pages/front/default.php b/html/pages/front/default.php index ef07387e3..ec61ee073 100644 --- a/html/pages/front/default.php +++ b/html/pages/front/default.php @@ -1,23 +1,9 @@ - - - - - - -
- ".$content." -
- - - - - - - "); +function generate_front_box ($background, $content) { +echo("
+ $content +
"); } echo("
"); @@ -29,12 +15,11 @@ $sql = mysql_query("SELECT * FROM `devices` AS D, devices_perms AS P WHERE D.dev } while($device = mysql_fetch_array($sql)){ - generate_front_box("alert", "
".generate_device_link($device, shorthost($device['hostname']))."
+ generate_front_box("#ffaaaa", "
".generate_device_link($device, shorthost($device['hostname']))."
Device Down
".truncate($device['location'], 20)."
"); - } if($_SESSION['userlevel'] == '10') { @@ -48,7 +33,7 @@ $sql = mysql_query("SELECT * FROM `ports` AS I, `devices` AS D, devices_perms AS while($interface = mysql_fetch_array($sql)){ if(!$interface['deleted']){ $interface = ifNameDescr($interface); - generate_front_box("warn", "
".generate_device_link($interface, shorthost($interface['hostname']))."
+ generate_front_box("#ffdd99", "
".generate_device_link($interface, shorthost($interface['hostname']))."
Port Down
".generate_port_link($interface, truncate(makeshortif($interface['label']),13,''))."
@@ -61,12 +46,11 @@ while($interface = mysql_fetch_array($sql)){ /* FIXME service permissions? seem nonexisting now.. */ $sql = mysql_query("SELECT * FROM `services` AS S, `devices` AS D WHERE S.device_id = D.device_id AND service_status = 'down' AND D.ignore = '0' AND S.service_ignore = '0'"); while($service = mysql_fetch_array($sql)){ - generate_front_box("alert", "
".generate_device_link($service, shorthost($service['hostname']))."
+ generate_front_box("#ffaaaa", "
".generate_device_link($service, shorthost($service['hostname']))."
Service Down ".$service['service_type']."
".truncate($interface['ifAlias'], 20)."
"); - } if (isset($config['enable_bgp']) && $config['enable_bgp']) @@ -78,10 +62,10 @@ if (isset($config['enable_bgp']) && $config['enable_bgp']) } while($peer = mysql_fetch_array($sql)) { - generate_front_box("alert", "
".generate_device_link($peer, shorthost($peer['hostname']))."
+ generate_front_box("#ffaaaa", "
".generate_device_link($peer, shorthost($peer['hostname']))."
BGP Down ".$peer['bgpPeerIdentifier']."
- AS".$peer['bgpPeerRemoteAs']." ".truncate($peer['astext'], 10)." + AS".truncate($peer['bgpPeerRemoteAs']." ".$peer['astext'], 14, "")."
"); } } @@ -92,7 +76,7 @@ $sql = mysql_query("SELECT * FROM `devices` AS D WHERE D.status = '1' AND D.upti $sql = mysql_query("SELECT * FROM `devices` AS D, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' AND D.status = '1' AND D.uptime < '84600' AND D.ignore = 0"); } while($device = mysql_fetch_array($sql)){ - generate_front_box("info", "
".generate_device_link($device, shorthost($device['hostname']))."
+ generate_front_box("#aaffaa", "
".generate_device_link($device, shorthost($device['hostname']))."
Device
Rebooted

".formatUptime($device['uptime'], 'short')."
");