diff --git a/html/map.php b/html/map.php index 438f99babe..098a289d1e 100755 --- a/html/map.php +++ b/html/map.php @@ -39,7 +39,7 @@ if (isset($_GET['device'])) { $where = "WHERE device_id = ".mres($_GET['device'] if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format'])) { - $map = 'digraph G { sep=0.01; size="12,5.5"; pack=100; bgcolor=transparent; splines=true; overlap=scale; concentrate=0; epsilon=0.001; rankdir=0; + $map = 'digraph G { bgcolor=transparent; splines=true; overlap=scale; concentrate=0; epsilon=0.001; rankdir=LR; node [ fontname="helvetica", fontstyle=bold, style=filled, color=white, fillcolor=lightgrey, overlap=false]; edge [ bgcolor=white, fontname="helvetica", fontstyle=bold, arrowhead=dot, arrowtail=dot]; graph [bgcolor=transparent]; @@ -176,7 +176,8 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format'])) if ($links > 30) ### Unflatten if there are more than 10 links. beyond that it gets messy { - $maptool = $config['unflatten'] . ' -f -l 5 | ' . $config['sfdp'] . ' -Gpack -Gcharset=latin1 | '.$config['dot']; +# $maptool = $config['unflatten'] . ' -f -l 5 | ' . $config['sfdp'] . ' -Gpack -Gcharset=latin1 | '.$config['dot']; + $maptool = $config['neato']; } else { $maptool = $config['dot']; } @@ -185,7 +186,7 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format'])) { # $maptool = $config['unflatten'] . ' -f -l 5 | ' . $config['sfdp'] . ' -Gpack -Goverlap=prism -Gcharset=latin1 | dot'; # $maptool = $config['sfdp'] . ' -Gpack -Goverlap=prism -Gcharset=latin1 -Gsize=20,20'; - $maptool = $config['neato']; + $maptool = $config['dot']; } $descriptorspec = array(0 => array("pipe", "r"),1 => array("pipe", "w") ); diff --git a/html/pages/ports.inc.php b/html/pages/ports.inc.php index 7194d48cfc..94e15e879b 100644 --- a/html/pages/ports.inc.php +++ b/html/pages/ports.inc.php @@ -27,7 +27,7 @@ foreach (dbFetchRows("SELECT `device_id`,`hostname` FROM `devices` GROUP BY `hos ?>
- /> + /> DeviceInterfaceSpee $row = 1; +$ports_disabled = 0; $ports_down = 0; $ports_up = 0; $ports_total = 0; + foreach ($ports as $port) { + if ($port['ifAdminStatus'] == "down") { $ports_disabled++; + } elseif ($port['ifAdminStatus'] == "up" && $port['ifOperStatus']== "down") { $ports_down++; + } elseif ($port['ifAdminStatus'] == "up" && $port['ifOperStatus']== "up") { $ports_up++; } + $ports_total++; + if (port_permitted($port['interface_id'], $port['device_id'])) { @@ -17,6 +24,8 @@ foreach ($ports as $port) $speed = humanspeed($port['ifSpeed']); $type = humanmedia($port['ifType']); + $ifclass = ifclass($port['ifOperStatus'], $port['ifAdminStatus']); + if ($port['in_errors'] > 0 || $port['out_errors'] > 0) { @@ -30,7 +39,7 @@ foreach ($ports as $port) echo(" ".$port['hostname']." - ".fixIfName($port['label'])." $error_img + ".fixIfName($port['label'])." $error_img $speed ".$port['in_rate']." ".$port['out_rate']." @@ -44,4 +53,7 @@ foreach ($ports as $port) echo(""); +echo("Ports: $ports_total ( Up $ports_up | Down $ports_down | Disabled $ports_disabled )"); + + ?>