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

intentation to spaces (2) and minor fix

Browse Source
This commit is contained in:
fbsanchez 2020-03-18 10:28:50 +01:00
parent b860c49383
commit 6504fe49b5
3 changed files with 2182 additions and 2174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/javascript/pandora_taskList.js
View File

@ -50,7 +50,7 @@ function progress_task_list(id, title) {
if (!$elem.dialog("isOpen")) if (!$elem.dialog("isOpen"))
timeoutRef = setInterval(function() { timeoutRef = setInterval(function() {
xhr = fetchTaskList(id, handleFetchTaskList); xhr = fetchTaskList(id, handleFetchTaskList);
}, 300000); }, 3000);
xhr = fetchTaskList(id, handleFetchTaskList); xhr = fetchTaskList(id, handleFetchTaskList);
} }

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

@ -75,6 +75,9 @@ use constant {
DISCOVERY_CLOUD_AZURE_COMPUTE => 8, DISCOVERY_CLOUD_AZURE_COMPUTE => 8,
DISCOVERY_DEPLOY_AGENTS => 9, DISCOVERY_DEPLOY_AGENTS => 9,
DISCOVERY_APP_SAP => 10, DISCOVERY_APP_SAP => 10,
DISCOVERY_SEARCH => 0,
DISCOVERY_STANDARD => 1,
DISCOVERY_RESULTS => 2,
}; };
################################################################################ ################################################################################
@ -489,7 +492,7 @@ sub PandoraFMS::Recon::Base::report_scanned_agents($) {
my ($self) = @_; my ($self) = @_;
if(defined($self->{'task_data'}{'direct_report'}) if(defined($self->{'task_data'}{'direct_report'})
&& $self->{'task_data'}{'direct_report'} eq "2" && $self->{'task_data'}{'direct_report'} == DISCOVERY_RESULTS
) { ) {
# Load cache. # Load cache.
my @rows = get_db_rows( my @rows = get_db_rows(

7
pandora_server/lib/PandoraFMS/Recon/Base.pm
View File

@ -36,6 +36,9 @@ use constant {
DISCOVERY_CLOUD_AZURE_COMPUTE => 8, DISCOVERY_CLOUD_AZURE_COMPUTE => 8,
DISCOVERY_DEPLOY_AGENTS => 9, DISCOVERY_DEPLOY_AGENTS => 9,
DISCOVERY_APP_SAP => 10, DISCOVERY_APP_SAP => 10,
DISCOVERY_SEARCH => 0,
DISCOVERY_STANDARD => 1,
DISCOVERY_RESULTS => 2,
}; };
# $DEVNULL # $DEVNULL
@ -1804,9 +1807,11 @@ sub scan($) {
return $self->deploy_scan(); return $self->deploy_scan();
} }
} }
# XXX
print "Metodo: ".$self->{'task_data'}{'direct_report'}."\n";
if(defined($self->{'task_data'}{'direct_report'}) if(defined($self->{'task_data'}{'direct_report'})
&& $self->{'task_data'}{'direct_report'} eq "2" && $self->{'task_data'}{'direct_report'} == DISCOVERY_RESULTS
) { ) {
# Use Cached results. # Use Cached results.
return $self->call('report_scanned_agents'); return $self->call('report_scanned_agents');