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

Replace usages of array_combine() that match array_by_column() (#7863)

Browse Source 
Also, fix up some usages where just array_column() will do.
This commit is contained in:
Tony Murray
2017-12-06 02:19:29 -06:00
committed by Neil Lathwood
parent 8b97d01be6
commit cdf5b05934
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
includes/discovery/entity-state.inc.php
View File

@@ -31,13 +31,10 @@ $entPhysical = dbFetchRows(
if (!empty($entPhysical)) {
echo "\nEntity States: ";
$entPhysical = array_combine(
array_column($entPhysical, 'entPhysicalIndex'),
array_column($entPhysical, 'entPhysical_id')
);
$entPhysical = array_column($entPhysical, 'entPhysical_id', 'entPhysicalIndex');
$state_data = snmpwalk_group($device, 'entStateTable', 'ENTITY-STATE-MIB');
$db_states = dbFetchRows('SELECT * FROM entityState WHERE device_id=?', array($device['device_id']));
$db_states = array_combine(array_column($db_states, 'entPhysical_id'), $db_states);
$db_states = array_by_column($db_states, 'entPhysical_id');
foreach ($state_data as $index => $state) {
if (isset($entPhysical[$index])) {