From b6e7b4ef7aed825692670b39547f105de84da3aa Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Wed, 5 Oct 2011 10:55:10 +0000 Subject: [PATCH] remove almost all base_url git-svn-id: http://www.observium.org/svn/observer/trunk@2648 61d68cd4-352d-0410-923a-c4978735b2b8 --- .../pages/device/overview/generic/sensor.inc.php | 2 +- html/pages/device/overview/mempools.inc.php | 2 +- html/pages/device/overview/processors.inc.php | 2 +- html/pages/device/overview/storage.inc.php | 2 +- html/pages/device/port.inc.php | 9 +++++---- html/pages/device/port/pagp.inc.php | 16 ++++++++-------- html/pages/device/routing/ipsec_tunnels.inc.php | 5 ----- html/pages/device/routing/vrf.inc.php | 5 ----- html/pages/device/services.inc.php | 2 +- html/pages/health/mempool.inc.php | 2 +- html/pages/health/processor.inc.php | 2 +- 11 files changed, 20 insertions(+), 29 deletions(-) diff --git a/html/pages/device/overview/generic/sensor.inc.php b/html/pages/device/overview/generic/sensor.inc.php index c96a6c1ea..96365f00c 100644 --- a/html/pages/device/overview/generic/sensor.inc.php +++ b/html/pages/device/overview/generic/sensor.inc.php @@ -5,7 +5,7 @@ $sensors = dbFetchRows("SELECT * FROM `sensors` WHERE `sensor_class` = ? AND dev if (count($sensors)) { echo('
'); - echo('

' . $sensor_type . '

'); + echo('

' . $sensor_type . '

'); $i = '0'; echo(''); foreach ($sensors as $sensor) diff --git a/html/pages/device/overview/mempools.inc.php b/html/pages/device/overview/mempools.inc.php index aaa8f274d..69f60fc32 100644 --- a/html/pages/device/overview/mempools.inc.php +++ b/html/pages/device/overview/mempools.inc.php @@ -9,7 +9,7 @@ if (count($mempools)) echo("
"); echo("

"); echo(''); - echo(" Memory Pools

"); + echo(" Memory Pools

"); echo("
"); $mempool_rows = '0'; diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php index 8645f69c9..f5b92cd9e 100644 --- a/html/pages/device/overview/processors.inc.php +++ b/html/pages/device/overview/processors.inc.php @@ -10,7 +10,7 @@ if (count($processors)) echo("
"); echo("

"); echo(''); - echo(" Processors

"); + echo(" Processors

"); echo("
"); foreach ($processors as $proc) diff --git a/html/pages/device/overview/storage.inc.php b/html/pages/device/overview/storage.inc.php index 10c2d9b16..9e3c74b2c 100644 --- a/html/pages/device/overview/storage.inc.php +++ b/html/pages/device/overview/storage.inc.php @@ -9,7 +9,7 @@ if (count($drives)) echo("
"); echo("

"); echo(''); - echo(" Storage

"); + echo(" Storage

"); echo("
"); $drive_rows = '0'; diff --git a/html/pages/device/port.inc.php b/html/pages/device/port.inc.php index 782e52a6c..389a61d4a 100644 --- a/html/pages/device/port.inc.php +++ b/html/pages/device/port.inc.php @@ -116,22 +116,23 @@ if (dbFetchCell("SELECT COUNT(*) FROM juniAtmVp WHERE interface_id = '".$port['i { ### FIXME ATM VPs + ### FIXME URLs BROKEN echo(" | ATM VPs : "); if ($vars['view'] == "junose-atm-vp" && $vars['graph'] == "bits") { echo(""); } - echo("Bits"); + echo("Bits"); if ($vars['view'] == "junose-atm-vp" && $vars['graph'] == "bits") { echo(""); } echo(" | "); if ($vars['view'] == "junose-atm-vp" && $vars['graph'] == "packets") { echo(""); } - echo("Packets"); + echo("Packets"); if ($vars['view'] == "junose-atm-vp" && $vars['graph'] == "bits") { echo(""); } echo(" | "); if ($vars['view'] == "junose-atm-vp" && $vars['graph'] == "cells") { echo(""); } - echo("Cells"); + echo("Cells"); if ($vars['view'] == "junose-atm-vp" && $vars['graph'] == "bits") { echo(""); } echo(" | "); if ($vars['view'] == "junose-atm-vp" && $vars['graph'] == "errors") { echo(""); } - echo("Errors"); + echo("Errors"); if ($vars['view'] == "junose-atm-vp" && $vars['graph'] == "bits") { echo(""); } } diff --git a/html/pages/device/port/pagp.inc.php b/html/pages/device/port/pagp.inc.php index 9d8341b8c..095eb2963 100644 --- a/html/pages/device/port/pagp.inc.php +++ b/html/pages/device/port/pagp.inc.php @@ -6,17 +6,17 @@ global $config; if (!$graph_type) { $graph_type = "pagp_bits"; } -$daily_traffic = $config['base_url'] . "/graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$day&to=$now&width=215&height=100"; -$daily_url = $config['base_url'] . "/graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$day&to=$now&width=500&height=150"; +$daily_traffic = "graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$day&to=$now&width=215&height=100"; +$daily_url = "graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$day&to=$now&width=500&height=150"; -$weekly_traffic = $config['base_url'] . "/graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$week&to=$now&width=215&height=100"; -$weekly_url = $config['base_url'] . "/graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$week&to=$now&width=500&height=150"; +$weekly_traffic = "graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$week&to=$now&width=215&height=100"; +$weekly_url = "graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$week&to=$now&width=500&height=150"; -$monthly_traffic = $config['base_url'] . "/graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$month&to=$now&width=215&height=100"; -$monthly_url = $config['base_url'] . "/graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$month&to=$now&width=500&height=150"; +$monthly_traffic = "graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$month&to=$now&width=215&height=100"; +$monthly_url = "graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$month&to=$now&width=500&height=150"; -$yearly_traffic = $config['base_url'] . "/graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$year&to=$now&width=215&height=100"; -$yearly_url = $config['base_url'] . "/graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$year&to=$now&width=500&height=150"; +$yearly_traffic = "graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$year&to=$now&width=215&height=100"; +$yearly_url = "graph.php?port=" . $port['interface_id'] . "&type=$graph_type&from=$year&to=$now&width=500&height=150"; echo("', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"> "); diff --git a/html/pages/device/routing/ipsec_tunnels.inc.php b/html/pages/device/routing/ipsec_tunnels.inc.php index 8d342ef76..e800ece8b 100644 --- a/html/pages/device/routing/ipsec_tunnels.inc.php +++ b/html/pages/device/routing/ipsec_tunnels.inc.php @@ -34,11 +34,6 @@ foreach ($graph_types as $type => $descr) echo(''.$descr.''); if ($_GET['opte'] == $type) { echo(""); } -# echo('('); -# if ($_GET['opte'] == $type) { echo(""); } -# echo('Mini'); -# if ($_GET['opte'] == $type) { echo(""); } -# echo(')'); $type_sep = " | "; } diff --git a/html/pages/device/routing/vrf.inc.php b/html/pages/device/routing/vrf.inc.php index 38aa49ab1..a9b4e3bb2 100644 --- a/html/pages/device/routing/vrf.inc.php +++ b/html/pages/device/routing/vrf.inc.php @@ -45,11 +45,6 @@ foreach ($graph_types as $type => $descr) echo(generate_link($descr, $link_array,array('view'=>'graphs','graph'=>$type))); if ($vars['graph'] == $type) { echo(""); } -# echo('('); -# if ($vars['view'] == $type) { echo(""); } -# echo('Mini'); -# if ($vars['view'] == $type) { echo(""); } -# echo(')'); $type_sep = " | "; } diff --git a/html/pages/device/services.inc.php b/html/pages/device/services.inc.php index bceb8d066..a029bbfac 100644 --- a/html/pages/device/services.inc.php +++ b/html/pages/device/services.inc.php @@ -15,7 +15,7 @@ foreach ($menu_options as $option => $text) { echo(""); } - echo('' . $text . ''); + echo('' . $text . ''); if ($_GET['optc'] == $option) { echo(""); diff --git a/html/pages/health/mempool.inc.php b/html/pages/health/mempool.inc.php index 5bf7e5455..10544d380 100644 --- a/html/pages/health/mempool.inc.php +++ b/html/pages/health/mempool.inc.php @@ -23,7 +23,7 @@ foreach (dbFetchRows("SELECT * FROM `mempools` AS M, `devices` as D WHERE D.devi $text_descr = $mempool['mempool_descr']; $mempool_url = "device/device=".$mempool['device_id']."/tab=health/metric=mempool/"; - $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4"; + $mini_url = "graph.php?id=".$mempool['mempool_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4"; $mempool_popup = "onmouseover=\"return overlib('
".$device['hostname']." - ".$text_descr; $mempool_popup .= "
"; diff --git a/html/pages/health/processor.inc.php b/html/pages/health/processor.inc.php index 152785002..c6b17fd68 100644 --- a/html/pages/health/processor.inc.php +++ b/html/pages/health/processor.inc.php @@ -30,7 +30,7 @@ foreach (dbFetchRows("SELECT * FROM `processors` AS P, `devices` AS D WHERE D.de $proc_url = "device/".$device['device_id']."/health/processor/"; - $mini_url = $config['base_url'] . "/graph.php?id=".$proc['processor_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4"; + $mini_url = "graph.php?id=".$proc['processor_id']."&type=".$graph_type."&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4"; $proc_popup = "onmouseover=\"return overlib('
".$device['hostname']." - ".$text_descr; $proc_popup .= "
";