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

fix how we decide to show routing tab, and save some db queries

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2296 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-13 08:57:54 +00:00
parent 6f461860f9
commit c156c75b0a
2 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/device.inc.php
+24 -25
View File
@@ -52,11 +52,11 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
</a>
</li>');
$health = dbFetchCell("select count(*) from storage WHERE device_id = '" . $device['device_id'] . "'") +
dbFetchCell("select count(sensor_id) from sensors WHERE device_id = '" . $device['device_id'] . "'") +
dbFetchCell("select count(*) from cempMemPool WHERE device_id = '" . $device['device_id'] . "'") +
dbFetchCell("select count(*) from cpmCPU WHERE device_id = '" . $device['device_id'] . "'") +
dbFetchCell("select count(*) from processors WHERE device_id = '" . $device['device_id'] . "'");
$health = dbFetchCell("SELECT COUNT(*) FROM storage WHERE device_id = '" . $device['device_id'] . "'") +
dbFetchCell("SELECT COUNT(sensor_id) FROM sensors WHERE device_id = '" . $device['device_id'] . "'") +
dbFetchCell("SELECT COUNT(*) FROM cempMemPool WHERE device_id = '" . $device['device_id'] . "'") +
dbFetchCell("SELECT COUNT(*) FROM cpmCPU WHERE device_id = '" . $device['device_id'] . "'") +
dbFetchCell("SELECT COUNT(*) FROM processors WHERE device_id = '" . $device['device_id'] . "'");
if ($health)
{
@@ -67,7 +67,7 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
</li>');
}
if (@dbFetchCell("select count(app_id) from applications WHERE device_id = '" . $device['device_id'] . "'") > '0')
if (@dbFetchCell("SELECT COUNT(app_id) FROM applications WHERE device_id = '" . $device['device_id'] . "'") > '0')
{
echo('<li class="' . $select['apps'] . '">
<a href="device/' . $device['device_id'] . '/apps/">
@@ -85,7 +85,7 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
</li>');
}
if (@dbFetchCell("select count(interface_id) from ports WHERE device_id = '" . $device['device_id'] . "'") > '0')
if (@dbFetchCell("SELECT COUNT(interface_id) FROM ports WHERE device_id = '" . $device['device_id'] . "'") > '0')
{
echo('<li class="' . $select['ports'] . $select['port'] . '">
<a href="device/' . $device['device_id'] . '/ports/' .$config['ports_page_default']. '">
@@ -94,7 +94,7 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
</li>');
}
if (@dbFetchCell("select count(vlan_id) from vlans WHERE device_id = '" . $device['device_id'] . "'") > '0')
if (@dbFetchCell("SELECT COUNT(vlan_id) FROM vlans WHERE device_id = '" . $device['device_id'] . "'") > '0')
{
echo('<li class="' . $select['vlans'] . '">
<a href="device/' . $device['device_id'] . '/vlans/">
@@ -112,22 +112,21 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
</li>');
}
if ($config['enable_bgp'] && $device['bgpLocalAs'])
{
$bgp_menu = '<li class="' . $select['bgp'] . '">
<a href="device/' . $device['device_id'] . '/bgp/">
<img src="images/16/link.png" align="absmiddle" border="0" /> BGP
</a>
</li>';
}
### $routing_tabs is used in device/routing/ to build the tabs menu. we built it here to save some queries
if ($config['enable_ospf'])
{
$ospf_count = dbFetchCell("select count(*) from ospf_instances WHERE device_id = '" . $device['device_id'] . "'");
if ($ospf_count) { $ospf_menu = 1; }
}
$device_routing_count['bgp'] = dbFetchCell("SELECT COUNT(*) FROM `bgpPeers` WHERE `device_id` = ?", array($device['device_id']));
if ($device_routing_count['bgp']) { $routing_tabs[] = 'bgp'; }
$device_routing_count['ospf'] = dbFetchCell("SELECT COUNT(*) FROM `ospf_ports` WHERE `device_id` = ?", array($device['device_id']));
if ($device_routing_count['ospf']) { $routing_tabs[] = 'ospf'; }
if (isset($bgp_menu) || isset($ospf_menu) || isset($isis_menu) || isset($eigrp_menu))
$device_routing_count['cef'] = dbFetchCell("SELECT COUNT(*) FROM `cef_switching` WHERE `device_id` = ?", array($device['device_id']));
if ($device_routing_count['cef']) { $routing_tabs[] = 'cef'; }
$device_routing_count['vrf'] = @dbFetchCell("SELECT COUNT(*) FROM `vrfs` WHERE `device_id` = ?", array($device['device_id']));
if($device_routing_count['vrf']) { $routing_tabs[] = 'vrf'; }
if (is_array($routing_tabs))
{
echo('<li class="' . $select['routing'] . '">
<a href="device/' . $device['device_id'] . '/routing/">
@@ -136,7 +135,7 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
</li>');
}
if ($_SESSION['userlevel'] >= "5" && dbFetchCell("SELECT count(*) FROM links AS L, ports AS I WHERE I.device_id = '".$device['device_id']."' AND I.interface_id = L.local_interface_id"))
if ($_SESSION['userlevel'] >= "5" && dbFetchCell("SELECT COUNT(*) FROM links AS L, ports AS I WHERE I.device_id = '".$device['device_id']."' AND I.interface_id = L.local_interface_id"))
{
$discovery_links = TRUE;
echo('<li class="' . $select['map'] . '">
@@ -163,7 +162,7 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
</li>');
}
if (dbFetchCell("select count(service_id) from services WHERE device_id = '" . $device['device_id'] . "'") > '0')
if (dbFetchCell("SELECT COUNT(service_id) FROM services WHERE device_id = '" . $device['device_id'] . "'") > '0')
{
echo('<li class="' . $select['srv'] . '">
<a href="device/' . $device['device_id'] . '/services/">
@@ -172,7 +171,7 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
</li>');
}
if (@dbFetchCell("select count(toner_id) from toner WHERE device_id = '" . $device['device_id'] . "'") > '0')
if (@dbFetchCell("SELECT COUNT(toner_id) FROM toner WHERE device_id = '" . $device['device_id'] . "'") > '0')
{
echo('<li class="' . $select['toner'] . '">
<a href="device/' . $device['device_id'] . '/toner/">
html/pages/device/routing.inc.php
+2 -17
View File
@@ -1,20 +1,5 @@
<?php
unset($datas);
$device_routing_count['bgp'] = mysql_result(mysql_query("select count(*) from bgpPeers WHERE device_id = '" . $device['device_id'] . "'"), 0);
if ($device_routing_count['bgp']) { $datas[] = 'bgp'; }
$device_routing_count['ospf'] = mysql_result(mysql_query("select count(*) from ospf_ports WHERE device_id = '" . $device['device_id'] . "'"), 0);
if ($device_routing_count['ospf']) { $datas[] = 'ospf'; }
$device_routing_count['cef'] = mysql_result(mysql_query("select count(*) from cef_switching WHERE device_id = '" . $device['device_id'] . "'"), 0);
if ($device_routing_count['cef']) { $datas[] = 'cef'; }
$device_routing_count['vrf'] = @mysql_result(mysql_query("select count(*) from vrfs WHERE device_id = '" . $device['device_id'] . "'"), 0);
if($device_routing_count['vrf']) { $datas[] = 'vrf'; }
#$type_text['overview'] = "Overview";
$type_text['bgp'] = "BGP";
$type_text['cef'] = "CEF";
@@ -26,7 +11,7 @@ print_optionbar_start();
echo("<span style='font-weight: bold;'>Routing</span> &#187; ");
unset($sep);
foreach ($datas as $type)
foreach ($routing_tabs as $type)
{
if (!$_GET['opta']) { $_GET['opta'] = $type; }
@@ -49,7 +34,7 @@ if (is_file("pages/device/routing/".mres($_GET['opta']).".inc.php"))
{
include("pages/device/routing/".mres($_GET['opta']).".inc.php");
} else {
foreach ($datas as $type)
foreach ($routing_tabs as $type)
{
if ($type != "overview")
{