tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix visual errors not working servers pandora_enterprise#12178

Browse Source
This commit is contained in:
daniel 2024-02-12 10:34:43 +01:00
parent 639fbcc807
commit 45ffdb1cc5
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/general/header.php
View File

@ -54,7 +54,7 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
// ======= Servers List =============================================== // ======= Servers List ===============================================
if ((bool) check_acl($config['id_user'], 0, 'AW') !== false) { if ((bool) check_acl($config['id_user'], 0, 'AW') !== false) {
$servers = []; $servers = [];
$servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver'); $servers['all'] = (int) count((servers_get_info() ?? []));
if ($servers['all'] != 0) { if ($servers['all'] != 0) {
$servers['up'] = (int) servers_check_status(); $servers['up'] = (int) servers_check_status();
$servers['down'] = ($servers['all'] - $servers['up']); $servers['down'] = ($servers['all'] - $servers['up']);

38
pandora_console/include/class/ConsoleSupervisor.php
View File

@ -1510,17 +1510,35 @@ class ConsoleSupervisor
{ {
global $config; global $config;
$types_sql = '';
if (is_metaconsole() === true && isset($config['ndbh']) === false) {
$types_sql = sprintf(
' AND (
`server_type` = %d OR
`server_type` = %d OR
`server_type` = %d OR
`server_type` = %d
)',
SERVER_TYPE_AUTOPROVISION,
SERVER_TYPE_EVENT,
SERVER_TYPE_MIGRATION,
SERVER_TYPE_PREDICTION
);
}
$servers = db_get_all_rows_sql( $servers = db_get_all_rows_sql(
'SELECT sprintf(
id_server, 'SELECT id_server,
name, `name`,
server_type, server_type,
server_keepalive, server_keepalive,
status, `status`,
unix_timestamp() - unix_timestamp(keepalive) as downtime unix_timestamp() - unix_timestamp(keepalive) as downtime
FROM tserver FROM tserver
WHERE WHERE unix_timestamp() - unix_timestamp(keepalive) > server_keepalive
unix_timestamp() - unix_timestamp(keepalive) > server_keepalive' %s',
$types_sql
)
); );
if ($servers === false) { if ($servers === false) {

4
pandora_console/include/functions_reporting.php
View File

@ -12546,7 +12546,7 @@ function reporting_get_stats_indicators($data, $width=280, $height=20, $html=tru
$table_ind = html_get_predefined_table(); $table_ind = html_get_predefined_table();
$servers = []; $servers = [];
$servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver'); $servers['all'] = (int) count((servers_get_info() ?? []));
$servers['up'] = (int) servers_check_status(); $servers['up'] = (int) servers_check_status();
$servers['down'] = ($servers['all'] - $servers['up']); $servers['down'] = ($servers['all'] - $servers['up']);
if ($servers['all'] == 0) { if ($servers['all'] == 0) {
@ -12607,7 +12607,7 @@ function reporting_get_stats_indicators_mobile($data, $width=280, $height=20, $h
$table_ind = html_get_predefined_table(); $table_ind = html_get_predefined_table();
$servers = []; $servers = [];
$servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver'); $servers['all'] = (int) count((servers_get_info() ?? []));
$servers['up'] = (int) servers_check_status(); $servers['up'] = (int) servers_check_status();
$servers['down'] = ($servers['all'] - $servers['up']); $servers['down'] = ($servers['all'] - $servers['up']);
if ($servers['all'] == 0) { if ($servers['all'] == 0) {