diff --git a/html/images/lolsq.gif b/html/images/lolsq.gif new file mode 100644 index 0000000000..43db735659 Binary files /dev/null and b/html/images/lolsq.gif differ diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php index f2207a9bfc..924636b0f1 100644 --- a/html/includes/print-interface.inc.php +++ b/html/includes/print-interface.inc.php @@ -9,7 +9,12 @@ $if_id = $interface['interface_id']; $interface = ifLabel($interface); -if (!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; } +if($int_colour) +{ + $row_colour = $int_colour; +} else { + if (!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; } +} $port_adsl_query = mysql_query("SELECT * FROM `ports_adsl` WHERE `interface_id` = '".$interface['interface_id']."'"); $port_adsl = mysql_fetch_assoc($port_adsl_query); diff --git a/html/pages/device/routing.inc.php b/html/pages/device/routing.inc.php index 7c62c2638d..73c512ef29 100644 --- a/html/pages/device/routing.inc.php +++ b/html/pages/device/routing.inc.php @@ -38,7 +38,7 @@ foreach ($datas as $type) echo(''); } - echo(" " . $type_text[$type] ." (".$device_routing_count[$type].")"); + echo(" " . $type_text[$type] ." (".$device_routing_count[$type].")"); if ($_GET['opta'] == $type) { echo(""); } $sep = " | "; } diff --git a/html/pages/device/routing/bgp.inc.php b/html/pages/device/routing/bgp.inc.php index 2fba62b194..e3179fdcc6 100644 --- a/html/pages/device/routing/bgp.inc.php +++ b/html/pages/device/routing/bgp.inc.php @@ -144,7 +144,8 @@ while ($peer = mysql_fetch_assoc($peer_query)) " .formatUptime($peer['bgpPeerFsmEstablishedTime']). "
Updates " . $peer['bgpPeerInUpdates'] . " " . $peer['bgpPeerOutUpdates'] . " - "); + + "); unset($invalid); diff --git a/html/pages/routing.inc.php b/html/pages/routing.inc.php index d0e19ca3a9..152f03ca48 100644 --- a/html/pages/routing.inc.php +++ b/html/pages/routing.inc.php @@ -31,7 +31,7 @@ foreach ($datas as $type) echo(''); } - echo(" " . $type_text[$type] ." (".$routing_count[$type].")"); + echo(" " . $type_text[$type] ." (".$routing_count[$type].")"); if ($_GET['opta'] == $type) { echo(""); } $sep = " | "; } diff --git a/html/pages/routing/bgp.inc.php b/html/pages/routing/bgp.inc.php index aeb1271c1d..0091f58794 100644 --- a/html/pages/routing/bgp.inc.php +++ b/html/pages/routing/bgp.inc.php @@ -124,13 +124,13 @@ else // display overlib graphs - $graph_type = "bgp_prefixes"; + $graph_type = "bgp_updates"; $local_daily_url = "graph.php?id=" . $peer['bgpPeer_id'] . "&type=" . $graph_type . "&from=$day&to=$now&width=500&height=150&&afi=ipv4&safi=unicast"; - $localaddresslink = "', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">" . $peer['bgpLocalAddr'] . ""; + $localaddresslink = "', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">" . $peer['bgpLocalAddr'] . ""; $graph_type = "bgp_updates"; $peer_daily_url = "graph.php?id=" . $peer['bgpPeer_id'] . "&type=" . $graph_type . "&from=$day&to=$now&width=500&height=150"; - $peeraddresslink = "', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">" . $peer['bgpPeerIdentifier'] . ""; + $peeraddresslink = "', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">" . $peer['bgpPeerIdentifier'] . ""; echo('"); @@ -152,7 +152,7 @@ else echo(" " . $localaddresslink . "
".generate_device_link($peer, shorthost($peer['hostname']), 'routing/bgp/')." - -> + » " . $peeraddresslink . " $peer_type ".$peer['afi']." @@ -160,7 +160,8 @@ else " . $peer['bgpPeerAdminStatus'] . "
" . $peer['bgpPeerState'] . " " .formatUptime($peer['bgpPeerFsmEstablishedTime']). "
Updates " . format_si($peer['bgpPeerInUpdates']) . " - " . format_si($peer['bgpPeerOutUpdates']) . ""); + " . format_si($peer['bgpPeerOutUpdates']) . " + "); unset($invalid); diff --git a/html/pages/routing/cef.inc.php b/html/pages/routing/cef.inc.php index 210dfc8c16..59ec5ffd15 100644 --- a/html/pages/routing/cef.inc.php +++ b/html/pages/routing/cef.inc.php @@ -1,8 +1 @@ -
-
-

Work in Progress

-
- -
-
-This page is still under construction
If you have any ideas for what could go here, or how we could lay out the content that should be here, please share!
+
 
diff --git a/html/pages/routing/vrf.inc.php b/html/pages/routing/vrf.inc.php index 2c0fb57ca5..d724462bdf 100644 --- a/html/pages/routing/vrf.inc.php +++ b/html/pages/routing/vrf.inc.php @@ -113,7 +113,7 @@ if($_GET['optb'] == "all" ) { } else { - echo("
"); + echo("
"); $vrf_query = mysql_query("SELECT * FROM `vrfs` WHERE mplsVpnVrfRouteDistinguisher = '".$_GET['optb']."'"); $vrf = mysql_fetch_assoc($vrf_query); echo(""); @@ -123,32 +123,32 @@ if($_GET['optb'] == "all" ) { echo("
"); $devices = mysql_query("SELECT * FROM `vrfs` AS V, `devices` AS D WHERE `mplsVpnVrfRouteDistinguisher` = '".$vrf['mplsVpnVrfRouteDistinguisher']."' AND D.device_id = V.device_id"); - $x=1; + $x=0; while ($device = mysql_fetch_assoc($devices)) { $hostname = $device['hostname']; - #if (!is_integer($x/2)) { $device_colour = $list_colour_a; } else { $device_colour = $list_colour_b; } - echo(""); + if (!is_integer($x/2)) { $device_colour = $list_colour_a; } else { $device_colour = $list_colour_b; } + echo("
"); include("includes/device-header.inc.php"); echo("
"); $ports = mysql_query("SELECT * FROM `ports` WHERE `ifVrf` = '".$device['vrf_id']."' and device_id = '".$device['device_id']."'"); unset($seperator); - echo(""); + echo('
'); $i=1; while ($interface = mysql_fetch_assoc($ports)) { if (!is_integer($x/2)) { - if (is_integer($i/2)) { $int_colour = $list_colour_a_a; } else { $int_colour = $list_colour_a_b; } + if (is_integer($i/2)) { $int_colour = $list_colour_a_b; } else { $int_colour = $list_colour_a_a; } } else { - if (is_integer($i/2)) { $int_colour = $list_colour_b_b; } else { $int_colour = $list_colour_b_a; } + if (is_integer($i/2)) { $int_colour = $list_colour_b_a; } else { $int_colour = $list_colour_b_b; } } include("includes/print-interface.inc.php"); $i++; } $x++; - echo("
"); + echo(""); echo("
"); }