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

Merge branch 'ent-9604-problemas-seccion-de-administrar-host-del-satellite-con-ignore_host-y-delete_host' into 'develop'

Browse Source 
Ent 9604 problemas seccion de administrar host del satellite con ignore host y delete host

See merge request artica/pandorafms!5173
This commit is contained in:
Daniel Rodriguez 2022-10-04 12:54:28 +00:00
commit 2ed0bb581a
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pandora_console/include/class/SatelliteAgent.class.php
View File

@ -304,8 +304,8 @@ class SatelliteAgent extends HTML
foreach ($this->satellite_config as $line) { foreach ($this->satellite_config as $line) {
$re = '/^#*add_host \b(\S+) (\S*)/m'; $re = '/^#*add_host \b(\S+) (\S*)/m';
$re_disable = '/^ignore_host \b(\S+) (\S*)/m'; $re_disable = '/^ignore_host \b(\S+)/m';
$re_delete = '/^delete_host \b(\S+) (\S*)/m'; $re_delete = '/^delete_host \b(\S+)/m';
if (preg_match($re, $line, $matches, PREG_OFFSET_CAPTURE, 0) > 0) { if (preg_match($re, $line, $matches, PREG_OFFSET_CAPTURE, 0) > 0) {
$agent['address'] = $matches[1][0]; $agent['address'] = $matches[1][0];
@ -321,12 +321,7 @@ class SatelliteAgent extends HTML
} }
if (preg_match($re_disable, $line, $matches, PREG_OFFSET_CAPTURE, 0) > 0) { if (preg_match($re_disable, $line, $matches, PREG_OFFSET_CAPTURE, 0) > 0) {
$agent['address'] = $matches[1][0]; $agent['name'] = $matches[1][0];
if (isset($matches[2][0]) === false || empty($matches[2][0]) === true) {
$agent['name'] = '';
} else {
$agent['name'] = $matches[2][0];
}
$agent['type'] = 'ignore_host'; $agent['type'] = 'ignore_host';
@ -334,12 +329,7 @@ class SatelliteAgent extends HTML
} }
if (preg_match($re_delete, $line, $matches, PREG_OFFSET_CAPTURE, 0) > 0) { if (preg_match($re_delete, $line, $matches, PREG_OFFSET_CAPTURE, 0) > 0) {
$agent['address'] = $matches[1][0]; $agent['name'] = $matches[1][0];
if (isset($matches[2][0]) === false || empty($matches[2][0]) === true) {
$agent['name'] = '';
} else {
$agent['name'] = $matches[2][0];
}
$agent['type'] = 'delete_host'; $agent['type'] = 'delete_host';
@ -732,7 +722,7 @@ class SatelliteAgent extends HTML
$this->satellite_config = $array_merge; $this->satellite_config = $array_merge;
// Remove ignore_host. // Remove ignore_host.
$pattern = io_safe_expreg('ignore_host '.$values['address'].' '.$values['name']); $pattern = io_safe_expreg('ignore_host '.$values['name']);
$pos = preg_grep('/'.$pattern.'/', $this->satellite_config); $pos = preg_grep('/'.$pattern.'/', $this->satellite_config);
$key_pos = 0; $key_pos = 0;
@ -750,7 +740,7 @@ class SatelliteAgent extends HTML
} else { } else {
$pos = preg_grep('/^\#INIT delete_host/', $this->satellite_config); $pos = preg_grep('/^\#INIT delete_host/', $this->satellite_config);
if (empty($pos) === false) { if (empty($pos) === false) {
$string_hosts = 'ignore_host '.$values['address'].' '.$values['name']."\n"; $string_hosts = 'ignore_host '.$values['name']."\n";
$key_pos = 0; $key_pos = 0;
foreach ($pos as $key => $value) { foreach ($pos as $key => $value) {
@ -802,7 +792,7 @@ class SatelliteAgent extends HTML
$this->satellite_config = $array_merge; $this->satellite_config = $array_merge;
// Remove delete_host. // Remove delete_host.
$pattern = io_safe_expreg('delete_host '.$values['address'].' '.$values['name']); $pattern = io_safe_expreg('delete_host '.$values['name']);
$pos = preg_grep('/'.$pattern.'/', $this->satellite_config); $pos = preg_grep('/'.$pattern.'/', $this->satellite_config);
$key_pos = 0; $key_pos = 0;
@ -830,7 +820,7 @@ class SatelliteAgent extends HTML
unset($this->satellite_config[$key_pos]); unset($this->satellite_config[$key_pos]);
} }
$string_hosts = 'delete_host '.$values['address'].' '.$values['name']."\n"; $string_hosts = 'delete_host '.$values['name']."\n";
$pos = preg_grep('/delete_host/', $this->satellite_config); $pos = preg_grep('/delete_host/', $this->satellite_config);
if (empty($pos) === false) { if (empty($pos) === false) {
$key_pos = array_keys($pos)[(count($pos) - 1)]; $key_pos = array_keys($pos)[(count($pos) - 1)];