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

@ -6,23 +6,26 @@
*
* @package observium
* @subpackage web
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2022 Observium Limited
* @copyright (C) Adam Armstrong
*
*/
/// SEARCH STATUS
$results = dbFetchRows("SELECT * FROM `status`
LEFT JOIN `devices` USING (`device_id`)
WHERE `status_descr` LIKE ? $query_permitted_device
ORDER BY `status_descr` LIMIT $query_limit", array($query_param));
$sql = "SELECT * FROM `status` LEFT JOIN `devices` USING (`device_id`)" .
generate_where_clause('`status_descr` LIKE ?', $GLOBALS['cache']['where']['devices_permitted']) .
" ORDER BY `status_descr` LIMIT $query_limit";
$results = dbFetchRows($sql, [ $query_param ]);
if (!safe_empty($results)) {
$max_len = 35;
foreach ($results as $result) {
$name = truncate($result['status_descr'], $max_len);
if (safe_empty($results)) {
return;
}
$max_len = 35;
foreach ($results as $result) {
$name = truncate($result['status_descr'], $max_len);
$device_name = truncate($result['hostname'], $max_len);
if ($result['hostname'] != $result['sysName'] && $result['sysName']) {
$device_name .= ' | ' . truncate($result['sysName'], $max_len);
$device_name .= ' | ' . truncate($result['sysName'], $max_len);
}
$descr = strlen($result['location']) ? escape_html($result['location']) . ' | ' : '';
$descr .= nicecase($result['entPhysicalClass']) . ' status';
@ -31,18 +34,15 @@ if (!safe_empty($results)) {
$tab_colour = '#194B7F'; // FIXME: This colour pulled from functions.inc.php humanize_device, maybe set it centrally in definitions?
$status_search_results[] = [
'url' => 'graphs/type=status_graph/id=' . $result['status_id'] . '/',
'name' => $name,
'colour' => $tab_colour,
'icon' => $config['icon']['status'],
'data' => [
'| ' . escape_html($device_name),
$descr ]
'url' => 'graphs/type=status_graph/id=' . $result['status_id'] . '/',
'name' => $name,
'colour' => $tab_colour,
'icon' => $config['icon']['status'],
'data' => ['| ' . escape_html($device_name), $descr]
];
}
$search_results['status'] = [ 'descr' => 'Status Indicators found', 'results' => $status_search_results ];
}
$search_results['status'] = [ 'descr' => 'Status Indicators found', 'results' => $status_search_results ];
// EOF