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

syntaxer run, removes dos newlines from 2 files

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2597 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-09-27 13:22:38 +00:00
parent ae558c7dbd
commit 9ff0fdb443
4 changed files with 293 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
html/pages/device/ports.inc.php
View File

@@ -95,8 +95,7 @@ if ($vars['view'] == 'minigraphs')
echo("<div style='margin: 0px;'><table border=0 cellspacing=0 cellpadding=5 width=100%>");
$i = "1";
global $port_cache;
global $port_index_cache;
global $port_cache, $port_index_cache;
$ports = dbFetchRows("SELECT * FROM `ports` WHERE `device_id` = ? AND `deleted` = '0' ORDER BY `ifIndex` ASC", array($device['device_id']));
### As we've dragged the whole database, lets pre-populate our caches :)

2
includes/polling/ports.inc.php
View File

@@ -199,7 +199,7 @@ foreach ($ports as $port)
$this_port['ifTrunk'] = $this_port['vlanTrunkPortEncapsulationOperType'];
}
$this_port['ifVlan'] = $this_port['vmVlan'];
if(isset($this_port['vlanTrunkPortNativeVlan'])) { $this_port['ifVlan'] = $this_port['vlanTrunkPortNativeVlan']; }
if (isset($this_port['vlanTrunkPortNativeVlan'])) { $this_port['ifVlan'] = $this_port['vlanTrunkPortNativeVlan']; }
if (isset($this_port['dot1qPvid']))
{