nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-03 08:01:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1415 from job/rework_includes/polling/system.inc.php

Browse Source 
Cleanup includes/polling/system.inc.php
This commit is contained in:
Neil Lathwood
2015-07-09 03:23:28 +01:00
parent 25b19babbb a4a983b52c
commit 68215ef91c
1 changed files with 73 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/polling/system.inc.php
+12 -27
View File
@@ -97,38 +97,23 @@
// Remove leading & trailing backslashes added by VyOS/Vyatta/EdgeOS
$poll_device['sysContact'] = trim($poll_device['sysContact'], "\\");
if ($poll_device['sysLocation'] == "not set")
foreach(Array('sysLocation', 'sysContact') as $elem)
{
$poll_device['sysLocation'] = "";
if ($poll_device[$elem] == "not set")
{
$poll_device[$elem] = "";
}
}
if ($poll_device['sysContact'] == "not set")
// Save results of various polled values to the database
foreach(Array('sysContact', 'sysObjectID', 'sysName', 'sysDescr') as $elem)
{
$poll_device['sysContact'] = "";
if ($poll_device[$elem] && $poll_device[$elem] != $device[$elem])
{
$update_array[$elem] = $poll_device[$elem];
log_event("$elem -> ".$poll_device[$elem], $device, 'system');
}
if ($poll_device['sysContact'] && $poll_device['sysContact'] != $device['sysContact'])
{
$update_array['sysContact'] = $poll_device['sysContact'];
log_event("Contact -> ".$poll_device['sysContact'], $device, 'system');
}
if ($poll_device['sysObjectID'] && $poll_device['sysObjectID'] != $device['sysObjectID'])
{
$update_array['sysObjectID'] = $poll_device['sysObjectID'];
log_event("ObjectID -> ".$poll_device['sysObjectID'], $device, 'system');
}
if ($poll_device['sysName'] && $poll_device['sysName'] != $device['sysName'])
{
$update_array['sysName'] = $poll_device['sysName'];
log_event("sysName -> ".$poll_device['sysName'], $device, 'system');
}
if ($poll_device['sysDescr'] && $poll_device['sysDescr'] != $device['sysDescr'])
{
$update_array['sysDescr'] = $poll_device['sysDescr'];
log_event("sysDescr -> ".$poll_device['sysDescr'], $device, 'system');
}
if ($poll_device['sysLocation'] && $device['location'] != $poll_device['sysLocation'])