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

#12341 agent basic options

Browse Source
This commit is contained in:
Jonathan 2023-11-28 12:52:27 +01:00
parent 30fd521cb7
commit c68bf25886
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/agentes/agent_manager.php
View File

@ -607,7 +607,7 @@ $tableBasicAgent->class = 'filter-table-adv';
$tableBasicAgent->data = []; $tableBasicAgent->data = [];
$disabledBasic = false; $disabledBasic = false;
$tableClassDisabled = ''; $tableClassDisabled = '';
if ($new_agent === true || $remote_agent === false) { if ($new_agent === true || $remote_agent === false || $has_remote_conf === false) {
$disabledBasic = true; $disabledBasic = true;
$tableClassDisabled = ' basic-options-disabled'; $tableClassDisabled = ' basic-options-disabled';
} }
@ -645,7 +645,7 @@ if (enterprise_installed()) {
unset($agent_plugin, $plugins); unset($agent_plugin, $plugins);
if (($new_agent === true && $config['current_package'] >= 774) || ($agent_version >= 774 && $new_agent === false)) { if (($new_agent === true && $config['current_package'] >= 774) || ($agent_version >= 774 && $new_agent === false)) {
if ($disabledBasic === true) { if ($disabledBasic === true || $has_remote_conf === false) {
$message = __('Remote config disabled, please activate to enable agent basic options'); $message = __('Remote config disabled, please activate to enable agent basic options');
$tableBasicAgent->data[] = '<span>'.$message.'</span>'; $tableBasicAgent->data[] = '<span>'.$message.'</span>';
} }

9
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -232,7 +232,7 @@ if ($create_agent) {
$cps = (int) get_parameter_switch('cps', -1); $cps = (int) get_parameter_switch('cps', -1);
$fixed_ip = (int) get_parameter_switch('fixed_ip', 0); $fixed_ip = (int) get_parameter_switch('fixed_ip', 0);
$vul_scan_enabled = (int) get_parameter_switch('vul_scan_enabled', 2); $vul_scan_enabled = (int) get_parameter_switch('vul_scan_enabled', 2);
$agent_version = $config['current_package'];
$secondary_groups = (array) get_parameter('secondary_groups_selected', ''); $secondary_groups = (array) get_parameter('secondary_groups_selected', '');
$fields = db_get_all_fields_in_table('tagent_custom_fields'); $fields = db_get_all_fields_in_table('tagent_custom_fields');
@ -300,6 +300,7 @@ if ($create_agent) {
'cps' => $cps, 'cps' => $cps,
'fixed_ip' => $fixed_ip, 'fixed_ip' => $fixed_ip,
'vul_scan_enabled' => $vul_scan_enabled, 'vul_scan_enabled' => $vul_scan_enabled,
'agent_version' => $agent_version,
] ]
); );
} else { } else {
@ -1354,7 +1355,11 @@ if ($id_agente) {
$satellite_server = (int) $agent['satellite_server']; $satellite_server = (int) $agent['satellite_server'];
$fixed_ip = (int) $agent['fixed_ip']; $fixed_ip = (int) $agent['fixed_ip'];
$vul_scan_enabled = (int) $agent['vul_scan_enabled']; $vul_scan_enabled = (int) $agent['vul_scan_enabled'];
$agent_version = (int) explode('.', explode('(', $agent['agent_version'])[0])[2]; if (strpos($agent['agent_version'], '(')) {
$agent_version = (int) explode('.', explode('(', $agent['agent_version'])[0])[2];
} else {
$agent_version = $agent['agent_version'];
}
} }
$update_module = (bool) get_parameter('update_module'); $update_module = (bool) get_parameter('update_module');