From d77765262a58a86aa5fcd14e62aced44df3083d5 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sat, 9 Apr 2011 16:08:39 +0000 Subject: [PATCH] interface -> port git-svn-id: http://www.observium.org/svn/observer/trunk@2048 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/includes/functions.inc.php | 2 +- html/includes/print-interface-adsl.inc.php | 10 +++---- html/includes/print-interface.inc.php | 12 ++++---- html/includes/print-vlan.inc.php | 2 +- html/includes/print-vrf.inc.php | 2 +- html/map.php | 6 ++-- .../{interface.inc.php => port.inc.php} | 26 ++++++++--------- html/pages/device/port/macaccounting.inc.php | 28 +++++++++---------- html/pages/device/port/pagp.inc.php | 8 +++--- html/pages/device/ports.inc.php | 2 +- html/pages/iftype.inc.php | 2 +- 11 files changed, 50 insertions(+), 50 deletions(-) rename html/pages/device/{interface.inc.php => port.inc.php} (84%) diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index 606fac8d6..e38dceddc 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -260,7 +260,7 @@ function generate_port_link($args, $text = NULL, $type = NULL) $content .= generate_graph_tag($graph_array); $content .= ""; - $url = $config['base_url']."/device/".$args['device_id']."/interface/" . $args['interface_id'] . "/"; + $url = $config['base_url']."/device/".$args['device_id']."/port/" . $args['interface_id'] . "/"; if (port_permitted($args['interface_id'])) { return overlib_link($url, $text, $content, $class); diff --git a/html/includes/print-interface-adsl.inc.php b/html/includes/print-interface-adsl.inc.php index d9ab07b70..99eb481dc 100644 --- a/html/includes/print-interface-adsl.inc.php +++ b/html/includes/print-interface-adsl.inc.php @@ -17,7 +17,7 @@ if ($interface['ifInErrors_delta'] > 0 || $interface['ifOutErrors_delta'] > 0) } else { $error_img = ""; } echo(" +onclick=\"location.href='/device/".$device['device_id']."/port/".$interface['interface_id']."/'\" style='cursor: pointer;'> "); echo(" " . generate_port_link($interface, $interface['ifIndex'] . ". ".$interface['label']) . " @@ -128,13 +128,13 @@ if ($graph_type && is_file($graph_file)) echo(""); - echo("', LEFT".$config['overlib_defaults'].");\" + echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> "); - echo("', LEFT".$config['overlib_defaults'].");\" + echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> "); - echo("', LEFT, WIDTH, 350".$config['overlib_defaults'].");\" + echo("', LEFT, WIDTH, 350".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> "); - echo("', LEFT, WIDTH, 350".$config['overlib_defaults'].");\" + echo("', LEFT, WIDTH, 350".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> "); echo(""); diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php index d9169a162..fb55f1651 100644 --- a/html/includes/print-interface.inc.php +++ b/html/includes/print-interface.inc.php @@ -21,10 +21,10 @@ if ($interface['ifInErrors_delta'] > 0 || $interface['ifOutErrors_delta'] > 0) if (mysql_result(mysql_query("SELECT count(*) FROM mac_accounting WHERE interface_id = '".$interface['interface_id']."'"),0)) { - $mac = ""; + $mac = ""; } else { $mac = ""; } -echo(" +echo(" "); echo(" " . generate_port_link($interface, $interface['ifIndex'] . ". ".$interface['label']) . " $error_img $mac @@ -257,13 +257,13 @@ if ($graph_type && is_file($graph_file)) include("includes/print-interface-graphs.inc.php"); -# echo("', LEFT".$config['overlib_defaults'].");\" +# echo("', LEFT".$config['overlib_defaults'].");\" # onmouseout=\"return nd();\"> "); -# echo("', LEFT".$config['overlib_defaults'].");\" +# echo("', LEFT".$config['overlib_defaults'].");\" # onmouseout=\"return nd();\"> "); -# echo("', LEFT, WIDTH, 350".$config['overlib_defaults'].");\" +# echo("', LEFT, WIDTH, 350".$config['overlib_defaults'].");\" # onmouseout=\"return nd();\"> "); -# echo("', LEFT, WIDTH, 350".$config['overlib_defaults'].");\" +# echo("', LEFT, WIDTH, 350".$config['overlib_defaults'].");\" # onmouseout=\"return nd();\"> "); echo(""); diff --git a/html/includes/print-vlan.inc.php b/html/includes/print-vlan.inc.php index 46dc191b0..acd896313 100644 --- a/html/includes/print-vlan.inc.php +++ b/html/includes/print-vlan.inc.php @@ -17,7 +17,7 @@ while ($port = mysql_fetch_assoc($ports_query)) echo("
".makeshortif($port['ifDescr'])."
- ".$device['hostname']." - ".$port['ifDescr']."
\ ".$port['ifAlias']." \ \ diff --git a/html/includes/print-vrf.inc.php b/html/includes/print-vrf.inc.php index d24329b2e..0a5d2f451 100644 --- a/html/includes/print-vrf.inc.php +++ b/html/includes/print-vrf.inc.php @@ -17,7 +17,7 @@ while ($port = mysql_fetch_assoc($ports_query)) $graph_type = "port_" . $_GET['opta']; echo("
".makeshortif($port['ifDescr'])."
- ".$device['hostname']." - ".$port['ifDescr']."
\ ".$port['ifAlias']." \ \ diff --git a/html/map.php b/html/map.php index d6bec1fef..7a7eb1e2f 100755 --- a/html/map.php +++ b/html/map.php @@ -104,7 +104,7 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format'])) $dif['interface_id'] = $link['remote_hostname'] . $link['remote_port']; } - $map .= "\"" . $sif['interface_id'] . "\" [label=\"" . $sif['label'] . "\", fontsize=12, fillcolor=lightblue URL=\"{$config['base_url']}/device/".$device['device_id']."/interface/$local_interface_id/\"]\n"; + $map .= "\"" . $sif['interface_id'] . "\" [label=\"" . $sif['label'] . "\", fontsize=12, fillcolor=lightblue URL=\"{$config['base_url']}/device/".$device['device_id']."/port/$local_interface_id/\"]\n"; if (!$ifdone[$src][$sif['interface_id']]) { $map .= "\"$src\" -> \"" . $sif['interface_id'] . "\" [weight=500000, arrowsize=0, len=0];\n"; @@ -115,9 +115,9 @@ if (isset($_GET['format']) && preg_match("/^[a-z]*$/", $_GET['format'])) if ($dst_host == $device['device_id'] || $where == '') { - $map .= "\"" . $dif['interface_id'] . "\" [label=\"" . $dif['label'] . "\", fontsize=12, fillcolor=lightblue, URL=\"{$config['base_url']}/device/$dst_host/interface/$remote_interface_id/\"]\n"; + $map .= "\"" . $dif['interface_id'] . "\" [label=\"" . $dif['label'] . "\", fontsize=12, fillcolor=lightblue, URL=\"{$config['base_url']}/device/$dst_host/port/$remote_interface_id/\"]\n"; } else { - $map .= "\"" . $dif['interface_id'] . "\" [label=\"" . $dif['label'] . " \", fontsize=12, fillcolor=lightgray, URL=\"{$config['base_url']}/device/$dst_host/interface/$remote_interface_id/\"]\n"; + $map .= "\"" . $dif['interface_id'] . "\" [label=\"" . $dif['label'] . " \", fontsize=12, fillcolor=lightgray, URL=\"{$config['base_url']}/device/$dst_host/port/$remote_interface_id/\"]\n"; } if (!$ifdone[$dst][$dif['interface_id']]) diff --git a/html/pages/device/interface.inc.php b/html/pages/device/port.inc.php similarity index 84% rename from html/pages/device/interface.inc.php rename to html/pages/device/port.inc.php index 6cb2f5cd0..344fc3d9d 100644 --- a/html/pages/device/interface.inc.php +++ b/html/pages/device/port.inc.php @@ -53,7 +53,7 @@ echo("
"); print_optionbar_start(); if ($_GET['optb'] == "graphs" || !$_GET['optb']) { echo(""); } -echo("Graphs"); +echo("Graphs"); if ($_GET['optb'] == "graphs" || !$_GET['optb']) { echo(""); } @@ -61,14 +61,14 @@ if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ports_adsl` WHERE `interface { echo(" | "); if ($_GET['optb'] == "adsl") { echo(""); } - echo("ADSL"); + echo("ADSL"); if ($_GET['optb'] == "adsl") { echo(""); } } echo(" | "); if ($_GET['optb'] == "arp") { echo(""); } -echo("ARP Table"); +echo("ARP Table"); if ($_GET['optb'] == "arp") { echo(""); } if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `pagpGroupIfIndex` = '". @@ -76,7 +76,7 @@ if (mysql_result(mysql_query("SELECT COUNT(*) FROM `ports` WHERE `pagpGroupIfInd { echo(" | "); if ($_GET['optb'] == "pagp") { echo(""); } - echo("PAgP"); + echo("PAgP"); if ($_GET['optb'] == "pagp") { echo(""); } } @@ -85,23 +85,23 @@ if (mysql_result(mysql_query("SELECT count(*) FROM mac_accounting WHERE interfac { echo(" | Mac Accounting : "); if ($_GET['optb'] == "macaccounting" && $_GET['optc'] == "bits" && !$_GET['optd']) { echo(""); } - echo("Bits"); + echo("Bits"); if ($_GET['optb'] == "macaccounting" && $_GET['optc'] == "bits" && !$_GET['optd']) { echo(""); } echo("("); if ($_GET['optb'] == "macaccounting" && $_GET['optc'] == "bits" && $_GET['optd'] == "thumbs") { echo(""); } - echo("Mini"); + echo("Mini"); if ($_GET['optb'] == "macaccounting" && $_GET['optc'] == "bits" && $_GET['optd'] == "thumbs") { echo(""); } echo('|'); if ($_GET['optb'] == "macaccounting" && $_GET['optc'] == "bits" && $_GET['optd'] == "top10") { echo(""); } - echo("Top10)"); + echo("Top10)"); if ($_GET['optb'] == "macaccounting" && $_GET['optc'] == "bits" && $_GET['optd'] == "top10") { echo(""); } echo(" | "); if ($_GET['optb'] == "macaccounting" && $_GET['optc'] == "pkts" && !$_GET['optd']) { echo(""); } - echo("Packets"); + echo("Packets"); if ($_GET['optb'] == "macaccounting" && $_GET['optc'] == "pkts" && !$_GET['optd']) { echo(""); } echo("("); if ($_GET['optb'] == "macaccounting" && $_GET['optc'] == "pkts" && $_GET['optd'] == "thumbs") { echo(""); } - echo("Mini"); + echo("Mini"); if ($_GET['optb'] == "macaccounting" && $_GET['optc'] == "pkts" && $_GET['optd'] == "thumbs") { echo(""); } echo(")"); } @@ -110,19 +110,19 @@ if (mysql_result(mysql_query("SELECT COUNT(*) FROM juniAtmVp WHERE interface_id { echo(" | ATM VPs : "); if ($_GET['optb'] == "junose-atm-vp" && $_GET['optc'] == "bits") { echo(""); } - echo("Bits"); + echo("Bits"); if ($_GET['optb'] == "junose-atm-vp" && $_GET['optc'] == "bits") { echo(""); } echo(" | "); if ($_GET['optb'] == "junose-atm-vp" && $_GET['optc'] == "packets") { echo(""); } - echo("Packets"); + echo("Packets"); if ($_GET['optb'] == "junose-atm-vp" && $_GET['optc'] == "bits") { echo(""); } echo(" | "); if ($_GET['optb'] == "junose-atm-vp" && $_GET['optc'] == "cells") { echo(""); } - echo("Cells"); + echo("Cells"); if ($_GET['optb'] == "junose-atm-vp" && $_GET['optc'] == "bits") { echo(""); } echo(" | "); if ($_GET['optb'] == "junose-atm-vp" && $_GET['optc'] == "errors") { echo(""); } - echo("Errors"); + echo("Errors"); if ($_GET['optb'] == "junose-atm-vp" && $_GET['optc'] == "bits") { echo(""); } } diff --git a/html/pages/device/port/macaccounting.inc.php b/html/pages/device/port/macaccounting.inc.php index abca23d68..57cc4d152 100644 --- a/html/pages/device/port/macaccounting.inc.php +++ b/html/pages/device/port/macaccounting.inc.php @@ -42,7 +42,7 @@ if ($_GET['optd'] == "top10")
Month
- +
Year
- +
@@ -81,19 +81,19 @@ if ($_GET['optd'] == "top10")
Traffic
- +
Packets
- +
Top Aggregate
- @@ -200,13 +200,13 @@ if ($_GET['optd'] == "top10") $yearly_traffic = "graph.php?id=" . $acc['ma_id'] . "&type=$graph_type&from=$year&to=$now&width=210&height=100"; $yearly_url = "graph.php?id=" . $acc['ma_id'] . "&type=$graph_type&from=$year&to=$now&width=500&height=150"; - echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> + echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> "); - echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> + echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> "); - echo("', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\"> + echo("', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\"> "); - echo("', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\"> + echo("', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\"> "); echo("
"); diff --git a/html/pages/device/port/pagp.inc.php b/html/pages/device/port/pagp.inc.php index b9cd00f8d..dce92906f 100644 --- a/html/pages/device/port/pagp.inc.php +++ b/html/pages/device/port/pagp.inc.php @@ -16,13 +16,13 @@ $monthly_url = $config['base_url'] . "/graph.php?port=" . $interface['interf $yearly_traffic = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&type=$graph_type&from=$year&to=$now&width=215&height=100"; $yearly_url = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&type=$graph_type&from=$year&to=$now&width=500&height=150"; -echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> +echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> "); -echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> +echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> "); -echo("', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\"> +echo("', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\"> "); -echo("', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\"> +echo("', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\"> "); $members = mysql_query("SELECT * FROM `ports` WHERE `pagpGroupIfIndex` = '".$interface['ifIndex']."' and `device_id` = '".$device['device_id']."'"); diff --git a/html/pages/device/ports.inc.php b/html/pages/device/ports.inc.php index 9b42ff6a0..37d3d3f19 100644 --- a/html/pages/device/ports.inc.php +++ b/html/pages/device/ports.inc.php @@ -63,7 +63,7 @@ if ($_GET['optc'] == thumbs) { echo("
".makeshortif($interface['ifDescr'])."
- ".$device['hostname']." - ".$interface['ifDescr']."
\ ".$interface['ifAlias']." \ \ diff --git a/html/pages/iftype.inc.php b/html/pages/iftype.inc.php index b39467362..47acb1fc4 100644 --- a/html/pages/iftype.inc.php +++ b/html/pages/iftype.inc.php @@ -54,7 +54,7 @@ if ($if_list) if (mysql_result(mysql_query("SELECT count(*) FROM mac_accounting WHERE interface_id = '".$interface['interface_id']."'"),0)) { - echo(" MAC Accounting"); + echo(" MAC Accounting"); } echo("");