From 173b095964486eb715a8ba37445d94e9e524624d Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Fri, 15 Apr 2011 14:10:24 +0000
Subject: [PATCH] remove some leading slashiz

git-svn-id: http://www.observium.org/svn/observer/trunk@2085 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/print-interface-adsl.inc.php |  3 +++
 html/pages/device/bgp.inc.php              | 12 ++++++------
 html/pages/device/port/pagp.inc.php        |  8 ++++----
 html/pages/vrf.inc.php                     | 12 ++++++------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/html/includes/print-interface-adsl.inc.php b/html/includes/print-interface-adsl.inc.php
index 99eb481dc..f2d2e0900 100644
--- a/html/includes/print-interface-adsl.inc.php
+++ b/html/includes/print-interface-adsl.inc.php
@@ -16,6 +16,7 @@ if ($interface['ifInErrors_delta'] > 0 || $interface['ifOutErrors_delta'] > 0)
   $error_img = generate_port_link($interface,"<img src='images/16/chart_curve_error.png' alt='Interface Errors' border=0>","port_errors");
 } else { $error_img = ""; }
 
+# FIXME leading slash - does javascript honor base tag?
 echo("<tr style=\"background-color: $row_colour; padding: 5px;\" valign=top onmouseover=\"this.style.backgroundColor='$list_highlight';\" onmouseout=\"this.style.backgroundColor='$row_colour';\"
 onclick=\"location.href='/device/".$device['device_id']."/port/".$interface['interface_id']."/'\" style='cursor: pointer;'>
  <td valign=top width=350>");
@@ -31,12 +32,14 @@ if ($port_details)
   $ipdata = mysql_query("SELECT * FROM `ipv4_addresses` WHERE `interface_id` = '" . $interface['interface_id'] . "'");
   while ($ip = mysql_fetch_Array($ipdata))
   {
+    # FIXME leading slash - does javascript honor base tag?
     echo("$break <a class=interface-desc href=\"javascript:popUp('/netcmd.php?cmd=whois&amp;query=$ip[ipv4_address]')\">$ip[ipv4_address]/$ip[ipv4_prefixlen]</a>");
     $break = ",";
   }
   $ip6data = mysql_query("SELECT * FROM `ipv6_addresses` WHERE `interface_id` = '" . $interface['interface_id'] . "'");
   while ($ip6 = mysql_fetch_Array($ip6data))
   {
+    # FIXME leading slash - does javascript honor base tag?
     echo("$break <a class=interface-desc href=\"javascript:popUp('/netcmd.php?cmd=whois&amp;query=".$ip6['ipv6_address']."')\">".Net_IPv6::compress($ip6['ipv6_address'])."/".$ip6['ipv6_prefixlen']."</a>");
     $break = ",";
   }
diff --git a/html/pages/device/bgp.inc.php b/html/pages/device/bgp.inc.php
index f3b63ec70..3b45b2f2d 100644
--- a/html/pages/device/bgp.inc.php
+++ b/html/pages/device/bgp.inc.php
@@ -7,17 +7,17 @@ print_optionbar_start();
 
 echo("
   <div style='margin: auto; text-align: left; padding-left: 11px; clear: both; display:block; height:20px;'>
-  <a href='/device/" . $device['device_id'] . "/bgp/'>No Graphs</a> |
-  <a href='/device/" . $device['device_id'] . "/bgp/updates/'>Updates</a>");
+  <a href='device/" . $device['device_id'] . "/bgp/'>No Graphs</a> |
+  <a href='device/" . $device['device_id'] . "/bgp/updates/'>Updates</a>");
 
 echo(" | Prefixes:
-  <a href='/device/" . $device['device_id'] . "/bgp/prefixes/ipv4.unicast/'>IPv4</a> |
-  <a href='/device/" . $device['device_id'] . "/bgp/prefixes/ipv4.vpn/'>VPNv4</a> |
-  <a href='/device/" . $device['device_id'] . "/bgp/prefixes/ipv6.unicast/'>IPv6</a>
+  <a href='device/" . $device['device_id'] . "/bgp/prefixes/ipv4.unicast/'>IPv4</a> |
+  <a href='device/" . $device['device_id'] . "/bgp/prefixes/ipv4.vpn/'>VPNv4</a> |
+  <a href='device/" . $device['device_id'] . "/bgp/prefixes/ipv6.unicast/'>IPv6</a>
   ");
 
 echo("| Traffic:
-  <a href='/device/" . $device['device_id'] . "/bgp/macaccounting/'>Mac Accounting</a>");
+  <a href='device/" . $device['device_id'] . "/bgp/macaccounting/'>Mac Accounting</a>");
 
 echo("</div>
 ");
diff --git a/html/pages/device/port/pagp.inc.php b/html/pages/device/port/pagp.inc.php
index dce92906f..67e024d03 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'] . "&amp;type=$graph_type&amp;from=$year&amp;to=$now&amp;width=215&amp;height=100";
 $yearly_url      = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&amp;type=$graph_type&amp;from=$year&amp;to=$now&amp;width=500&amp;height=150";
 
-echo("<a href='/device/".$device['device_id']."/port/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
+echo("<a href='device/".$device['device_id']."/port/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
       <img src='$daily_traffic' border=0></a> ");
-echo("<a href='/device/".$device['device_id']."/port/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$weekly_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
+echo("<a href='device/".$device['device_id']."/port/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$weekly_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
       <img src='$weekly_traffic' border=0></a> ");
-echo("<a href='/device/".$device['device_id']."/port/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$monthly_url\'>', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\">
+echo("<a href='device/".$device['device_id']."/port/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$monthly_url\'>', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\">
       <img src='$monthly_traffic' border=0></a> ");
-echo("<a href='/device/".$device['device_id']."/port/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$yearly_url\'>', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\">
+echo("<a href='device/".$device['device_id']."/port/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$yearly_url\'>', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\">
       <img src='$yearly_traffic' border=0></a>");
 
 $members = mysql_query("SELECT * FROM `ports` WHERE `pagpGroupIfIndex` = '".$interface['ifIndex']."' and `device_id` = '".$device['device_id']."'");
diff --git a/html/pages/vrf.inc.php b/html/pages/vrf.inc.php
index 8d094ef5f..9e34ed245 100644
--- a/html/pages/vrf.inc.php
+++ b/html/pages/vrf.inc.php
@@ -2,12 +2,12 @@
 
 echo("
 <div style='width: 100%; text-align: right; padding-bottom: 10px; clear: both; display:block; height:20px;'>
-<a href='/vrf/" . $_GET['id'] . "/'>Basic</a> |
-<a href='/vrf/" . $_GET['id'] . "/details/'>Details</a> | Graphs:
-<a href='/vrf/" . $_GET['id'] . "/graphs/bits/'>Bits</a> |
-<a href='/vrf/" . $_GET['id'] . "/graphs/pkts/'>Packets</a> |
-<a href='/vrf/" . $_GET['id'] . "/graphs/nupkts/'>NU Packets</a> |
-<a href='/vrf/" . $_GET['id'] . "/graphs/errors/'>Errors</a>
+<a href='vrf/" . $_GET['id'] . "/'>Basic</a> |
+<a href='vrf/" . $_GET['id'] . "/details/'>Details</a> | Graphs:
+<a href='vrf/" . $_GET['id'] . "/graphs/bits/'>Bits</a> |
+<a href='vrf/" . $_GET['id'] . "/graphs/pkts/'>Packets</a> |
+<a href='vrf/" . $_GET['id'] . "/graphs/nupkts/'>NU Packets</a> |
+<a href='vrf/" . $_GET['id'] . "/graphs/errors/'>Errors</a>
 </div>");
 
 if ($_GET['opta'] == 'graphs')