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

move includes/billing.php includes/syslog.php and includes/functions.php to dbFacile

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2278 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-12 11:58:17 +00:00
parent f8384e0d17
commit ebcbf22317
4 changed files with 59 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
includes/syslog.php
View File

@@ -17,7 +17,7 @@ function process_syslog ($entry, $update)
$delete = 1;
}
$device_id_host = @mysql_result(mysql_query("SELECT device_id FROM devices WHERE `hostname` = '".$entry['host']."' OR `sysName` = '".$entry['host']."'"),0);
$device_id_host = @dbFetchCell("SELECT device_id FROM devices WHERE `hostname` = '".mres($entry['host'])."' OR `sysName` = '".mres($entry['host'])."'");
if ($device_id_host)
{
@@ -25,8 +25,8 @@ function process_syslog ($entry, $update)
}
else
{
$device_id_ip = @mysql_result(mysql_query("SELECT device_id FROM ipv4_addresses AS A, ports AS I WHERE
A.ipv4_address = '" . $entry['host']."' AND I.interface_id = A.interface_id"),0);
$device_id_ip = @dbFetchCell("SELECT device_id FROM ipv4_addresses AS A, ports AS I WHERE
A.ipv4_address = '" . $entry['host']."' AND I.interface_id = A.interface_id");
if ($device_id_ip)
{
$entry['device_id'] = $device_id_ip;
@@ -35,7 +35,7 @@ function process_syslog ($entry, $update)
if ($entry['device_id'] && !$delete)
{
$os = mysql_result(mysql_query("SELECT `os` FROM `devices` WHERE `device_id` = '".$entry['device_id']."'"),0);
$os = dbFetchCell("SELECT `os` FROM `devices` WHERE `device_id` = '".mres($entry['device_id'])."'");
if ($os == 'catos')
{
$matches = array();
@@ -97,4 +97,4 @@ function process_syslog ($entry, $update)
return $entry;
}
?>
?>