mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes to BGP global page

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2871 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-02-16 16:43:11 +00:00
parent 06c25fe703
commit 726df0ca5f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
html/includes/functions.inc.php
View File

@@ -59,7 +59,7 @@ function generate_device_url($device, $vars=array())
return generate_url(array('page' => 'device', 'device' => $device['device_id']), $vars); return generate_url(array('page' => 'device', 'device' => $device['device_id']), $vars);
} }
function generate_device_link($device, $text=0, $vars=array(), $start=0, $end=0) function generate_device_link($device, $text=NULL, $vars=array(), $start=0, $end=0)
{ {
global $config; global $config;
@@ -92,10 +92,10 @@ function generate_device_link($device, $text=0, $vars=array(), $start=0, $end=0)
if ($device['os']) { $contents .= mres($config['os'][$device['os']]['text']); } if ($device['os']) { $contents .= mres($config['os'][$device['os']]['text']); }
if ($device['version']) { $contents .= " ".mres($device['version']); } if ($device['version']) { $contents .= " ".mres($device['version']); }
if ($device['features']) { $contents .= " (".mres($device['features']).")"; } if ($device['features']) { $contents .= " (".mres($device['features']).")"; }
# if ($device['hardware']) { $contents .= " - ".$device['hardware']; } if ($device['hardware']) { $contents .= " - ".$device['hardware']; }
if (isset($device['location'])) { $contents .= "<br />" . htmlentities($device['location']); }
$contents .= "</div>"; $contents .= "</div>";
# if (isset($device['location'])) { $contents .= "" . htmlentities($device['location'])."<br />"; }
foreach ($graphs as $entry) foreach ($graphs as $entry)
{ {
$graph = $entry['graph']; $graph = $entry['graph'];

2
html/includes/print-menubar.php
View File

@@ -442,7 +442,7 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf
{ ## FIXME link below broken! { ## FIXME link below broken!
echo(' echo('
<li><hr width=140></li> <li><hr width=140></li>
<li><a href="routing/protocol=bgp/alerts/"><img src="images/16/link_error.png" border="0" align="absmiddle" /> Alerted BGP (' . $bgp_alerts . ')</a></li> <li><a href="routing/protocol=bgp/state=down/"><img src="images/16/link_error.png" border="0" align="absmiddle" /> Alerted BGP (' . $bgp_alerts . ')</a></li>
'); ');
} }

2
html/pages/routing/bgp.inc.php
View File

@@ -191,7 +191,7 @@ else
unset($sep); unset($sep);
echo(" <td></td> echo(" <td></td>
<td width=150>" . $localaddresslink . "<br />".generate_device_link($peer, shorthost($peer['hostname']), 'routing/bgp/')."</td> <td width=150>" . $localaddresslink . "<br />".generate_device_link($peer, shorthost($peer['hostname']), array('tab' => 'routing', 'proto' => 'bgp'))."</td>
<td width=30><b>&#187;</b></td> <td width=30><b>&#187;</b></td>
<td width=150>" . $peeraddresslink . "</td> <td width=150>" . $peeraddresslink . "</td>
<td width=50><b>$peer_type</b></td> <td width=50><b>$peer_type</b></td>