Commit version 24.12.13800

This commit is contained in:
2025-01-06 17:35:06 -05:00
parent b7f6a79c2c
commit 55d9218816
6133 changed files with 4239740 additions and 1374287 deletions

View File

@ -4,30 +4,30 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage discovery
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @package observium
* @subpackage discovery
* @copyright (C) Adam Armstrong
*
*/
// Build array of radios in the database
foreach (dbFetchRows("SELECT * FROM `wifi_radios` WHERE `device_id` = ?", [ $device['device_id'] ]) as $radio) {
$GLOBALS['cache']['wifi_radios'][$radio['radio_ap']][$radio['radio_number']] = $radio;
foreach (dbFetchRows("SELECT * FROM `wifi_radios` WHERE `device_id` = ?", [$device['device_id']]) as $radio) {
$GLOBALS['cache']['wifi_radios'][$radio['radio_ap']][$radio['radio_number']] = $radio;
}
foreach (dbFetchRows("SELECT * FROM `wifi_wlans` WHERE `device_id` = ?", [ $device['device_id'] ]) as $wlan) {
$GLOBALS['cache']['wifi_wlans'][$wlan['wlan_index']] = $wlan;
foreach (dbFetchRows("SELECT * FROM `wifi_wlans` WHERE `device_id` = ?", [$device['device_id']]) as $wlan) {
$GLOBALS['cache']['wifi_wlans'][$wlan['wlan_index']] = $wlan;
}
foreach (dbFetchRows("SELECT * FROM `wifi_aps` WHERE `device_id` = ?", [ $device['device_id'] ]) as $ap) {
if (safe_empty($ap['ap_index'])) {
// Clean broken entries
dbDelete('wifi_aps', '`wifi_ap_id` = ?', [ $ap['wifi_ap_id'] ]);
//dbDelete('wifi_aps_members', '`wifi_ap_id` = ?', [ $ap['wifi_ap_id'] ]);
continue;
}
$GLOBALS['cache']['wifi_aps'][$ap['ap_index']] = $ap;
foreach (dbFetchRows("SELECT * FROM `wifi_aps` WHERE `device_id` = ?", [$device['device_id']]) as $ap) {
if (safe_empty($ap['ap_index'])) {
// Clean broken entries
dbDelete('wifi_aps', '`wifi_ap_id` = ?', [$ap['wifi_ap_id']]);
//dbDelete('wifi_aps_members', '`wifi_ap_id` = ?', [ $ap['wifi_ap_id'] ]);
continue;
}
$GLOBALS['cache']['wifi_aps'][$ap['ap_index']] = $ap;
}
// Include all discovery modules
@ -39,19 +39,19 @@ include($config['install_dir'] . '/includes/include-dir-mib.inc.php');
print_debug_vars($GLOBALS['valid']['wifi']);
if (safe_count($GLOBALS['cache']['wifi_aps']) || safe_count($GLOBALS['valid']['wifi']['aps'])) {
foreach ($GLOBALS['cache']['wifi_aps'] as $ap_index => $entry) {
if (!isset($GLOBALS['valid']['wifi']['aps'][$ap_index])) {
$wifi_ap_id = $entry['wifi_ap_id'];
if ($entry['deleted'] || safe_empty($ap_index)) {
echo("AP will delete AP:$ap_index with id:$wifi_ap_id");
dbDelete('wifi_aps', '`wifi_ap_id` = ?', [ $wifi_ap_id ]);
dbDelete('wifi_aps_members', '`wifi_ap_id` = ?', [ $wifi_ap_id ]);
} else {
//echo("AP don't exists in WLC anymore, but it's not marked to be deleted (considering Down): $ap_index with id:$wifi_ap_id\n");
dbUpdate([ 'deleted' => 1 ], 'wifi_aps', '`device_id` = ? AND `wifi_ap_id` = ?', [ $device['device_id'], $wifi_ap_id ]);
}
foreach ($GLOBALS['cache']['wifi_aps'] as $ap_index => $entry) {
if (!isset($GLOBALS['valid']['wifi']['aps'][$ap_index])) {
$wifi_ap_id = $entry['wifi_ap_id'];
if ($entry['deleted'] || safe_empty($ap_index)) {
echo("AP will delete AP:$ap_index with id:$wifi_ap_id");
dbDelete('wifi_aps', '`wifi_ap_id` = ?', [$wifi_ap_id]);
dbDelete('wifi_aps_members', '`wifi_ap_id` = ?', [$wifi_ap_id]);
} else {
//echo("AP don't exists in WLC anymore, but it's not marked to be deleted (considering Down): $ap_index with id:$wifi_ap_id\n");
dbUpdate(['deleted' => 1], 'wifi_aps', '`device_id` = ? AND `wifi_ap_id` = ?', [$device['device_id'], $wifi_ap_id]);
}
}
}
}
}
// FIXME - Actually write this code :)