From 2828725e656b4cbe7702e46a43bd64f6c332da12 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sat, 22 Mar 2008 13:31:21 +0000 Subject: [PATCH] Add Screenos stuff git-svn-id: http://www.observium.org/svn/observer/trunk@176 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/pages/default.php | 2 +- html/pages/device/dev-ifs.inc | 2 +- includes/graphing.php | 2 +- includes/graphing/screenos.php | 76 ++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 includes/graphing/screenos.php diff --git a/html/pages/default.php b/html/pages/default.php index 253876c46..b6541d73a 100644 --- a/html/pages/default.php +++ b/html/pages/default.php @@ -169,7 +169,7 @@ if($_SESSION['userlevel'] >= '5') { echo("', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 250);\" onmouseout=\"return nd();\" >". "
Internet Transit
". - "
"); } diff --git a/html/pages/device/dev-ifs.inc b/html/pages/device/dev-ifs.inc index 5d9fe9447..f50620381 100644 --- a/html/pages/device/dev-ifs.inc +++ b/html/pages/device/dev-ifs.inc @@ -4,7 +4,7 @@ $hostname = gethostbyid($_GET[id]); echo("
"); $i = "1"; - $interface_query = mysql_query("select * from interfaces WHERE device_id = '$_GET[id]' ORDER BY 'ifIndex'"); + $interface_query = mysql_query("select * from interfaces WHERE device_id = '$_GET[id]' ORDER BY `ifDescr` ASC"); while($interface = mysql_fetch_array($interface_query)) { include("includes/print-interface.inc"); } diff --git a/includes/graphing.php b/includes/graphing.php index 91410755b..5aeb48400 100644 --- a/includes/graphing.php +++ b/includes/graphing.php @@ -137,7 +137,7 @@ function graph_device_bits ($device, $graph, $from, $to, $width, $height) { $imgfile = "graphs/" . "$graph"; $options = "--alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height "; $hostname = gethostbyid($device); - $query = mysql_query("SELECT `ifIndex` FROM `interfaces` WHERE `device_id` = '$device' AND `ifType` NOT LIKE '%oopback%' AND `ifType` NOT LIKE '%SVI%'"); + $query = mysql_query("SELECT `ifIndex` FROM `interfaces` WHERE `device_id` = '$device' AND `ifType` NOT LIKE '%oopback%' AND `ifType` NOT LIKE '%SVI%' AND `ifType` != 'l2vlan'"); if($width <= "300") { $options .= "--font LEGEND:7:$mono_font --font AXIS:6:$mono_font --font-render-mode normal "; } $pluses = ""; while($int = mysql_fetch_row($query)) { diff --git a/includes/graphing/screenos.php b/includes/graphing/screenos.php new file mode 100644 index 000000000..318739126 --- /dev/null +++ b/includes/graphing/screenos.php @@ -0,0 +1,76 @@ +