From dfd5b5dd9bb162b1a5cf7ffef8455135ce758f31 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Thu, 29 Jun 2023 16:09:25 +0200 Subject: [PATCH 1/2] show server conf remote edition in at least one server element --- .../godmode/servers/servers.build_table.php | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index cce4e1e053..143f217c28 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -101,6 +101,14 @@ foreach ($servers as $server) { } } +//unset($servers[1]); +$ext = ''; + +// Check for any data-type server present in servers list. If none, enable server access for first server. +if (array_search('data', array_column($servers, 'type')) === false) { + $ext = '_server'; +} + foreach ($servers as $server) { $data = []; @@ -185,14 +193,12 @@ foreach ($servers as $server) { $data[7] = ui_print_timestamp($server['keepalive'], true); - - $ext = '_server'; - if ($server['type'] != 'data') { - $ext = ''; + if ($server['type'] === 'data') { + $ext = '_server'; } $safe_server_name = servers_get_name($server['id_server']); - if (($server['type'] == 'data' || $server['type'] == 'enterprise satellite')) { + if (($ext === '_server' || $server['type'] == 'enterprise satellite')) { if (servers_check_remote_config($safe_server_name.$ext) && enterprise_installed()) { $names_servers[$safe_server_name] = true; } else { @@ -253,8 +259,8 @@ foreach ($servers as $server) { ); $data[8] .= ''; - if (($names_servers[$safe_server_name] === true) && ($server['type'] === 'data' || $server['type'] === 'enterprise satellite')) { - $data[8] .= ''; + if ($ext === '_server' || $server['type'] === 'enterprise satellite') { + $data[8] .= ''; $data[8] .= html_print_image( 'images/agents@svg.svg', true, @@ -298,6 +304,8 @@ foreach ($servers as $server) { unset($data[8]); } + $ext = ''; + array_push($table->data, $data); } From 29f9b3b0f59bdd707fec0c86d0c022f0bb32ff7f Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Thu, 29 Jun 2023 16:13:47 +0200 Subject: [PATCH 2/2] show server conf remote edition in at least one server element --- pandora_console/godmode/servers/servers.build_table.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php index 143f217c28..2bc4f5217e 100644 --- a/pandora_console/godmode/servers/servers.build_table.php +++ b/pandora_console/godmode/servers/servers.build_table.php @@ -101,7 +101,6 @@ foreach ($servers as $server) { } } -//unset($servers[1]); $ext = ''; // Check for any data-type server present in servers list. If none, enable server access for first server. @@ -259,7 +258,7 @@ foreach ($servers as $server) { ); $data[8] .= ''; - if ($ext === '_server' || $server['type'] === 'enterprise satellite') { + if (($names_servers[$safe_server_name] === true) && ($ext === '_server' || $server['type'] === 'enterprise satellite')) { $data[8] .= ''; $data[8] .= html_print_image( 'images/agents@svg.svg',