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

Minor fixes, group and review while exceeded license

Browse Source
This commit is contained in:
fbsanchez 2020-04-06 11:04:53 +02:00
parent 79378994b4
commit 72f026f152
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/godmode/wizards/HostDevices.class.php
View File

@ -466,7 +466,7 @@ class HostDevices extends Wizard
} }
$id_network_profile = get_parameter('id_network_profile', []); $id_network_profile = get_parameter('id_network_profile', []);
$review_results = get_parameter_switch('review_results'); $review_results = get_parameter_switch('review_results', -1);
$auto_monitor = get_parameter_switch('auto_monitor'); $auto_monitor = get_parameter_switch('auto_monitor');
$autoconf_enabled = get_parameter_switch( $autoconf_enabled = get_parameter_switch(
'autoconfiguration_enabled' 'autoconfiguration_enabled'
@ -504,6 +504,11 @@ class HostDevices extends Wizard
); );
} }
if ($review_results < 0) {
// License limited, force review.
$this->task['review_mode'] = DISCOVERY_REVIEW;
}
if ($review_results) { if ($review_results) {
if ($this->task['review_mode'] != DISCOVERY_RESULTS) { if ($this->task['review_mode'] != DISCOVERY_RESULTS) {
$this->task['review_mode'] = DISCOVERY_REVIEW; $this->task['review_mode'] = DISCOVERY_REVIEW;

2
pandora_server/lib/PandoraFMS/DiscoveryServer.pm
View File

@ -1016,7 +1016,7 @@ sub PandoraFMS::Recon::Base::report_scanned_agents($;$) {
# Agent creation. # Agent creation.
$agent_id = pandora_create_agent( $agent_id = pandora_create_agent(
$self->{'pa_config'}, $self->{'servername'}, $data->{'agent'}{'nombre'}, $self->{'pa_config'}, $self->{'servername'}, $data->{'agent'}{'nombre'},
$data->{'agent'}{'direccion'}, $self->{'task_data'}{'group_id'}, $parent_id, $data->{'agent'}{'direccion'}, $self->{'task_data'}{'id_group'}, $parent_id,
$os_id, $data->{'agent'}->{'description'}, $os_id, $data->{'agent'}->{'description'},
$data->{'agent'}{'interval'}, $self->{'dbh'}, $data->{'agent'}{'interval'}, $self->{'dbh'},
$data->{'agent'}{'timezone_offset'} $data->{'agent'}{'timezone_offset'}