WebApps/Observium_CE
1
0
Fork 0
Code Pull Requests Activity

commit version 22.12.12447

Browse Source
This commit is contained in:
Chris Hammer
2023-01-01 22:36:12 -05:00
parent af1b03d79f
commit b948283a96
744 changed files with 620715 additions and 27381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/housekeeping/ports.inc.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage housekeeping
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2022 Observium Limited
*
*/
@ -17,7 +17,7 @@ if ($cutoff) {
// Prevent delete billed ports
if ($bill_ports = dbFetchColumn('SELECT `entity_id` FROM `bill_entities` WHERE `entity_type` = ?', [ 'port' ])) {
$where .= generate_query_values($bill_ports, 'port_id', '!=');
$where .= generate_query_values_and($bill_ports, 'port_id', '!=');
}
$ports = dbFetchRows("SELECT `port_id` FROM `ports` WHERE $where");

6
includes/housekeeping/staledb.inc.php
View File

@ -6,7 +6,7 @@
*
* @package observium
* @subpackage housekeeping
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2020 Observium Limited
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2022 Observium Limited
*
*/
@ -95,7 +95,7 @@ if (dbExist('autodiscovery', '`remote_device_id` IS NOT NULL AND `remote_device_
/*
* Probably not the best idea to remove user-generated configuration like this, this very occasionally seems to delete billing ports
*
$where = " WHERE " . generate_query_values([ 'bill', 'group' ], 'entity_type', '!=', FALSE); // Exclude pseudo-entities from permissions checks
$where = " WHERE " . generate_query_values_ng([ 'bill', 'group' ], 'entity_type', '!='); // Exclude pseudo-entities from permissions checks
foreach ($config['entity_tables'] as $table) {
$query = "SELECT DISTINCT `entity_type` FROM `$table` $where";
foreach (dbFetchColumn($query, NULL, $test) as $entity_type) {
@ -113,7 +113,7 @@ foreach ($config['entity_tables'] as $table) {
// Remove stale entries
print_debug("Database cleanup for table '$table': deleted $count '$entity_type' entities");
if (!$test) {
$table_status = dbDelete($table, "`entity_type` = ? ".generate_query_values($ids, 'entity_id'), [ $entity_type ]);
$table_status = dbDelete($table, "`entity_type` = ? ".generate_query_values_and($ids, 'entity_id'), [ $entity_type ]);
logfile("housekeeping.log", "Database cleanup for table '$table': deleted $count '$entity_type' entities");
}
} elseif ($prompt) {