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 some dbFetchCell -> dbFetchRow

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2291 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-12 22:20:05 +00:00
parent 6bcc4f4e48
commit 870abb6afe
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
html/includes/print-interface.inc.php
View File

@@ -42,7 +42,7 @@ if ($port_details)
{ {
foreach (dbFetchRows("SELECT * FROM `ipv4_addresses` WHERE `interface_id` = ?", array($interface['interface_id'])) as $ip) foreach (dbFetchRows("SELECT * FROM `ipv4_addresses` WHERE `interface_id` = ?", array($interface['interface_id'])) as $ip)
{ {
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>"); 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 = "<br />"; $break = "<br />";
} }
foreach (dbFetchRows("SELECT * FROM `ipv6_addresses` WHERE `interface_id` = ?", array($interface['interface_id'])) as $ip6) foreach (dbFetchRows("SELECT * FROM `ipv6_addresses` WHERE `interface_id` = ?", array($interface['interface_id'])) as $ip6)
@@ -145,7 +145,7 @@ if (strpos($interface['label'], "oopback") === false && !$graph_type)
AND A.ipv4_network_id = ? AND D.device_id = I.device_id AND A.ipv4_network_id = ? AND D.device_id = I.device_id
AND D.device_id != ?"; AND D.device_id != ?";
$array = array($net['ipv4_network_id'], $device['device_id']); $array = array($net['ipv4_network_id'], $device['device_id']);
foreach(dbFetchRow($sql, $array) AS $new) foreach(dbFetchRows($sql, $array) AS $new)
{ {
echo($new['ipv4_network_id']); echo($new['ipv4_network_id']);
$this_ifid = $new['interface_id']; $this_ifid = $new['interface_id'];
@@ -166,7 +166,7 @@ if (strpos($interface['label'], "oopback") === false && !$graph_type)
AND D.device_id != ? AND A.ipv6_origin != 'linklayer' AND A.ipv6_origin != 'wellknown'"; AND D.device_id != ? AND A.ipv6_origin != 'linklayer' AND A.ipv6_origin != 'wellknown'";
$array = array($net['ipv6_network_id'], $device['device_id']); $array = array($net['ipv6_network_id'], $device['device_id']);
foreach(dbFetchRow($sql, $array) AS $new) foreach(dbFetchRows($sql, $array) AS $new)
{ {
echo($new['ipv6_network_id']); echo($new['ipv6_network_id']);
$this_ifid = $new['interface_id']; $this_ifid = $new['interface_id'];

6
includes/common.php
View File

@@ -167,12 +167,12 @@ function getifindexbyid($id)
function get_port_by_ifIndex($device, $ifIndex) function get_port_by_ifIndex($device, $ifIndex)
{ {
return dbFetchCell("SELECT * FROM `ports` WHERE `device_id` = ? AND `ifIndex` = ?", array($device['device_id'], $ifIndex)); return dbFetchRow("SELECT * FROM `ports` WHERE `device_id` = ? AND `ifIndex` = ?", array($device['device_id'], $ifIndex));
} }
function getifbyid($id) function getifbyid($id)
{ {
return dbFetchCell("SELECT * FROM `ports` WHERE `interface_id` = ?", array($id)); return dbFetchRow("SELECT * FROM `ports` WHERE `interface_id` = ?", array($id));
} }
function getifdescrbyid($id) function getifdescrbyid($id)
@@ -221,7 +221,7 @@ function set_dev_attrib($device, $attrib_type, $attrib_value)
function get_dev_attribs($device) function get_dev_attribs($device)
{ {
$attribs = array(); $attribs = array();
foreach(dbFetch("SELECT * FROM devices_attribs WHERE `device_id` = ?", array($device)) as $entry) foreach(dbFetchRow("SELECT * FROM devices_attribs WHERE `device_id` = ?", array($device)) as $entry)
{ {
$attribs[$entry['attrib_type']] = $entry['attrib_value']; $attribs[$entry['attrib_type']] = $entry['attrib_value'];
} }