Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio

pandora_agents/pc/pandora_agent

@@ -510,8 +510,6 @@ sub parse_conf_modules($) {
 			}
 		} elsif ($line =~ /^\s*module_crontab\s+(((\*|(\d+(-\d+){0,1}))\s*){5}).*$/) {
 			$module->{'cron'} = $1;
-		} elsif ($line =~ /^\s*module_cron_interval\s+(\d+).*$/) {
-			$module->{'cron_interval'} = $1;
 		} elsif ($line =~ /^\s*module_end\s*$/) {
 			next unless ($module->{'name'} ne '') and ($module->{'func'} != 0);
 

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.719-180226
+Version: 7.0NG.719-180228
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.719-180226"
+pandora_version="7.0NG.719-180228"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -30,6 +30,7 @@ use File::Basename;
 use File::Copy;
 use IO::Socket;
 use Sys::Syslog;
+use Time::Local;
 
 # Agent XML data
 my $Xml;
@@ -41,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.719';
-use constant AGENT_BUILD => '180226';
+use constant AGENT_BUILD => '180228';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
@@ -515,10 +516,11 @@ sub parse_conf_modules($) {
 				}
 			}
 		} elsif ($line =~ /^\s*module_crontab\s+(((\*|(\d+(-\d+){0,1}))\s*){5}).*$/) {
-			$module->{'cron'} = $1;
+			my $cron_text = $1;
-			chomp ($module->{'cron'});
+			chomp ($cron_text);
-		} elsif ($line =~ /^\s*module_cron_interval\s+(\d+).*$/) {
+			if (cron_check_syntax($cron_text)) {
-			$module->{'cron_interval'} = $1;
+				$module->{'cron'} = $cron_text;
+			}
 		} elsif ($line =~ /^\s*module_end\s*$/) {
 			
 			$module_begin = 0;
@@ -1632,8 +1634,8 @@ sub guess_os_version ($) {
 ################################################################################
 # Execute the given module.
 ################################################################################
-sub exec_module ($) {
+sub exec_module {
-	my $module = shift;
+	my ($module, $interval) = @_;
 
 	# Need something to execute
 	if ($module->{'func'} == 0) {
@@ -1648,7 +1650,7 @@ sub exec_module ($) {
 	}
 
 	# Check module cron
-	if (check_module_cron ($module) != 1) {
+	if (check_module_cron ($module, $interval) != 1) {
 		$ThreadSem->up () if (defined ($ThreadSem) && $Conf{'agent_threads'} > 1);
 		return;
 	}
@@ -2044,85 +2046,339 @@ sub evaluate_module_intensive_conditions ($$) {
 	return 1;
 }
 
+###############################################################################
+# Get the number of seconds left to the next execution of the given cron entry.
+###############################################################################
+sub cron_next_execution {
+	my ($cron, $interval) = @_;
+
+	# Check cron conf format
+	if ($cron !~ /^((\*|(\d+(-\d+){0,1}))\s*){5}$/) {
+		return $interval;
+	}
+
+	# Get day of the week and month from cron config
+	my ($mday, $wday) = (split (/\s/, $cron))[2, 4];
+
+	# Get current time and day of the week
+	my $cur_time = time();
+	my $cur_wday = (localtime ($cur_time))[6];
+
+	# Any day of the week
+	if ($wday eq '*') {
+		my $nex_time = cron_next_execution_date ($cron,  $cur_time, $interval);
+		return $nex_time - time();
+	}
+	# A range?
+	else {
+		$wday = cron_get_closest_in_range ($cur_wday, $wday);
+	}
+
+	# A specific day of the week
+	my $count = 0;
+	my $nex_time = $cur_time;
+	do {
+		$nex_time = cron_next_execution_date ($cron, $nex_time, $interval);
+		my $nex_time_wd = $nex_time;
+		my ($nex_mon, $nex_wday) = (localtime ($nex_time_wd))[4, 6];
+		my $nex_mon_wd;
+		do {
+			# Check the day of the week
+			if ($nex_wday == $wday) {
+				return $nex_time_wd - time();
+			}
+			
+			# Move to the next day of the month
+			$nex_time_wd += 86400;
+			($nex_mon_wd, $nex_wday) = (localtime ($nex_time_wd))[4, 6];
+		} while ($mday eq '*' && $nex_mon_wd == $nex_mon);
+		$count++;
+	} while ($count < 60);
+
+	# Something went wrong, default to 5 minutes
+	return $interval;
+}
+
+###############################################################################
+# Get the number of seconds left to the next execution of the given cron entry.
+###############################################################################
+sub cron_check_syntax ($) {
+	my ($cron) = @_;
+	
+	return 0 if !defined ($cron);
+	return ($cron =~ m/^(\d|\*|-)+ (\d|\*|-)+ (\d|\*|-)+ (\d|\*|-)+ (\d|\*|-)+$/);
+}
+
+###############################################################################
+# Get the next execution date for the given cron entry in seconds since epoch.
+###############################################################################
+sub cron_next_execution_date {
+	my ($cron, $cur_time, $interval) = @_;
+
+	# Get cron configuration
+	my ($min, $hour, $mday, $mon, $wday) = split (/\s/, $cron);
+
+	# Months start from 0
+	if($mon ne '*') {
+		my ($mon_down, $mon_up) = cron_get_interval ($mon);
+		if (defined($mon_up)) {
+			$mon = ($mon_down - 1) . "-" . ($mon_up - 1);
+		} else {
+			$mon = $mon_down - 1;
+		}
+	}
+
+	# Get current time
+	if (! defined ($cur_time)) {
+		$cur_time = time();
+	}
+	# Check if current time + interval is on cron too
+	my $nex_time = $cur_time + $interval;
+	my ($cur_min, $cur_hour, $cur_mday, $cur_mon, $cur_year) 
+		= (localtime ($nex_time))[1, 2, 3, 4, 5];
+	
+	my @cron_array = ($min, $hour, $mday, $mon);
+	my @curr_time_array = ($cur_min, $cur_hour, $cur_mday, $cur_mon);
+	return ($nex_time) if cron_is_in_cron(\@cron_array, \@curr_time_array) == 1;
+
+	# Get first next date candidate from next cron configuration
+	# Initialize some vars
+	my @nex_time_array = @curr_time_array;
+
+	# Update minutes
+	my ($min_down, undef) = cron_get_interval ($min);
+	$nex_time_array[0] = ($min_down eq '*') ? 0 : $min_down;
+
+	$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+	if ($nex_time >= $cur_time) {
+		return $nex_time if cron_is_in_cron(\@cron_array, \@nex_time_array);
+	}
+
+	# Check if next hour is in cron
+	$nex_time_array[1]++;
+	$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+
+	if ($nex_time == 0) {
+		#Update the month day if overflow
+		$nex_time_array[1] = 0;
+		$nex_time_array[2]++;
+		$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+		if ($nex_time == 0) {
+			#Update the month if overflow
+			$nex_time_array[2] = 1;
+			$nex_time_array[3]++;
+			$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+			if ($nex_time == 0) {
+				#Update the year if overflow
+				$cur_year++;
+				$nex_time_array[3] = 0;
+				$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+			}
+		}
+	}
+
+	#Check the hour
+	return $nex_time if cron_is_in_cron(\@cron_array, \@nex_time_array);
+
+	#Update the hour if fails
+	my ($hour_down, undef) = cron_get_interval ($hour);
+	$nex_time_array[1] = ($hour_down eq '*') ? 0 : $hour_down;
+
+	# When an overflow is passed check the hour update again
+	$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+	if ($nex_time >= $cur_time) {
+		return $nex_time if cron_is_in_cron(\@cron_array, \@nex_time_array);
+	}
+
+	# Check if next day is in cron
+	$nex_time_array[2]++;
+	$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+	if ($nex_time == 0) {
+		#Update the month if overflow
+		$nex_time_array[2] = 1;
+		$nex_time_array[3]++;
+		$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+		if ($nex_time == 0) {
+			#Update the year if overflow
+			$nex_time_array[3] = 0;
+			$cur_year++;
+			$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+		}
+	}
+
+	#Check the day
+	return $nex_time if cron_is_in_cron(\@cron_array, \@nex_time_array);
+
+	#Update the day if fails
+	my ($mday_down, undef) = cron_get_interval ($mday);
+	$nex_time_array[2] = ($mday_down eq '*') ? 1 : $mday_down;
+
+	# When an overflow is passed check the day update in the next execution
+	$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+	if ($nex_time >= $cur_time) {
+		return $nex_time if cron_is_in_cron(\@cron_array, \@nex_time_array);
+	}
+
+	# Check if next month is in cron
+	$nex_time_array[3]++;
+	$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+	if ($nex_time == 0) {
+		#Update the year if overflow
+		$nex_time_array[3] = 0;
+		$cur_year++;
+		$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+	}
+
+	#Check the month
+	return $nex_time if cron_is_in_cron(\@cron_array, \@nex_time_array);
+
+	#Update the month if fails
+	my ($mon_down, undef) = cron_get_interval ($mon);
+	$nex_time_array[3] = ($mon_down eq '*') ? 0 : $mon_down;
+
+	# When an overflow is passed check the month update in the next execution
+	$nex_time = cron_valid_date(@nex_time_array, $cur_year);
+	if ($nex_time >= $cur_time) {
+		return $nex_time if cron_is_in_cron(\@cron_array, \@nex_time_array);
+	}
+
+	#Update the year if fails
+	$nex_time = cron_valid_date(@nex_time_array, $cur_year + 1);
+
+	return $nex_time;
+}
+
+###############################################################################
+# Returns if a date is in a cron. Recursive.
+# Needs the cron like an array reference and
+# current time in cron format to works properly
+###############################################################################
+sub cron_is_in_cron {
+	my ($elems_cron, $elems_curr_time) = @_;
+
+	my @deref_elems_cron = @$elems_cron;
+	my @deref_elems_curr_time = @$elems_curr_time;
+	
+	my $elem_cron = shift(@deref_elems_cron);
+	my $elem_curr_time = shift (@deref_elems_curr_time);
+
+	#If there is no elements means that is in cron
+	return 1 unless (defined($elem_cron) || defined($elem_curr_time));
+
+	# Go to last element if current is a wild card
+	if ($elem_cron ne '*') {
+		my ($down, $up) = cron_get_interval($elem_cron);
+		# Check if there is no a range
+		return 0 if (!defined($up) && ($down != $elem_curr_time));
+		# Check if there is on the range
+		if (defined($up)) {
+			if ($down < $up) {
+				return 0 if ($elem_curr_time < $down || $elem_curr_time > $up);
+			} else {
+				return 0 if ($elem_curr_time > $down || $elem_curr_time < $up);
+			}
+		}
+	}
+	return cron_is_in_cron(\@deref_elems_cron, \@deref_elems_curr_time);
+}
+
+###############################################################################
+# Returns the interval of a cron element. If there is not a range,
+# returns an array with the first element in the first place of array
+# and the second place undefined.
+###############################################################################
+sub cron_get_interval {
+	my ($element) = @_;
+
+	# Not a range
+	if ($element !~ /(\d+)\-(\d+)/) {
+		return ($element, undef);
+	}
+	
+	return ($1, $2);
+}
+
+###############################################################################
+# Returns the closest number to the target inside the given range (including
+# the target itself).
+###############################################################################
+sub cron_get_closest_in_range ($$) {
+	my ($target, $range) = @_;
+
+	# Not a range
+	if ($range !~ /(\d+)\-(\d+)/) {
+		return $range;
+	}
+	
+	# Search the closes number to the target in the given range
+	my $range_start = $1;
+	my $range_end = $2;
+	
+	# Outside the range
+	if ($target <= $range_start || $target > $range_end) {
+		return $range_start;
+	}
+	
+	# Inside the range
+	return $target;
+}
+
+###############################################################################
+# Check if a date is valid to get timelocal
+###############################################################################
+sub cron_valid_date {
+	my ($min, $hour, $mday, $month, $year) = @_;
+	my $utime;
+	eval {
+		local $SIG{__DIE__} = sub {};
+		$utime = timelocal(0, $min, $hour, $mday, $month, $year);
+	};
+	if ($@) {
+		return 0;
+	}
+	return $utime;
+}
+
 ################################################################################
 # Checks the module's cron string. Returns 1 if the module should be run, 0 if
 # not.
 ################################################################################
-sub check_module_cron ($) {
+sub check_module_cron {
-	my $module = shift;
+	my ($module, $main_interval) = @_;
 	
 	# No cron string defined
 	return 1 unless ($module->{'cron'} ne '');
 
+	my $now = time();
+
 	# Check if the module was already executed
-	return 0 unless (time() >= $module->{'cron_utimestamp'});
+	return 0 unless ($now >= $module->{'cron_utimestamp'});
 
-	# Get cron configuration
+	my $interval = $main_interval * $module->{'interval'};
-	my @cron_params = split (/\s/, $module->{'cron'});
 
-	# Get current time
+	my $time_to_next_execution = cron_next_execution(
-	my $current_time = time();
+		$module->{'cron'},
-	my @time = localtime($current_time);
+		$interval
+	);
 
-	# Minutes, hours, day of the month, month and day of the week
+	$module->{'cron_utimestamp'} = $now + $time_to_next_execution;
-	my @time_params = @time[1, 2, 3, 4, 6];
+	$module->{'cron_interval'} = $time_to_next_execution;
-
-	# Fix month (localtime retuns 0..11 and we need 1..12)
-	$time_params[3] += 1;
 	
-	# Check cron parameters	
+	if ($Conf{'debug'} eq '1') {
-	for (my $i = 0; $i < 5; $i++) {
+		log_message ('debug', "Cron for module $module->{'name'} will be executed next time at timestamp: $module->{'cron_utimestamp'}.");
-		
-		# Wildcard
-		next if ($cron_params[$i] eq '*');
-		
-		# Get interval
-		my ($bottom, $top) = split (/-/, $cron_params[$i]);
-		$top = $bottom unless defined ($top);
-
-		# Check if next execution will overflow the cron (only minutes overflow)
-		# If overflow, execute the module
-		my $overflow_cron = 0;
-		if ($i == 0) {
-			my $start_cron_seconds = $bottom*60;
-			my $current_exec_seconds = $time_params[$i]*60;
-			my $next_exec_seconds = $time_params[$i]*60 + $module->{'interval'}*$Conf{'interval'};
-			if ($current_exec_seconds > $start_cron_seconds && $current_exec_seconds > $next_exec_seconds) {
-				$start_cron_seconds += 3600;
-			}
-			if (($current_exec_seconds <= $start_cron_seconds) && ($start_cron_seconds <= $next_exec_seconds)) {
-				$overflow_cron = 1
-			}
-		}
-		
-		# Check interval
-		if ($bottom <= $top) {
-			return 0 if (($time_params[$i] < $bottom || $time_params[$i] > $top) && !$overflow_cron);
-		} else {
-			return 0 if (($time_params[$i] < $bottom && $time_params[$i] > $top) && !$overflow_cron);
-		}
 	}
 
-	# Do not check in the next minute, hour, day or month.
+	# On first execution checking if cron is valid is required
-	my $offset = 0; 
+	return 1 unless ($module->{'cron_utimestamp'} == 0);
-	if ($module->{'cron_interval'} >= 0) {
-		$offset = $module->{'cron_interval'};
-	} elsif($cron_params[0] ne '*') {
-		# 1 minute
-		$offset = 60;
-	} elsif($cron_params[1] ne '*') {
-		# 1 hour
-		$offset = 3600;
-	} elsif($cron_params[2] ne '*' || $cron_params[4] ne '*') {
-		# 1 day
-		$offset = 86400;
-	} elsif($cron_params[3] ne '*') {
-		# 31 days
-		$offset = 2678400;
-	}
 
-	$module->{'cron_utimestamp'} = $current_time + $offset;
+	# Check if current timestamp is a valid cron date
-	return 1;
+	my $next_execution = cron_next_execution_date(
+		$module->{'cron'},
+		$now - $interval,
+		$interval
+	);
+	return 1 if ($next_execution == $now);
+	return 0;
 }
 
 ################################################################################
@@ -2222,8 +2478,9 @@ sub write_module_xml ($@) {
 	# Module Alert template
 	$Xml .= "	<alert_template>" . $module->{'alert_template'} . "</alert_template>\n" if (defined ($module->{'alert_template'}));
 	
-	# Module Alert template
+	# Module Crontab
 	$Xml .= "	<crontab>" . $module->{'cron'} . "</crontab>\n" if (defined ($module->{'cron'}) and ($module->{'cron'} ne ""));
+	$Xml .= "	<cron_interval>" . $module->{'cron_interval'} . "</cron_interval>\n" if (defined ($module->{'cron'}) and (defined ($module->{'cron_interval'})));
 
 	# FF threshold configuration
 	$Xml .= "	<min_ff_event_normal>" . $module->{'min_ff_event_normal'} . "</min_ff_event_normal>\n" if (defined ($module->{'min_ff_event_normal'}));
@@ -2461,7 +2718,6 @@ sub init_module ($) {
 	$module->{'conditions'} = [];
 	$module->{'cron'} = '';
 	$module->{'cron_utimestamp'} = 0;
-	$module->{'cron_interval'} = -1;
 	$module->{'precondition'} = [];
 	$module->{'is_intensive'} = 0;
 	$module->{'intensive_conditions'} = [];
@@ -2770,7 +3026,7 @@ while (1) {
 		# Execute the module in a separate thread
 		if (defined ($ThreadSem) && $Conf{'agent_threads'} > 1) {
 			$ThreadSem->down ();
-			my $thr = threads->create (\&exec_module, $module);
+			my $thr = threads->create (\&exec_module, $module, $Conf{'interval'});
 			if (! defined ($thr)) {
 				$ThreadSem->up ();
 			} else {
@@ -2778,7 +3034,7 @@ while (1) {
 			}
 		# Execute the module
 		} else {
-			exec_module($module);
+			exec_module($module, $Conf{'interval'});
 		}
 	}
 

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.719
-%define release     180226
+%define release     180228
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.719
-%define release     180226
+%define release     180228
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.719"
-PI_BUILD="180226"
+PI_BUILD="180228"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/Makefile.am

@@ -1,9 +1,9 @@
 bin_PROGRAMS = PandoraAgent
 if DEBUG 
-PandoraAgent_SOURCES = misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc modules/pandora_module_ping.cc modules/pandora_module_snmpget.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c misc/sha256.cc windows/wmi/disphelper.c ssh/libssh2/channel.c  ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc debug_new.cpp
+PandoraAgent_SOURCES = misc/cron.cc misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc modules/pandora_module_ping.cc modules/pandora_module_snmpget.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c misc/sha256.cc windows/wmi/disphelper.c ssh/libssh2/channel.c  ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc debug_new.cpp
 PandoraAgent_CXXFLAGS=-g -O0
 else
-PandoraAgent_SOURCES = misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_logchannel.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc modules/pandora_module_ping.cc modules/pandora_module_snmpget.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c misc/sha256.cc windows/wmi/disphelper.c ssh/libssh2/channel.c  ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc
+PandoraAgent_SOURCES = misc/cron.cc misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_logchannel.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc modules/pandora_module_ping.cc modules/pandora_module_snmpget.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c misc/sha256.cc windows/wmi/disphelper.c ssh/libssh2/channel.c  ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc
 PandoraAgent_CXXFLAGS=-O2
 endif
 

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{180226}
+{180228}
 
 ViewReadme
 {Yes}

pandora_agents/win32/misc/cron.cc

@@ -0,0 +1,414 @@
+/* Pandora cron manager for Win32.
+   
+   Copyright (C) 2018 Artica ST.
+   Written by Fermin Hernandez.
+  
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+  
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+#include <stdio.h>
+#include <string.h>
+#include <sstream>
+#include "cron.h"
+#include "../pandora.h"
+
+/**
+ * @brief Constructor of cron class
+ * 
+ * @param cron_string String with cron format (https://en.wikipedia.org/wiki/Cron)
+ */
+Cron::Cron (string cron_string) {
+	char cron_params[5][256], bottom[256], top[256];
+
+    // Check if cron string is the default or empty
+    if (
+        cron_string.compare(CRON_DEFAULT_STRING) == 0 ||
+        cron_string.compare("") == 0
+    ) {
+        this->isSet = false;
+		return;
+    }
+
+	// Parse the cron string
+	if (sscanf (cron_string.c_str (), "%255s %255s %255s %255s %255s", cron_params[0], cron_params[1], cron_params[2], cron_params[3], cron_params[4]) != 5) {
+		Pandora::pandoraDebug ("Invalid cron string: %s", cron_string.c_str ());
+        this->isSet = false;
+        this->cronString = CRON_DEFAULT_STRING;
+		return;
+	}
+
+    this->cronString = cron_string;
+	
+	// Fill the cron structure
+	this->utimestamp = 0;
+	this->cronInterval = 0;
+    this->isSet = true;
+    // Months in cron are from 1 to 12. For date, are required from 0 to 11.
+	for (int i = 0; i < 5; i++) {
+		
+		// Wildcard
+		if (cron_params[i][0] == '*') {
+			this->params[i][CRDOWN] = CR_WILDCARD_VALUE;
+			this->params[i][1] = CR_WILDCARD_VALUE;
+
+		// Interval
+		} else if (sscanf (cron_params[i], "%255[^-]-%255s", bottom, top) == 2) {
+            // Check if there is an interval with two equal values 
+            if (strcmp(bottom, top) == 0) {
+                this->params[i][CRDOWN] = (i != 3)
+                    ? atoi (cron_params[i])
+                    : atoi (cron_params[i]) - 1;
+                this->params[i][CRUP] = CR_WILDCARD_VALUE;    
+            } else {
+                this->params[i][CRDOWN] = (i != 3) ? atoi (bottom) : atoi (bottom) - 1;
+                this->params[i][CRUP] = (i != 3) ? atoi (top) : atoi (top) -1;
+            }
+		
+		// Single value
+		} else {
+			this->params[i][CRDOWN] = (i != 3)
+                ? atoi (cron_params[i])
+                : atoi (cron_params[i]) - 1;
+			this->params[i][CRUP] = CR_WILDCARD_VALUE;
+		}
+	}
+}
+
+/**
+ * @brief Getter of isSet property
+ * 
+ */
+bool Cron::getIsSet () { return this->isSet; }
+
+/**
+ * @brief Getter of cronString property
+ * 
+ */
+string Cron::getCronString() { return this->cronString; }
+
+/**
+ * @brief Getter of cronInterval property casting in string
+ *
+ */
+string Cron::getCronIntervalStr() {
+    stringstream ss;
+    ss << this->cronInterval;
+    return ss.str();
+}
+
+/**
+ * @brief Given a date, return if is inside a cron string or not
+ * 
+ * @param date Date to check
+ * @return true If is inside cron
+ * @return false If is outside cron
+ */
+bool Cron::isInCron(time_t date) {
+    struct tm * timeinfo = localtime(&date);
+
+    // Convert the tm struct to an array
+    int date_array[4] = {
+        timeinfo->tm_min,
+        timeinfo->tm_hour,
+        timeinfo->tm_mday,
+        timeinfo->tm_mon
+    };
+
+    // Check all positions faliures
+    for (int i = 0; i < 4; i++) {
+        if (!isBetweenParams(date_array[i], i)) return false;
+    }
+
+    // If no failures, date is inside cron.
+    return true;
+}
+
+/**
+ * @brief Check if a value is in a position of cron
+ * 
+ * @param value Value to check
+ * @param position Position in cron to make the check
+ * @return If position is in cron
+ */
+bool Cron::isBetweenParams(int value, int position) {
+    if (!isWildCard(position)) {
+        if (isSingleValue(position)) {
+            if (this->params[position][CRDOWN] != value) return false;
+        } else {
+            if (isNormalInterval(position)) {
+                if (
+                    value < this->params[position][CRDOWN] ||
+                    value > this->params[position][CRUP]
+                ) {
+                    return false;
+                }
+            } else {
+                if (
+                    value < this->params[position][CRDOWN] &&
+                    value > this->params[position][CRUP]
+                ) {
+                    return false;
+                }
+            }
+        }
+    }
+    return true;
+}
+
+/**
+ * @brief Check if a cron position is a wildcard
+ * 
+ * @param position Position inside the param array
+ * @return true if is a wildcard
+ */
+bool Cron::isWildCard(int position) {
+    return this->params[position][CRDOWN] == CR_WILDCARD_VALUE;
+}
+
+/**
+ * @brief Check if a cron position is a single value
+ * 
+ * @param position Position inside the param array
+ * @return true if is a single value
+ */
+bool Cron::isSingleValue(int position) {
+    return this->params[position][CRUP] == CR_WILDCARD_VALUE;
+}
+
+/**
+ * @brief Check if a cron position is an interval with down lower than up
+ * 
+ * @param position Position inside the param array
+ * @return true if is a normal interval
+ * @return false if is an inverse interval
+ */
+bool Cron::isNormalInterval (int position) {
+    // Wildcard and single value will be treated like normal interval
+    if (
+        this->params[position][CRDOWN] == CR_WILDCARD_VALUE ||
+        this->params[position][CRUP] == CR_WILDCARD_VALUE
+    ) {
+        return true;
+    }
+    return (this->params[position][CRUP] >= this->params[position][CRDOWN]);
+}
+
+/**
+ * @brief Get the reset value on a cron position
+ * 
+ * @param position 
+ * @return int Reset value
+ */
+int Cron::getResetValue (int position) {
+    int default_value = 0;
+    // Days start in 1
+    if (position == 2) default_value = 1;
+    return isWildCard(position)
+        ? default_value
+        : this->params[position][CRDOWN];
+}
+
+/**
+ * @brief Check if cron module should be executed at a given time
+ * 
+ * @param date 
+ * @return true if should execute
+ * @return false if should not execute
+ */
+bool Cron::shouldExecuteAt (time_t date) {
+    return this->utimestamp < date;
+}
+
+/**
+ * @brief Check if a module should be executed when utimestamp is not calculated yet
+ * 
+ * @param date Current date
+ * @return true It is not first time and current date fit in cron
+ * @return false Don't execute first time
+ */
+bool Cron::shouldExecuteAtFirst (time_t date) {
+
+    // Return true if it is not first
+    if (this->utimestamp != 0) return true;
+
+    // Check current date in cron
+    return isInCron(date);
+}
+
+/**
+ * @brief Update the cron utimestamp
+ * 
+ * @param date Timestamp "from" to update cron utimestamp
+ * @param interval Module interval
+ */
+void Cron::update (time_t date, int interval) {
+    time_t next_time = getNextExecutionFrom(date, interval);
+
+    // Check the day of the week
+    struct tm * timeinfo = localtime(&next_time);
+    int count = 0; // Avoid infinite loops
+    while ((!isBetweenParams(timeinfo->tm_wday, 4)) && (count++ < CR_MAX_ITERS)){
+        next_time = getNextExecutionFrom(next_time + CR_SECONDS_ONE_DAY, 0);
+        timeinfo = localtime(&next_time);
+    }
+    if (count >= CR_MAX_ITERS) {
+        Pandora::pandoraLog(
+            "Module with cron %s will be executed at timestamp: %d, but it can be incorrect",
+            this->cronString.c_str(),
+            this->utimestamp
+        );
+    }
+
+    // Security about values
+    if (next_time < date) {
+        this->utimestamp = date + interval;
+        this->cronInterval = interval;
+        Pandora::pandoraLog("Cron update fails in Module with cron %s", this->cronString.c_str());
+    }
+
+    // Save the data
+    this->utimestamp = next_time;
+    this->cronInterval = next_time - date;
+    Pandora::pandoraDebug(
+        "Module with cron %s will be executed at timestamp: %d.",
+        this->cronString.c_str(),
+        this->utimestamp
+    );
+    return;
+}
+
+/**
+ * @brief Get next execution date given a certain date.
+ * 
+ * @param date Date when start the search for a new date
+ * @param interval Module interval
+ * @return time_t Timestamp when module should be executed next time
+ * @remarks It does not look for day of the week
+ */
+time_t Cron::getNextExecutionFrom(time_t date, int interval) {
+    time_t nex_time = date + interval;
+    if (isInCron(nex_time)) {
+        return nex_time;
+    }
+
+    // Copy tm struct values to an empty struct to avoid conflicts
+    struct tm * timeinfo_first = localtime(&nex_time);
+    struct tm * timeinfo = new tm();
+    timeinfo->tm_sec = 0;
+    timeinfo->tm_min = timeinfo_first->tm_min;
+    timeinfo->tm_hour = timeinfo_first->tm_hour;
+    timeinfo->tm_mday = timeinfo_first->tm_mday;
+    timeinfo->tm_mon = timeinfo_first->tm_mon;
+    timeinfo->tm_year = timeinfo_first->tm_year;
+
+    // Update minutes
+    timeinfo->tm_min = getResetValue(0);
+    nex_time = mktime(timeinfo);
+    if (nex_time >= date && isInCron(nex_time)) {
+        return nex_time;
+    }
+
+    if (nex_time == CRINVALID_DATE) {
+        // Update the month day if overflow
+        timeinfo->tm_hour = 0;
+        timeinfo->tm_mday++;
+        nex_time = mktime(timeinfo);
+        if (nex_time == CRINVALID_DATE) {
+            // Update the month if overflow
+            timeinfo->tm_mday = 1;
+            timeinfo->tm_mon++;
+            nex_time = mktime(timeinfo);
+            if (nex_time == CRINVALID_DATE) {
+                // Update the year if overflow
+                timeinfo->tm_mon = 0;
+                timeinfo->tm_year++;
+                nex_time = mktime(timeinfo);
+            }
+        }
+    }
+
+    // Check the hour
+    if (isInCron(nex_time)) {
+        return nex_time;
+    }
+
+    // Update hour if fails
+    timeinfo->tm_hour = getResetValue(1);
+    
+    // When an overflow is passed check the hour update again
+    nex_time = mktime(timeinfo);
+    if (nex_time >= date && isInCron(nex_time)) {
+        return nex_time;
+    }
+
+    // Check if next day is in cron
+    timeinfo->tm_mday++;
+    nex_time = mktime(timeinfo);
+    if (nex_time == CRINVALID_DATE) {
+        // Update the month if overflow
+        timeinfo->tm_mday = 1;
+        timeinfo->tm_mon++;
+        nex_time = mktime(timeinfo);
+        if (nex_time == CRINVALID_DATE) {
+            // Update the year if overflow
+            timeinfo->tm_mon = 0;
+            timeinfo->tm_year++;
+            nex_time = mktime(timeinfo);
+        }
+    }
+
+    // Check the day
+    if (isInCron(nex_time)){
+        return nex_time;
+    }
+
+    // Update the day if fails
+    timeinfo->tm_mday = getResetValue(2);
+
+    // When an overflow is passed check the day update in the next execution
+    nex_time = mktime(timeinfo);
+    if (nex_time >= date && isInCron(nex_time)) {
+        return nex_time;
+    }
+
+    // Check if next month is in cron
+    timeinfo->tm_mon++;
+    nex_time = mktime(timeinfo);
+    if (nex_time == CRINVALID_DATE) {
+        // Update the year if overflow
+        timeinfo->tm_mon = 0;
+        timeinfo->tm_year++;
+        nex_time = mktime(timeinfo);
+    }
+
+    // Check the month
+    if (isInCron(nex_time)) {
+        return nex_time;
+    }
+
+    // Update the month if fails
+    timeinfo->tm_mon = getResetValue(3);
+
+    // When an overflow is passed check the month update in the next execution
+    nex_time = mktime(timeinfo);
+    if (nex_time >= date) {
+        return nex_time;
+    }
+
+    // Update the year if fails
+    timeinfo->tm_year++;
+    nex_time = mktime(timeinfo);
+
+    return nex_time;
+}

pandora_agents/win32/misc/cron.h

@@ -0,0 +1,81 @@
+/* Pandora cron manager for Win32.
+   
+   Copyright (C) 2018 Artica ST.
+   Written by Fermin Hernandez.
+  
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+  
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#ifndef _CRON_PANDORA_H_
+#define _CRON_PANDORA_H_
+
+#include <string>
+#include <ctime>
+#include <stdio.h>
+#include <time.h>
+
+using namespace std;
+
+const string CRON_DEFAULT_STRING = "* * * * *";
+const int CR_WILDCARD_VALUE = -1;
+const int CRDOWN = 0;
+const int CRUP = 1;
+const int CRINVALID_DATE = -1;
+const int CR_SECONDS_ONE_DAY = 86400;
+const int CR_MAX_ITERS = 60;
+
+class Cron {
+    private:
+        // Properties
+        time_t                  utimestamp;
+        /**
+        * @brief Stored cron values array
+        * 
+        * First index: minutes, hours, months, days, month
+        * Second index: bottom, top
+        * 
+        * Wildcard (*): Bottom and top are -1
+        * Single value: Bottom is set and top is -1
+        * Interval: Bottom and top are set
+        */
+        int                     params[5][2];
+        bool                    isSet;
+        string                  cronString;
+        time_t                  cronInterval;
+
+        // Methods
+        time_t                  getNextExecutionFrom(time_t date, int interval);
+        bool                    isInCron(time_t date);
+        bool                    isBetweenParams(int value, int position);
+        bool                    isWildCard(int position);
+        bool                    isSingleValue(int position);
+        bool                    isNormalInterval(int position);
+        int                     getResetValue(int position);
+
+    public:
+        // Constructor
+                                Cron(string cron_string);
+        // Getter & setters
+        bool                    getIsSet();
+        string                  getCronString();
+        string                  getCronIntervalStr();
+
+        // Other methods
+        void                    update(time_t date, int interval);
+        bool                    shouldExecuteAt(time_t date);
+        bool                    shouldExecuteAtFirst(time_t date);
+};
+
+#endif

pandora_agents/win32/modules/pandora_module.cc

@@ -740,10 +740,14 @@ Pandora_Module::getXml () {
 	}
 	
 	/* Module Crontab */
-	if (this->module_crontab != "") {
+	if (this->cron->getIsSet()) {
 		module_xml += "\t<crontab>";
-		module_xml += this->module_crontab;
+		module_xml += this->cron->getCronString();
 		module_xml += "</crontab>\n";
+
+		module_xml += "\t<cron_interval><![CDATA[";
+		module_xml += this->cron->getCronIntervalStr();
+		module_xml += "]]></cron_interval>\n";
 	}
 
     /* Write module data */
@@ -1565,156 +1569,29 @@ Pandora_Module::evaluateIntensiveConditions () {
  * 
  * @return 1 if the module should run, 0 if not.
  */
-int
+bool
-Pandora_Module::checkCron (int module_interval, int agent_interval) {
+Pandora_Module::checkCron (int interval) {
-	int i, time_params[5];
-	time_t current_time, offset;
-	struct tm *time_struct;
-	Cron *cron = this->cron;
 
-	// No cron
+	// Execute always if cron is not configured
-	if (cron == NULL) {
+	if (!this->cron->getIsSet()) return true;
-		return 1;
-	}
 
-	// Get current time
+	time_t now = time(NULL);
-	current_time = time (NULL);
+	if (!this->cron->shouldExecuteAt(now)) return false;
 
-	// Check if the module was already executed
+	// Check if should execute this module at first before update cron params
-	if (current_time <= cron->utimestamp) {
+	bool execute = this->cron->shouldExecuteAtFirst(now);
-		return 0;
-	}
-
-	// Break current time
-	time_struct = localtime(&current_time);
-	if (time_struct == NULL) {
-		return 1;
-	}
-
-	time_params[0] = time_struct->tm_min;
-	time_params[1] = time_struct->tm_hour;
-	time_params[2] = time_struct->tm_mday;
-	time_params[3] = time_struct->tm_mon;
-	time_params[4] = time_struct->tm_wday;
 	
-	// Fix month (localtime retuns 0..11 and we need 1..12)
+	this->cron->update(now, interval);
-	time_params[3] += 1;
-	
-	// Check cron parameters	
-	for (i = 0; i < 5; i++) {
-		
-		// Wildcard
-		if (cron->params[i][0] < 0) {
-			continue;
-		}
-		
-		// Check if next execution will overflow the cron (only minutes overflow)
-		// If overflow, execute the module
-		bool overflow_cron = false;
-		if (i == 0) {
-			int start_cron_seconds = cron->params[i][0]*60;
-			int current_exec_seconds = time_params[i]*60;
-			int next_exec_seconds = time_params[i]*60 + module_interval*agent_interval;
-			if (current_exec_seconds > start_cron_seconds && current_exec_seconds > next_exec_seconds) {
-				start_cron_seconds += 3600;
-			}
-			if ((current_exec_seconds <= start_cron_seconds) && (start_cron_seconds <= next_exec_seconds)) {
-				overflow_cron = true;
-			}
-		}
-		
-		// Check interval
-		if (cron->params[i][0] <= cron->params[i][1]) {
-			if ((time_params[i] < cron->params[i][0] || time_params[i] > cron->params[i][1]) && !overflow_cron) {
-				return 0;
-			}
-		} else {
-			if ((time_params[i] < cron->params[i][0] && time_params[i] > cron->params[i][1]) && !overflow_cron) {
-				return 0;
-			}
-		}
-	}
 
-	// Do not check in the next minute, hour, day or month.
+	return execute;
-	offset = 0; 
-	if (cron->interval >= 0) {
-		offset = cron->interval;
-	} else if(cron->params[0][0] >= 0) {
-		// 1 minute
-		offset = 60;
-	} else if(cron->params[1][0] >= 0) {
-		// 1 hour
-		offset = 3600;
-	} else if(cron->params[2][0] >=0 || cron->params[4][0] >= 0) {
-		// 1 day
-		offset = 86400;
-	} else if(cron->params[3][0] >= 0) {
-		// 31 days
-		offset = 2678400;
-	}
-
-	cron->utimestamp = current_time + offset;
-	return 1;
 }
 
 /** 
  * Sets the module cron from a string.
- * 
- * @return 1 if the module should run, 0 if not.
  */
 void
 Pandora_Module::setCron (string cron_string) {
-	int i, value;
+	this->cron = new Cron(cron_string);
-	char cron_params[5][256], bottom[256], top[256];
-	
-	/* Create the new cron if necessary */
-	if (this->cron == NULL) {
-		this->cron = new Cron ();
-	}
-	
-	/* Parse the cron string */
-	if (sscanf (cron_string.c_str (), "%255s %255s %255s %255s %255s", cron_params[0], cron_params[1], cron_params[2], cron_params[3], cron_params[4]) != 5) {
-		pandoraDebug ("Invalid cron string: %s", cron_string.c_str ());
-		return;
-	}
-	
-	/* Fill the cron structure */
-	this->cron->utimestamp = 0;
-	this->cron->interval = -1;
-	for (i = 0; i < 5; i++) {
-		
-		/* Wildcard */
-		if (cron_params[i][0] == '*') {
-			this->cron->params[i][0] = -1;
-
-		/* Interval */
-		} else if (sscanf (cron_params[i], "%255[^-]-%255s", bottom, top) == 2) {
-			value = atoi (bottom);
-			this->cron->params[i][0] = value;
-			value = atoi (top);
-			this->cron->params[i][1] = value;
-		
-		/* Single value */
-		} else {
-			value = atoi (cron_params[i]);
-			this->cron->params[i][0] = value;
-			this->cron->params[i][1] = value;
-		}
-	}	
-}
-
-/** 
- * Sets the interval of the module cron.
- * 
- * @param interval Module cron interval in seconds.
- */
-void
-Pandora_Module::setCronInterval (int interval) {
-	if (this->cron == NULL) {
-		this->cron = new Cron ();
-	}
-	
-	this->cron->interval = interval;
 }
 
 /** 

pandora_agents/win32/modules/pandora_module.h

@@ -22,6 +22,7 @@
 #define	__PANDORA_MODULE_H__
 
 #include "../pandora.h"
+#include "../misc/cron.h"
 #include "pandora_data.h"
 #include "boost/regex.h"
 #include <list>
@@ -108,15 +109,6 @@ namespace Pandora_Modules {
 		regex_t regexp;
 	} Condition;
 
-	/**
-	 * Defines the structure that holds the module cron.
-	 */
-	typedef struct {
-		time_t utimestamp;
-		int interval;
-		int params[5][2];
-	} Cron;
-
 	const string module_exec_str       = "module_exec";
 	const string module_proc_str       = "module_proc";
 	const string module_service_str    = "module_service";
@@ -298,9 +290,8 @@ namespace Pandora_Modules {
 		void		addIntensiveCondition    (string intensivecondition);
 		int 		evaluatePreconditions ();
 		void		evaluateConditions ();
-		int         checkCron (int module_interval, int agent_interval);
+		bool        checkCron (int interval);
 		void        setCron (string cron_string);
-		void        setCronInterval (int interval);
 		int         evaluateCondition (string string_value, double double_value, Condition *condition);
 		int         evaluateIntensiveConditions ();
 		int         hasOutput ();

pandora_agents/win32/modules/pandora_module_factory.cc

@@ -94,7 +94,6 @@ using namespace Pandora_Strutils;
 #define TOKEN_SAVE          ("module_save ")
 #define TOKEN_CONDITION     ("module_condition ")
 #define TOKEN_CRONTAB       ("module_crontab ")
-#define TOKEN_CRONINTERVAL  ("module_cron_interval ")
 #define TOKEN_PRECONDITION  ("module_precondition ")
 #define TOKEN_NOSEEKEOF     ("module_noseekeof ")
 #define TOKEN_PING          ("module_ping ")
@@ -168,7 +167,7 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 	string                 module_perfcounter, module_tcpcheck;
 	string                 module_port, module_timeout, module_regexp;
 	string                 module_plugin, module_save, module_condition, module_precondition;
-	string                 module_crontab, module_cron_interval, module_post_process;
+	string                 module_crontab, module_post_process;
 	string                 module_min_critical, module_max_critical, module_min_warning, module_max_warning;
 	string                 module_disabled, module_min_ff_event, module_noseekeof;
 	string                 module_ping, module_ping_count, module_ping_timeout;
@@ -222,7 +221,6 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 	module_save          = "";
 	module_condition     = "";
 	module_crontab       = "";
-	module_cron_interval = "";
 	module_post_process  = "";
 	module_precondition  = "";
 	module_min_critical  = "";
@@ -423,9 +421,6 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 		if (module_crontab == "") {
 			module_crontab = parseLine (line, TOKEN_CRONTAB);
 		}
-		if (module_cron_interval == "") {
-			module_cron_interval = parseLine (line, TOKEN_CRONINTERVAL);
-		}
 		if (module_noseekeof == "") {
 			module_noseekeof = parseLine (line, TOKEN_NOSEEKEOF);
 		}
@@ -904,13 +899,6 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 					}
 				}
 
-				if (module_cron_interval != "") {
-					pos_macro = module_cron_interval.find(macro_name);
-					if (pos_macro != string::npos){
-						module_cron_interval.replace(pos_macro, macro_name.size(), macro_value);
-					}
-				}
-
 				if (module_noseekeof != "") {
 					pos_macro = module_noseekeof.find(macro_name);
 					if (pos_macro != string::npos){
@@ -1319,14 +1307,7 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 	}
 
 	/* Module cron */
-	if (module_crontab != "") {
+	module->setCron (module_crontab);
-		module->setCron (module_crontab);
-		
-		/* Set the cron interval */
-		if (module_cron_interval != "") {
-			module->setCronInterval (atoi (module_cron_interval.c_str ()));
-		}
-	}
 
 	/* Plugins do not have a module type */
 	if (module_plugin == "") {

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.719(Build 180226)")
+#define PANDORA_VERSION ("7.0NG.719(Build 180228)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/pandora_windows_service.cc

@@ -1884,8 +1884,8 @@ Pandora_Windows_Service::pandora_run_broker (string config) {
 				continue;
 			}
 	
-			/* Check preconditions */			
+			/* Check cron */			
-			if (module->checkCron (module->getInterval (), atoi (conf->getValue ("interval").c_str())) == 0) {
+			if (!module->checkCron (module->getInterval () * atoi (conf->getValue ("interval").c_str()))) {
 				pandoraDebug ("Cron not matched for module %s", module->getName ().c_str ());
 				module->setNoOutput ();
 				this->broker_modules->goNext ();
@@ -2012,8 +2012,8 @@ Pandora_Windows_Service::pandora_run (int forced_run) {
 				continue;
 			}
 	
-			/* Check preconditions */			
+			/* Check cron */			
-			if (module->checkCron (module->getInterval (), atoi (conf->getValue ("interval").c_str())) == 0) {
+			if (!module->checkCron (module->getInterval () * atoi (conf->getValue ("interval").c_str()))) {
 				pandoraDebug ("Cron not matched for module %s", module->getName ().c_str ());
 				module->setNoOutput ();
 				this->modules->goNext ();

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.719(Build 180226))"
+      VALUE "ProductVersion", "(7.0NG.719(Build 180228))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.719-180226
+Version: 7.0NG.719-180228
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.719-180226"
+pandora_version="7.0NG.719-180228"
 
 package_pear=0
 package_pandora=1

pandora_console/extensions/agents_modules.php

@@ -585,245 +585,6 @@ function mainAgentsModules() {
 	else{
 		$pure_var = 0;
 	}
-	echo "
-		<style type='text/css'>
-			.rotate_text_module {
-				-ms-transform: rotate(270deg);
-				-webkit-transform: rotate(270deg);
-				-moz-transform: rotate(270deg);
-				-o-transform: rotate(270deg);
-				writing-mode: lr-tb;
-				white-space: nowrap;
-			}
-		</style>
-
-		<script type='text/javascript'>
-			$(document).ready(function () {
-				//Get max width of name of modules
-				max_width = 0;
-				$.each($('.th_class_module_r'), function (i, elem) {
-					id = $(elem).attr('id').replace('th_module_r_', '');
-					
-					width = $(\"#div_module_r_\" + id).width();
-					
-					if (max_width < width) {
-						max_width = width;
-					} 
-				});
-				
-				$.each($('.th_class_module_r'), function (i, elem) {
-					id = $(elem).attr('id').replace('th_module_r_', '');
-					$(\"#th_module_r_\" + id).height(($(\"#div_module_r_\" + id).width() + 10) + 'px');
-					
-					//$(\"#div_module_r_\" + id).css('margin-top', (max_width - $(\"#div_module_r_\" + id).width()) + 'px');
-					$(\"#div_module_r_\" + id).css('margin-top', (max_width - 20) + 'px');
-					$(\"#div_module_r_\" + id).show();
-				});
-
-				var refr =" . $refr . ";
-				var pure =" . $pure_var . ";
-				var href ='" . ui_get_url_refresh ($ignored_params) . "';
-					
-				if (pure) {
-					var startCountDown = function (duration, cb) {
-						$('div.vc-countdown').countdown('destroy');
-						if (!duration) return;
-						var t = new Date();
-						t.setTime(t.getTime() + duration * 1000);
-						$('div.vc-countdown').countdown({
-							until: t,
-							format: 'MS',
-							layout: '(%M%nn%M:%S%nn%S" .  __('Until refresh') . ") ',
-							alwaysExpire: true,
-							onExpiry: function () {
-								$('div.vc-countdown').countdown('destroy');
-								url = js_html_entity_decode( href ) + duration;
-								$(document).attr (\"location\", url);
-							}
-						});
-					}
-					
-					startCountDown(refr, false);
-					var controls = document.getElementById('vc-controls');
-					autoHideElement(controls, 1000);
-					
-					$('select#refresh').change(function (event) {
-						refr = Number.parseInt(event.target.value, 10);
-						startCountDown(refr, false);
-					});
-				}
-				else {
-					
-					var agentes_id = $(\"#id_agents2\").val();
-					var id_agentes = $.get(\"full_agents_id\");
-					if (agentes_id === null && id_agentes !== null) {
-						id_agentes = id_agentes.split(\";\")
-						id_agentes.forEach(function(element) {
-							$(\"#id_agents2 option[value=\"+ element +\"]\").attr(\"selected\",true);
-						});
-						
-						selection_agent_module();
-					}
-					
-					$('#refresh').change(function () {
-						$('#hidden-vc_refr').val($('#refresh option:selected').val());
-					});
-				}
-				
-				$(\"#group_id\").change (function () {
-					
-					jQuery.post (\"ajax.php\",
-						{\"page\" : \"operation/agentes/ver_agente\",
-							\"get_agents_group_json\" : 1,
-							\"id_group\" : this.value,
-							\"privilege\" : \"AW\",
-							\"keys_prefix\" : \"_\",
-							\"recursion\" : $('#checkbox-recursion').is(':checked')
-						},
-						function (data, status) {
-							$(\"#id_agents2\").html('');
-							$(\"#module\").html('');
-							jQuery.each (data, function (id, value) {
-								// Remove keys_prefix from the index
-								id = id.substring(1);
-								
-								option = $(\"<option></option>\")
-									.attr (\"value\", value[\"id_agente\"])
-									.html (value[\"alias\"]);
-								$(\"#id_agents\").append (option);
-								$(\"#id_agents2\").append (option);
-							});
-						},
-						\"json\"
-					);
-				});
-				
-				$(\"#checkbox-recursion\").change (function () {
-					jQuery.post (\"ajax.php\",
-						{\"page\" : \"operation/agentes/ver_agente\",
-							\"get_agents_group_json\" : 1,
-							\"id_group\" : 	$(\"#group_id\").val(),
-							\"privilege\" : \"AW\",
-							\"keys_prefix\" : \"_\",
-							\"recursion\" : $('#checkbox-recursion').is(':checked')
-						},
-						function (data, status) {
-							$(\"#id_agents2\").html('');
-							$(\"#module\").html('');
-							jQuery.each (data, function (id, value) {
-								// Remove keys_prefix from the index
-								id = id.substring(1);
-								
-								option = $(\"<option></option>\")
-									.attr (\"value\", value[\"id_agente\"])
-									.html (value[\"alias\"]);
-								$(\"#id_agents\").append (option);
-								$(\"#id_agents2\").append (option);
-							});
-						},
-						\"json\"
-					);
-				});
-				
-				$(\"#modulegroup\").change (function () {
-					jQuery.post (\"ajax.php\",
-						{\"page\" : \"operation/agentes/ver_agente\",
-							\"get_modules_group_json\" : 1,
-							\"id_module_group\" : this.value,
-							\"id_agents\" : $(\"#id_agents2\").val(),
-							\"selection\" : $(\"#selection_agent_module\").val()
-						},
-						function (data, status) {
-							$(\"#module\").html('');
-							if(data){
-								jQuery.each (data, function (id, value) {
-									option = $(\"<option></option>\")
-										.attr (\"value\", value[\"id_agente_modulo\"])
-										.html (value[\"nombre\"]);
-									$(\"#module\").append (option);
-								});
-							}
-						},
-						\"json\"
-					);
-				});
-
-				$(\"#id_agents2\").click (function(){
-					selection_agent_module();
-				});
-
-				$(\"#selection_agent_module\").change(function() {
-					jQuery.post (\"ajax.php\",
-						{\"page\" : \"operation/agentes/ver_agente\",
-							\"get_modules_group_json\" : 1,
-							\"id_module_group\" : $(\"#modulegroup\").val(),
-							\"id_agents\" : $(\"#id_agents2\").val(),
-							\"selection\" : $(\"#selection_agent_module\").val()
-						},
-						function (data, status) {
-							$(\"#module\").html('');
-							if(data){
-								jQuery.each (data, function (id, value) {
-									option = $(\"<option></option>\")
-										.attr (\"value\", value[\"id_agente_modulo\"])
-										.html (value[\"nombre\"]);
-									$(\"#module\").append (option);
-								});
-							}
-						},
-						\"json\"
-					);
-				});
-			});
-
-			function selection_agent_module() {
-				jQuery.post (\"ajax.php\",
-					{\"page\" : \"operation/agentes/ver_agente\",
-						\"get_modules_group_json\" : 1,
-						\"id_module_group\" : $(\"#modulegroup\").val(),
-						\"id_agents\" : $(\"#id_agents2\").val(),
-						\"selection\" : $(\"#selection_agent_module\").val()
-					},
-					function (data, status) {
-						$(\"#module\").html('');
-						if(data){
-							jQuery.each (data, function (id, value) {
-								option = $(\"<option></option>\")
-									.attr (\"value\", value[\"id_agente_modulo\"])
-									.html (value[\"nombre\"]);
-								$(\"#module\").append (option);
-							});
-							
-							var id_modules = $.get(\"full_modules_selected\");
-							if(id_modules !== null) {
-								id_modules = id_modules.split(\";\");
-								id_modules.forEach(function(element) {
-									$(\"#module option[value=\"+ element +\"]\").attr(\"selected\",true);
-								});
-							}
-						}
-					},
-					\"json\"
-				);
-			}
-
-			(function($) {  
-				$.get = function(key)   {  
-					key = key.replace(/[\[]/, '\\[');  
-					key = key.replace(/[\]]/, '\\]');  
-					var pattern = \"[\\?&]\" + key + \"=([^&#]*)\";  
-					var regex = new RegExp(pattern);  
-					var url = unescape(window.location.href);  
-					var results = regex.exec(url);  
-					if (results === null) {  
-						return null;  
-					} else {  
-						return results[1];  
-					}  
-				}  
-			})(jQuery);
-		</script>
-	";
 }
 
 extensions_add_operation_menu_option(__("Agents/Modules view"), 'estado', 'agents_modules/icon_menu.png', "v1r1","view");
@@ -831,4 +592,241 @@ extensions_add_main_function('mainAgentsModules');
 
 $ignored_params['refresh']='';
 
-?>
+?>
+<style type='text/css'>
+	.rotate_text_module {
+		-ms-transform: rotate(270deg);
+		-webkit-transform: rotate(270deg);
+		-moz-transform: rotate(270deg);
+		-o-transform: rotate(270deg);
+		writing-mode: lr-tb;
+		white-space: nowrap;
+	}
+</style>
+
+<script type='text/javascript'>
+	$(document).ready(function () {
+		//Get max width of name of modules
+		max_width = 0;
+		$.each($('.th_class_module_r'), function (i, elem) {
+			id = $(elem).attr('id').replace('th_module_r_', '');
+			
+			width = $("#div_module_r_" + id).width();
+			
+			if (max_width < width) {
+				max_width = width;
+			} 
+		});
+		
+		$.each($('.th_class_module_r'), function (i, elem) {
+			id = $(elem).attr('id').replace('th_module_r_', '');
+			$("#th_module_r_" + id).height(($("#div_module_r_" + id).width() + 10) + 'px');
+			
+			//$("#div_module_r_" + id).css('margin-top', (max_width - $("#div_module_r_" + id).width()) + 'px');
+			$("#div_module_r_" + id).css('margin-top', (max_width - 20) + 'px');
+			$("#div_module_r_" + id).show();
+		});
+
+		var refr =" . $refr . ";
+		var pure =" . $pure_var . ";
+		var href ='" . ui_get_url_refresh ($ignored_params) . "';
+			
+		if (pure) {
+			var startCountDown = function (duration, cb) {
+				$('div.vc-countdown').countdown('destroy');
+				if (!duration) return;
+				var t = new Date();
+				t.setTime(t.getTime() + duration * 1000);
+				$('div.vc-countdown').countdown({
+					until: t,
+					format: 'MS',
+					layout: '(%M%nn%M:%S%nn%S Until refresh)',
+					alwaysExpire: true,
+					onExpiry: function () {
+						$('div.vc-countdown').countdown('destroy');
+						url = js_html_entity_decode( href ) + duration;
+						$(document).attr ("location", url);
+					}
+				});
+			}
+			
+			startCountDown(refr, false);
+			var controls = document.getElementById('vc-controls');
+			autoHideElement(controls, 1000);
+			
+			$('select#refresh').change(function (event) {
+				refr = Number.parseInt(event.target.value, 10);
+				startCountDown(refr, false);
+			});
+		}
+		else {
+			
+			var agentes_id = $("#id_agents2").val();
+			var id_agentes = $.get("full_agents_id");
+			if (agentes_id === null && id_agentes !== null) {
+				id_agentes = id_agentes.split(";")
+				id_agentes.forEach(function(element) {
+					$("#id_agents2 option[value="+ element +"]").attr("selected",true);
+				});
+				
+				selection_agent_module();
+			}
+			
+			$('#refresh').change(function () {
+				$('#hidden-vc_refr').val($('#refresh option:selected').val());
+			});
+		}
+		
+		$("#group_id").change (function () {
+			jQuery.post ("ajax.php",
+				{"page" : "operation/agentes/ver_agente",
+					"get_agents_group_json" : 1,
+					"id_group" : this.value,
+					"privilege" : "AW",
+					"keys_prefix" : "_",
+					"recursion" : $('#checkbox-recursion').is(':checked')
+				},
+				function (data, status) {
+					$("#id_agents2").html('');
+					$("#module").html('');
+					jQuery.each (data, function (id, value) {
+						// Remove keys_prefix from the index
+						id = id.substring(1);
+						
+						option = $("<option></option>")
+							.attr ("value", value["id_agente"])
+							.html (value["alias"]);
+						$("#id_agents").append (option);
+						$("#id_agents2").append (option);
+					});
+				},
+				"json"
+			);
+		});
+		
+		$("#checkbox-recursion").change (function () {
+			jQuery.post ("ajax.php",
+				{"page" : "operation/agentes/ver_agente",
+					"get_agents_group_json" : 1,
+					"id_group" : 	$("#group_id").val(),
+					"privilege" : "AW",
+					"keys_prefix" : "_",
+					"recursion" : $('#checkbox-recursion').is(':checked')
+				},
+				function (data, status) {
+					$("#id_agents2").html('');
+					$("#module").html('');
+					jQuery.each (data, function (id, value) {
+						// Remove keys_prefix from the index
+						id = id.substring(1);
+						
+						option = $("<option></option>")
+							.attr ("value", value["id_agente"])
+							.html (value["alias"]);
+						$("#id_agents").append (option);
+						$("#id_agents2").append (option);
+					});
+				},
+				"json"
+			);
+		});
+		
+		$("#modulegroup").change (function () {
+			jQuery.post ("ajax.php",
+				{"page" : "operation/agentes/ver_agente",
+					"get_modules_group_json" : 1,
+					"id_module_group" : this.value,
+					"id_agents" : $("#id_agents2").val(),
+					"selection" : $("#selection_agent_module").val()
+				},
+				function (data, status) {
+					$("#module").html('');
+					if(data){
+						jQuery.each (data, function (id, value) {
+							option = $("<option></option>")
+								.attr ("value", value["id_agente_modulo"])
+								.html (value["nombre"]);
+							$("#module").append (option);
+						});
+					}
+				},
+				"json"
+			);
+		});
+
+		$("#id_agents2").click (function(){
+			selection_agent_module();
+		});
+
+		$("#selection_agent_module").change(function() {
+			jQuery.post ("ajax.php",
+				{"page" : "operation/agentes/ver_agente",
+					"get_modules_group_json" : 1,
+					"id_module_group" : $("#modulegroup").val(),
+					"id_agents" : $("#id_agents2").val(),
+					"selection" : $("#selection_agent_module").val()
+				},
+				function (data, status) {
+					$("#module").html('');
+					if(data){
+						jQuery.each (data, function (id, value) {
+							option = $("<option></option>")
+								.attr ("value", value["id_agente_modulo"])
+								.html (value["nombre"]);
+							$("#module").append (option);
+						});
+					}
+				},
+				"json"
+			);
+		});
+	});
+
+	function selection_agent_module() {
+		jQuery.post ("ajax.php",
+			{"page" : "operation/agentes/ver_agente",
+				"get_modules_group_json" : 1,
+				"id_module_group" : $("#modulegroup").val(),
+				"id_agents" : $("#id_agents2").val(),
+				"selection" : $("#selection_agent_module").val()
+			},
+			function (data, status) {
+				$("#module").html('');
+				if(data){
+					jQuery.each (data, function (id, value) {
+						option = $("<option></option>")
+							.attr ("value", value["id_agente_modulo"])
+							.html (value["nombre"]);
+						$("#module").append (option);
+					});
+					
+					var id_modules = $.get("full_modules_selected");
+					if(id_modules !== null) {
+						id_modules = id_modules.split(";");
+						id_modules.forEach(function(element) {
+							$("#module option[value="+ element +"]").attr("selected",true);
+						});
+					}
+				}
+			},
+			"json"
+		);
+	}
+
+	(function($) {  
+		$.get = function(key)   {  
+			key = key.replace(/[[]/, '[');  
+			key = key.replace(/[]]/, ']');  
+			var pattern = "[?&]" + key + "=([^&#]*)";  
+			var regex = new RegExp(pattern);  
+			var url = unescape(window.location.href);  
+			var results = regex.exec(url);  
+			if (results === null) {  
+				return null;  
+			} else {  
+				return results[1];  
+			}  
+		}  
+	})(jQuery);
+	
+</script>

pandora_console/godmode/agentes/configurar_agente.php

@@ -1183,6 +1183,9 @@ if ($update_module || $create_module) {
 	$mday_to = get_parameter('mday_to');
 	$month_to = get_parameter('month_to');
 	$wday_to = get_parameter('wday_to');
+	
+	$http_user =  get_parameter('http_user');
+	$http_pass =  get_parameter('http_pass');
 
 	if ($hour_to != "*") {
 		$hour_to = "-" . $hour_to;
@@ -1258,6 +1261,7 @@ if ($update_module || $create_module) {
 if ($update_module) {
 	$id_agent_module = (int) get_parameter ('id_agent_module');
 	
+	
 	$values = array (
 		'id_agente_modulo' => $id_agent_module,
 		'descripcion' => $description,
@@ -1320,6 +1324,27 @@ if ($update_module) {
 		'id_category' => $id_category,
 		'disabled_types_event' => addslashes($disabled_types_event),
 		'module_macros' => $module_macros);
+		
+		if($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33){
+			
+			$plugin_parameter_split = explode("
", $values['plugin_parameter']);
+			
+			$values['plugin_parameter'] = '';
+			
+			foreach ($plugin_parameter_split as $key => $value) {
+				
+				if($key == 1){
+					$values['plugin_parameter'] .= 'http_auth_user '.$http_user.'
';
+					$values['plugin_parameter'] .= 'http_auth_pass '.$http_pass.'
';
+					$values['plugin_parameter'] .= $value."
";
+				}
+				else{
+					$values['plugin_parameter'] .= $value."
";
+				}
+				
+			}
+			
+		}
 	
 	// In local modules, the interval is updated by agent
 	$module_kind = (int) get_parameter ('moduletype');
@@ -1397,6 +1422,7 @@ if ($update_module) {
 // MODULE INSERT
 // =================
 if ($create_module) {
+	
 	if (isset ($_POST["combo_snmp_oid"])) {
 		$combo_snmp_oid = get_parameter_post ("combo_snmp_oid");
 	}
@@ -1481,6 +1507,27 @@ if ($create_module) {
 		'disabled_types_event' => addslashes($disabled_types_event),
 		'module_macros' => $module_macros);
 	
+		if($id_module_type == 30 || $id_module_type == 31 || $id_module_type == 32 || $id_module_type == 33){
+			
+			$plugin_parameter_split = explode("
", $values['plugin_parameter']);
+			
+			$values['plugin_parameter'] = '';
+			
+			foreach ($plugin_parameter_split as $key => $value) {
+				
+				if($key == 1){
+					$values['plugin_parameter'] .= 'http_auth_user '.$http_user.'
';
+					$values['plugin_parameter'] .= 'http_auth_pass '.$http_pass.'
';
+					$values['plugin_parameter'] .= $value."
";
+				}
+				else{
+					$values['plugin_parameter'] .= $value."
";
+				}
+				
+			}
+			
+		}
+	
 	if ($prediction_module == 3 && $serialize_ops == '') {
 		$id_agent_module = false;
 	}

pandora_console/godmode/massive/massive_edit_modules.php

@@ -568,7 +568,7 @@ foreach ($targets2 as $t) {
 
 $table->data['edit6'][1] = html_print_select ($targets, 'id_export', '','', __('No change'), '', true, false, false);
 $table->data['edit6'][2] = __('Unit');
-$table->data['edit6'][3] =  html_print_extended_select_for_unit('unit','', '', '', '0', '15', true, false, false);
+$table->data['edit6'][3] =  html_print_extended_select_for_unit('unit','-1', '', '', '0', '15', true, false, false, false , 1);
 
 
 /* FF stands for Flip-flop */
@@ -640,6 +640,53 @@ $table->data['edit11'][3] = html_print_input_text(
 		'max_timeout', '', '', 5, 10, true) .  ' ' .
 	ui_print_help_tip (
 		__('Seconds that agent will wait for the execution of the module.'), true);
+		
+$table->data['edit16'][0] = __('Retries');
+$table->data['edit16'][1] = html_print_input_text ('max_retries', '', '', 5, 10, true) . ' ' .
+	ui_print_help_tip (
+	__('Number of retries that the module will attempt to run.'), true);
+	
+	
+	$table->data['edit22'][0] = __('Web checks').ui_print_help_icon ("web_checks", true);;
+	$table->data['edit22'][1] = '<textarea id="textarea_plugin_parameter" name="plugin_parameter" cols="65" rows="15"></textarea>';
+	
+$table->data['edit16'][2] = __('Port');
+$table->data['edit16'][3] = html_print_input_text ('tcp_port', '', '', 5, 20, true);
+
+$table->data['edit17'][0] = __('TCP send') . ' ' . ui_print_help_icon ("tcp_send", true);
+$table->data['edit17'][1] = html_print_textarea ('tcp_send', 2, 65, '', '', true);
+
+$table->data['edit17'][2] = __('TCP receive');
+$table->data['edit17'][3] = html_print_textarea ('tcp_rcv', 2, 65, '', '', true);
+
+$table->data['edit18'][0] = __('WMI query') . ui_print_help_icon ('wmiquery', true);
+$table->data['edit18'][1] = html_print_input_text ('snmp_oid', '', '', 35, 255, true);
+
+$table->data['edit18'][2] = __('Key string');
+$table->data['edit18'][3] = html_print_input_text ('snmp_community', '', '', 20, 60, true);
+	
+$table->data['edit19'][0] = __('Field number') . ui_print_help_icon ('wmifield', true);
+$table->data['edit19'][1] = html_print_input_text ('tcp_port', '', '', 5, 15, true);
+
+$table->data['edit20'][0] = __('Plugin') . ui_print_help_icon ('plugin_macros', true);
+$table->data['edit20'][1] = html_print_select_from_sql ('SELECT id, name FROM tplugin ORDER BY name',
+	'id_plugin', '', 'changePluginSelect();', __('None'), 0, true, false, false);
+	
+		
+	// Store the macros in base64 into a hidden control to move between pages
+	$table->data['edit21'][0] = html_print_input_hidden('macros',base64_encode($macros),true);
+
+	if (!empty($id_plugin)) {
+		$preload = db_get_sql ("SELECT description FROM tplugin WHERE id = $id_plugin");
+		$preload = io_safe_output ($preload);
+		$preload = str_replace ("\n", "<br>", $preload);
+	}
+	else {
+		$preload = "";
+	}
+
+	$table->data['edit21'][1] = '<span style="font-weight: normal;" id="plugin_description">'.$preload.'</span>';
+
 
 echo '<form method="post" ' .
 	'action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=edit_modules" ' .
@@ -667,6 +714,8 @@ else {
 }
 
 ?>
+<script type="text/javascript">flag_load_plugin_component = false;</script>
+<script type="text/javascript" src="include/javascript/pandora_modules.js"></script>
 
 <script type="text/javascript">
 /* <![CDATA[ */
@@ -739,6 +788,13 @@ $(document).ready (function () {
 			"tr#delete_table-edit12, " +
 			"tr#delete_table-edit13, " +
 			"tr#delete_table-edit14, " +
+			"tr#delete_table-edit16, " +
+			"tr#delete_table-edit17, " +
+			"tr#delete_table-edit18, " +
+			"tr#delete_table-edit19, " +
+			"tr#delete_table-edit20, " +
+			"tr#delete_table-edit21, " +
+			"tr#delete_table-edit22, " +
 			"tr#delete_table-edit15").hide ();
 		
 		var params = {
@@ -804,6 +860,13 @@ $(document).ready (function () {
 			"tr#delete_table-edit12, " +
 			"tr#delete_table-edit13, " +
 			"tr#delete_table-edit14, " +
+			"tr#delete_table-edit16, " +
+			"tr#delete_table-edit17, " +
+			"tr#delete_table-edit18, " +
+			"tr#delete_table-edit19, " +
+			"tr#delete_table-edit20, " +
+			"tr#delete_table-edit21, " +
+			"tr#delete_table-edit22, " +
 			"tr#delete_table-edit15").show ();
 		
 		switch($('#module_type').val()) {
@@ -892,6 +955,13 @@ $(document).ready (function () {
 			"tr#delete_table-edit12, " +
 			"tr#delete_table-edit13, " +
 			"tr#delete_table-edit14, " +
+			"tr#delete_table-edit16, " +
+			"tr#delete_table-edit17, " +
+			"tr#delete_table-edit18, " +
+			"tr#delete_table-edit19, " +
+			"tr#delete_table-edit20, " +
+			"tr#delete_table-edit21, " +
+			"tr#delete_table-edit22, " +
 			"tr#delete_table-edit15").hide ();
 		$('input[type=checkbox]').attr('checked', false);
 		$('input[type=checkbox]').attr('disabled', true);
@@ -941,6 +1011,13 @@ $(document).ready (function () {
 							"tr#delete_table-edit12, " +
 							"tr#delete_table-edit13, " +
 							"tr#delete_table-edit14, " +
+							"tr#delete_table-edit16, " +
+							"tr#delete_table-edit17, " +
+							"tr#delete_table-edit18, " +
+							"tr#delete_table-edit19, " +
+							"tr#delete_table-edit20, " +
+							"tr#delete_table-edit21, " +
+							"tr#delete_table-edit22, " +
 							"tr#delete_table-edit15").hide ();
 					}
 				}
@@ -984,6 +1061,13 @@ $(document).ready (function () {
 						"tr#delete_table-edit12, " +
 						"tr#delete_table-edit13, " +
 						"tr#delete_table-edit14, " +
+						"tr#delete_table-edit16, " +
+						"tr#delete_table-edit17, " +
+						"tr#delete_table-edit18, " +
+						"tr#delete_table-edit19, " +
+						"tr#delete_table-edit20, " +
+						"tr#delete_table-edit21, " +
+						"tr#delete_table-edit22, " +
 						"tr#delete_table-edit15").show ();
 				}
 				else {
@@ -1008,6 +1092,13 @@ $(document).ready (function () {
 							"tr#delete_table-edit12, " +
 							"tr#delete_table-edit13, " +
 							"tr#delete_table-edit14, " +
+							"tr#delete_table-edit16, " +
+							"tr#delete_table-edit17, " +
+							"tr#delete_table-edit18, " +
+							"tr#delete_table-edit19, " +
+							"tr#delete_table-edit20, " +
+							"tr#delete_table-edit21, " +
+							"tr#delete_table-edit22, " +
 							"tr#delete_table-edit15").hide ();
 					}
 				}
@@ -1091,6 +1182,13 @@ $(document).ready (function () {
 				"tr#delete_table-edit12, " +
 				"tr#delete_table-edit13, " +
 				"tr#delete_table-edit14, " +
+				"tr#delete_table-edit16, " +
+				"tr#delete_table-edit17, " +
+				"tr#delete_table-edit18, " +
+				"tr#delete_table-edit19, " +
+				"tr#delete_table-edit20, " +
+				"tr#delete_table-edit21, " +
+				"tr#delete_table-edit22, " +
 				"tr#delete_table-edit15").hide ();
 			
 			jQuery.post ("ajax.php",
@@ -1183,6 +1281,56 @@ $(document).ready (function () {
 	
 });
 
+function changePluginSelect() {
+		if (flag_load_plugin_component) {
+			flag_load_plugin_component = false;
+			
+			return;
+		}
+		
+		load_plugin_description($("#id_plugin").val());
+		
+		load_plugin_macros_fields_massive('simple-macro');
+		
+		forced_title_callback();
+	}
+	
+	function load_plugin_macros_fields_massive(row_model_id) {
+		// Get plugin macros when selected and load macros fields
+		var id_plugin = $('#id_plugin').val();
+		
+		var params = [];
+		params.push("page=include/ajax/module");
+		params.push("get_plugin_macros=1");
+		params.push("id_plugin=" + id_plugin);
+		
+		jQuery.ajax ({
+			data: params.join ("&"),
+			type: 'POST',
+			url: action = get_php_value('absolute_homeurl') + "ajax.php",
+			dataType: 'json',
+			success: function (data) {
+				// Delete all the macro fields
+				$('.macro_field').remove();
+				
+				if (data['array'] != null) {
+					$('#hidden-macros').val(data['base64']);
+					
+					jQuery.each (data['array'], function (i, macro) {
+						console.log(macro);
+						if (macro['desc'] != '') {
+							$("#delete_table-edit21").after("<tr class='macro_field' id='delete_table-edit"+(80+parseInt(i))+"'><td style='font-weight:bold;'>"+macro['desc']+"<input type='hidden' name='desc"+macro['macro']+"' value='"+macro['desc']+"'></td><td><input type='text' name='"+macro['macro']+"'></td></tr>");
+						}
+					});
+					//Plugin text can be larger
+					$(".macro_field").find(":input").attr("maxlength", 1023);
+					// Add again the hover event to the 'force_callback' elements
+					forced_title_callback();
+				}
+			}
+		});
+	}
+
 function disabled_status () {
 	if($('#dynamic_interval_select').val() != 0){
 		$('#text-min_warning').prop('readonly', true);
@@ -1221,7 +1369,7 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu
 	/* List of fields which can be updated */
 	$fields = array ('dynamic_interval', 'dynamic_max', 'dynamic_min', 'dynamic_two_tailed', 'min_warning', 'max_warning', 'str_warning',
 		'min_critical', 'max_critical', 'str_critical', 'min_ff_event',
-		'module_interval', 'disabled', 'post_process', 'unit',
+		'module_interval', 'disabled', 'post_process', 'unit_select',
 		'snmp_community','snmp_oid','tcp_send', 'custom_string_1',
 		'plugin_parameter', 'custom_string_2', 'custom_string_3', 'min',
 		'max', 'id_module_group', 'plugin_user', 'plugin_pass',
@@ -1231,13 +1379,71 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu
 		'id_category', 'disabled_types_event', 'ip_target', "custom_ip_target",
 		'descripcion', 'min_ff_event_normal', 'min_ff_event_warning',
 		'min_ff_event_critical', 'each_ff', 'module_ff_interval',
-		'ff_timeout', 'max_timeout');
+		'ff_timeout', 'max_timeout','tcp_port','max_retries','tcp_rcv','id_plugin');
 	$values = array ();
 	
 	foreach ($fields as $field) {
 		$value = get_parameter ($field, '');
 		
 		switch ($field) {
+			case 'id_plugin':
+				if ($value != 0) {
+				
+				$value_field_1 = get_parameter ('_field1_', '');
+				$value_field_1_desc = get_parameter ('desc_field1_', '');
+				
+				$value_field_2 = get_parameter ('_field2_', '');
+				$value_field_2_desc = get_parameter ('desc_field2_', '');
+				
+				$value_field_3 = get_parameter ('_field3_', '');
+				$value_field_3_desc = get_parameter ('desc_field3_', '');
+				
+				$value_field_4 = get_parameter ('_field4_', '');
+				$value_field_4_desc = get_parameter ('desc_field4_', '');
+				
+				$value_field_5 = get_parameter ('_field5_', '');
+				$value_field_5_desc = get_parameter ('desc_field5_', '');
+				
+				$values['macros'] = '{"1":{"macro":"_field1_","desc":"'.io_safe_input($value_field_1_desc).'","help":"'.io_safe_input($value_field_1_desc).'","value":"'.$value_field_1.'"}';
+				
+				if($value_field_2_desc != ''){
+				 $values['macros'] .= ',"2":{"macro":"_field2_","desc":"'.io_safe_input($value_field_2_desc).'","help":"'.io_safe_input($value_field_2_desc).'","value":"'.$value_field_2.'"}';
+				 
+				 if($value_field_3_desc != ''){
+					$values['macros'] .= ',"3":{"macro":"_field3_","desc":"'.io_safe_input($value_field_3_desc).'","help":"'.io_safe_input($value_field_3_desc).'","value":"'.$value_field_3.'"}';
+					
+					if($value_field_4_desc != ''){
+					 $values['macros'] .= ',"4":{"macro":"_field4_","desc":"'.io_safe_input($value_field_4_desc).'","help":"'.io_safe_input($value_field_4_desc).'","value":"'.$value_field_4.'"}';
+					 
+					 if($value_field_5_desc != ''){
+	 				 $values['macros'] .= ',"5":{"macro":"_field5_","desc":"'.io_safe_input($value_field_5_desc).'","help":"'.io_safe_input($value_field_5_desc).'","value":"'.$value_field_5.'"}';
+		 				}
+		 				else{
+		 					$values['macros'] .= '}';
+		 				}
+					 
+					}
+					else{
+						$values['macros'] .= '}';
+					}
+					
+				 }
+				 else{
+					 $values['macros'] .= '}';
+				 }
+				 
+				}
+				else{
+					$values['macros'] .= '}';
+				}
+				
+			
+				
+			}
+				
+				
+				
+				break;
 			case 'module_interval':
 				if ($value != 0) {
 					$values[$field] = $value;
@@ -1254,10 +1460,12 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu
 				}
 				break;
 			case 'unit_select':
-				if($value == "none"){
+				if($value != -1){
-					$values['unit'] = (string) get_parameter('unit_text');
+					if($value == "none"){
-				} else {
+						$values['unit'] = (string) get_parameter('unit_text');
-					$values['unit'] = $value;
+					} else {
+						$values['unit'] = $value;
+					}
 				}
 				break;
 			default:
@@ -1347,6 +1555,7 @@ function process_manage_edit ($module_name, $agents_select = null, $module_statu
 	}
 	
 	foreach ($modules as $module) {
+		
 		$result = modules_update_agent_module(
 			$module['id_agente_modulo'], $values, true, $update_tags);
 

pandora_console/godmode/reporting/graphs.php

@@ -161,7 +161,9 @@ if (!empty ($graphs)) {
 	$table->size[3] = '200px';
 	$table->align[2] = 'left';
 	$table->align[3] = 'left';
+	$op_column = false;
 	if ($report_w || $report_m) {
+		$op_column = true;
 		$table->align[4] = 'left';
 		$table->head[4] = __('Op.') .
 			html_print_checkbox('all_delete', 0, false, true, false,
@@ -193,6 +195,8 @@ if (!empty ($graphs)) {
 				.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
 					return false;">' . html_print_image("images/cross.png", true, array('alt' => __('Delete'), 'title' => __('Delete'))) . '</a>' .
 					html_print_checkbox_extended ('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete" style="margin-left:2px;"', true);
+		} else {
+			if($op_column) $data[4] = '';
 		}
 		
 		array_push ($table->data, $data);

pandora_console/godmode/reporting/reporting_builder.item_editor.php

@@ -370,21 +370,21 @@ switch ($action) {
 					break;
 				case 'sql_graph_pie':
 					$description = $item['description'];
-					$sql = $item['external_source'];
+					$sql_query_report = $item['external_source'];
 					$idCustom = $item['treport_custom_sql_id'];
 					$historical_db = $item['historical_db'];
 					$period = 0;
 					break;
 				case 'sql_graph_vbar':
 					$description = $item['description'];
-					$sql = $item['external_source'];
+					$sql_query_report = $item['external_source'];
 					$idCustom = $item['treport_custom_sql_id'];
 					$historical_db = $item['historical_db'];
 					$period = 0;
 					break;
 				case 'sql_graph_hbar':
 					$description = $item['description'];
-					$sql = $item['external_source'];
+					$sql_query_report = $item['external_source'];
 					$idCustom = $item['treport_custom_sql_id'];
 					$historical_db = $item['historical_db'];
 					$period = 0;

pandora_console/godmode/reporting/reporting_builder.php

@@ -596,10 +596,13 @@ switch ($action) {
 				$table->size[$next] = '15%';
 				
 				$next++;
-				if(!defined('METACONSOLE'))
+				$op_column = false;
+				if(!defined('METACONSOLE')) {
+					$op_column = true;
 					$table->head[$next] = '<span title="Operations">' .
 						__('Op.') . '</span>'.html_print_checkbox('all_delete', 0, false, true, false,
 							'check_all_checkboxes();');
+				}
 					
 				//$table->size = array ();
 				$table->size[$next] = '10%';
@@ -746,6 +749,8 @@ switch ($action) {
 						$data[$next] .= '</form>';
 						
 					}
+				} else {
+					if ($op_column) $data[$next] = '';
 				}
 				
 				array_push ($table->data, $data);

pandora_console/godmode/servers/plugin.php

@@ -892,7 +892,7 @@ ui_require_javascript_file('pandora_modules');
 		
 		// Delete macro
 		var delete_macro_click_event = function (event) {
-			delete_macro('table-form-plugin_');
+			delete_macro_form('table-form-plugin_');
 			update_preview();
 		}
 		$('div#delete_macro_button>a').click(delete_macro_click_event);

pandora_console/godmode/servers/recon_script.php

@@ -203,7 +203,7 @@ if (($create != "") OR ($view != "")) {
 		if($i <= 2) {
 			$delete_macro_style = 'display:none;';
 		}
-		$datam[2] = '<div id="delete_macro_button" style="'.$delete_macro_style.'">'.__('Delete macro').' <a href="javascript:delete_macro(\'table-form-recon_\');update_preview();">'.html_print_image('images/delete.png',true).'</a></div>';
+		$datam[2] = '<div id="delete_macro_button" style="'.$delete_macro_style.'">'.__('Delete macro').' <a href="javascript:delete_macro_form(\'table-form-recon_\');update_preview();">'.html_print_image('images/delete.png',true).'</a></div>';
 		
 		$table->colspan['recon_action'][0] = 2;
 		$table->rowstyle['recon_action'] = 'text-align:center';

pandora_console/include/config_process.php

@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC180226';
+$build_version = 'PC180228';
 $pandora_version = 'v7.0NG.719';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions_events.php

@@ -1981,6 +1981,11 @@ function events_get_response_target($event_id, $response_id, $server_id, $histor
 		$event_st = events_display_status($event['estado']);
 		$target = str_replace('_event_status_',	$event_st["title"],	$target);
 	}
+	if (strpos($target, '_group_custom_id_') !== false) {
+		$group_custom_id = db_get_value($dbh, "SELECT custom_id FROM tgrupo WHERE id_grupo=?", $event["id_grupo"]);
+		$event_st = events_display_status($event['estado']);
+		$target = str_replace('_group_custom_id_', $group_custom_id, $target);
+	}
 	// Parse the event custom data
 	if (!empty($event['custom_data'])){
 		$custom_data = json_decode (base64_decode ($event['custom_data']));

pandora_console/include/functions_menu.php

@@ -500,6 +500,7 @@ function menu_add_extras(&$menu) {
 	$menu_extra['eventos']['sub']['godmode/events/events']['text'] = __('Administration events');
 	
 	$menu_extra['reporting']['sub']['operation/reporting/reporting_viewer']['text'] = __('View reporting');
+	$menu_extra['reporting']['sub']['operation/reporting/graph_viewer']['text'] = __('Graph viewer');
 	
 	$menu_extra['reporting']['sub']['godmode/reporting/graph_builder']['text'] = __('Manage custom graphs');
 	$menu_extra['reporting']['sub']['godmode/reporting/graph_container']['text'] = __('View graph containers');

pandora_console/include/functions_reporting.php

@@ -2463,7 +2463,7 @@ function reporting_historical_data($report, $content) {
 									WHERE id_agente_modulo =' . $content['id_agent_module'] . '
 									 AND utimestamp >' . $date_limit . '
 									 AND utimestamp <=' . time()
-									);
+									, true);
 			break;
 		default:
 			$result = db_get_all_rows_sql 	(
@@ -2472,7 +2472,7 @@ function reporting_historical_data($report, $content) {
 									WHERE id_agente_modulo =' . $content['id_agent_module'] . '
 									 AND utimestamp >' . $date_limit . '
 									 AND utimestamp <=' . time()
-									);
+									, true);
 			break;
 	}
 	

pandora_console/include/functions_tags.php

@@ -975,10 +975,11 @@ function tags_has_user_acl_tags($id_user = false) {
  * 
  * @param string ID of the user (with false the user will be taked from config)
  * @param string Access flag where check what tags have the user
+ * @param bool returns 0 if the user has all the tags
  * 
  * @return string SQL condition for tagente_module
  */
-function tags_get_user_tags($id_user = false, $access = 'AR') {
+function tags_get_user_tags($id_user = false, $access = 'AR', $return_tag_any = false) {
 	global $config;
 	
 	//users_is_strict_acl
@@ -1036,7 +1037,11 @@ function tags_get_user_tags($id_user = false, $access = 'AR') {
 			return array();
 		}
 		else {
-			return $all_tags;
+			if($return_tag_any) {
+				return 0;
+			} else {
+				return $all_tags;
+			}
 		}
 	}
 	
@@ -1481,10 +1486,20 @@ function tags_checks_event_acl($id_user, $id_group, $access, $tags = array(), $c
 			}
 			$group_ids = implode(',', $childrens_ids);
 		}
+		$tag_conds = "";
+
+		if(!empty($tags_str)) {
+			$tag_conds = " AND (tags IN ('$tags_str') OR tags = '') ";
+		}
+		else {
+			$tag_conds = " AND tags = '' ";
+		}
+
 		$sql = "SELECT id_usuario FROM tusuario_perfil
-					WHERE id_usuario = '".$config["id_user"]."' AND tags IN ('$tags_str')
+			WHERE id_usuario = '".$config["id_user"]."' $tag_conds 
-					AND id_perfil IN (SELECT id_perfil FROM tperfil WHERE ".get_acl_column($access)."=1)
+			AND id_perfil IN (SELECT id_perfil FROM tperfil WHERE ".get_acl_column($access)."=1)
-					AND id_grupo IN ($group_ids)";
+			AND id_grupo IN ($group_ids)";
+
 		$has_perm = db_get_value_sql ($sql);
 		
 		if ($has_perm) {

pandora_console/include/functions_users.php

@@ -981,10 +981,19 @@ function users_check_users() {
 // user is admin or pandora manager and the group is all
 function users_can_manage_group_all($access = "PM") {
 	global $config;
+
+	$access = get_acl_column($access);
+
+	$sql = sprintf ('SELECT COUNT(*) FROM tusuario_perfil
+		INNER JOIN tperfil
+			ON tperfil.id_perfil = tusuario_perfil.id_perfil
+		WHERE tusuario_perfil.id_grupo=0
+			AND tusuario_perfil.id_usuario="%s"
+			AND %s=1
+		', $config['id_user'], $access
+	);
 	
-	$is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']);
+	if (users_is_admin($config['id_user']) || (int)db_get_value_sql($sql) !== 0) {
-	
-	if (check_acl ($config['id_user'], 0, $access, true) || $is_admin) {
 		return true;
 	}
 	

pandora_console/include/javascript/pandora_modules.js

@@ -497,7 +497,7 @@ function configure_modules_form () {
 
 
 // Functions to add and remove dynamic fields for macros
-function delete_macro(prefix) {
+function delete_macro_form(prefix) {
 	var next_number = parseInt($('#next_macro').html());
 	// Is not possible delete first macro
 	if (next_number == 3) {
@@ -930,4 +930,4 @@ function delete_macro (num) {
 	}
 	
 	// Do not decrease the macro counter or new macros may overlap existing ones!
-}
+}

pandora_console/install.php

@@ -71,7 +71,7 @@
 		<div style='height: 10px'>
 			<?php
 $version = '7.0NG.719';
-$build = '180226';
+$build = '180228';
 			$banner = "v$version Build $build";
 			
 			error_reporting(0);

pandora_console/operation/agentes/alerts_status.php

@@ -46,30 +46,37 @@ $offset_simple = (int) get_parameter_get ("offset_simple", 0);
 $id_group = (int) get_parameter ("ag_group", 0); //0 is the All group (selects all groups)
 $free_search = get_parameter("free_search", '');
 
-$user_tag_array = array_values(array_keys(tags_get_user_tags($config['id_user'])));
+$user_tag_array = tags_get_user_tags($config['id_user'],'AR', true);
-$user_tag = '';
 
-foreach ($user_tag_array as $key => $value) {
+if ($user_tag_array) {
-	if ($value === end($user_tag_array)) {
+	$user_tag_array = array_values(array_keys($user_tag_array));
-		$user_tag .= $value;
+	
-	 }
+	$user_tag = '';
-	 else{
-		$user_tag .= $value.',';
-	 }
-}
 
-$tag_filter = get_parameter("tag_filter", $user_tag);
+	foreach ($user_tag_array as $key => $value) {
-
+		if ($value === end($user_tag_array)) {
-$tag_param_validate = explode(',',$tag_filter);
+			$user_tag .= $value;
-
+		 }
-foreach ($tag_param_validate as $key => $value) {
+		 else{
-	if (!in_array($value,$user_tag_array)) {
+			$user_tag .= $value.',';
-		db_pandora_audit("ACL Violation", 
+		 }
-		"Trying to access Alert view");
-		require ("general/noaccess.php");
-		exit;
 	}
 	
+	$tag_filter = get_parameter("tag_filter", $user_tag);
+	
+	$tag_param_validate = explode(',',$tag_filter);
+
+	foreach ($tag_param_validate as $key => $value) {
+		if (!in_array($value,$user_tag_array)) {
+			db_pandora_audit("ACL Violation", 
+			"Trying to access Alert view");
+			require ("general/noaccess.php");
+			exit;
+		}
+	}
+	
+} else {
+	$tag_filter = get_parameter("tag_filter", 0);
 }
 
 if ($tag_filter) {

pandora_console/operation/agentes/estado_agente.php

@@ -186,7 +186,7 @@ if (isset($result_delete)) {
 		ui_print_error_message(__("There was an error message deleting the agent"));
 }
 
-echo '<form method="post" action="?sec=estado&sec2=operation/agentes/estado_agente&group_id=' . $group_id . '">';
+echo '<form method="post" action="?sec=view&sec2=operation/agentes/estado_agente&group_id=' . $group_id . '">';
 
 echo '<table cellpadding="4" cellspacing="4" class="databox filters" width="100%" style="font-weight: bold; margin-bottom: 10px;">';
 
@@ -533,35 +533,35 @@ $table->class = "databox data";
 
 $table->head = array ();
 $table->head[0] = __('Agent'). ' ' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=name&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
 $table->size[0] = "10%";
 
 $table->head[1] = __('Description'). ' ' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=description&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=description&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp, "alt" => "up"))  . '</a>' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=description&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=description&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown, "alt" => "down")) . '</a>';
 
 $table->size[1] = "16%";
 
 $table->head[10] = __('Remote'). ' ' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=remote&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectRemoteUp, "alt" => "up"))  . '</a>' .
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=remote&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectRemoteUp, "alt" => "up"))  . '</a>' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=remote&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectRemoteDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=remote&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectRemoteDown, "alt" => "down")) . '</a>';
 
 $table->size[10] = "9%";
 
 $table->head[2] = __('OS'). ' ' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=os&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp, "alt" => "up"))  . '</a>' .
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=os&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp, "alt" => "up"))  . '</a>' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=os&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=os&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown, "alt" => "down")) . '</a>';
 $table->size[2] = "8%";
 
 $table->head[3] = __('Interval'). ' ' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=interval&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectIntervalUp, "alt" => "up")) . '</a>' .
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=interval&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectIntervalUp, "alt" => "up")) . '</a>' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=interval&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectIntervalDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=interval&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectIntervalDown, "alt" => "down")) . '</a>';
 $table->size[3] = "10%";
 
 $table->head[4] = __('Group'). ' ' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=group&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp, "alt" => "up")) . '</a>' .
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=group&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp, "alt" => "up")) . '</a>' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=group&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=group&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown, "alt" => "down")) . '</a>';
 $table->size[4] = "8%";
 
 $table->head[5] = __('Type');
@@ -577,8 +577,8 @@ $table->head[8] = __('Alerts');
 $table->size[8] = "4%";
 
 $table->head[9] = __('Last contact'). ' ' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=last_contact&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=last_contact&amp;sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
-	'<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=last_contact&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
+	'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr=' . $refr . '&amp;offset=' . $offset . '&amp;group_id=' . $group_id . '&amp;recursion=' . $recursion . '&amp;search=' . $search . '&amp;status='. $status . '&amp;sort_field=last_contact&amp;sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
 $table->size[9] = "15%";
 
 $table->align = array ();

pandora_console/operation/agentes/ver_agente.php

@@ -162,7 +162,7 @@ if (is_ajax ()) {
 		
 		$groups = users_get_groups ($config["id_user"], "AW", false);
 		$group_id_list = ($groups ? join(",",array_keys($groups)):"0");
-
+		
 		$sql = 'SELECT DISTINCT(t1.alias) as name
 			FROM tagente t1, tagente_modulo t2
 			WHERE t1.id_agente = t2.id_agente
@@ -172,7 +172,7 @@ if (is_ajax ()) {
 		// Status selector
 		if ($status_modulo == AGENT_MODULE_STATUS_NORMAL) { //Normal
 			$sql_conditions .= ' estado = 0 AND utimestamp > 0)
-			OR (t1.id_tipo_modulo IN(21,22,23,100))) ';
+			OR (t2.id_tipo_modulo IN(21,22,23,100)) ';
 		}
 		elseif ($status_modulo == AGENT_MODULE_STATUS_CRITICAL_BAD) { //Critical
 			$sql_conditions .= ' estado = 1 AND utimestamp > 0 )';
@@ -188,11 +188,11 @@ if (is_ajax ()) {
 		}
 		elseif ($status_modulo == AGENT_MODULE_STATUS_NOT_INIT) { //Not init
 			$sql_conditions .= ' utimestamp = 0 )
-				AND t1.id_tipo_modulo NOT IN (21,22,23,100)';
+				AND t2.id_tipo_modulo NOT IN (21,22,23,100)';
 		}
 		
 		if ($status_modulo != -1) {
-			$filter .= ' AND t1.id_agente_modulo IN (SELECT id_agente_modulo FROM tagente_estado where ' . $sql_conditions;
+			$sql .= ' AND t2.id_agente_modulo IN (SELECT id_agente_modulo FROM tagente_estado where ' . $sql_conditions;
 		}
 		
 		if ($selection_mode == 'common') {
@@ -204,7 +204,7 @@ if (is_ajax ()) {
 		}
 
 		$sql .= ' ORDER BY t1.alias';
-
+		
 		$nameAgents = db_get_all_rows_sql($sql);
 		
 		if ($nameAgents == false)

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.719
-%define release     180226
+%define release     180228
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.719
-%define release     180226
+%define release     180228
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.719-180226
+Version: 7.0NG.719-180228
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.719-180226"
+pandora_version="7.0NG.719-180228"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -43,7 +43,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.719";
-my $pandora_build = "180226";
+my $pandora_build = "180228";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/DataServer.pm

@@ -611,7 +611,7 @@ sub process_module_data ($$$$$$$$$$) {
 	            'unknown_instructions' => '', 'tags' => '', 'critical_inverse' => 0, 'warning_inverse' => 0, 'quiet' => 0,
 				'module_ff_interval' => 0, 'alert_template' => '', 'crontab' =>	'', 'min_ff_event_normal' => 0,
 				'min_ff_event_warning' => 0, 'min_ff_event_critical' => 0, 'ff_timeout' => 0, 'each_ff' => 0, 'module_parent' => 0,
-				'module_parent_unlink' => 0};
+				'module_parent_unlink' => 0, 'cron_interval' => 0};
 	
 	# Other tags will be saved here
 	$module_conf->{'extended_info'} = '';
@@ -644,8 +644,12 @@ sub process_module_data ($$$$$$$$$$) {
 	delete $module_conf->{'name'};
 	
 	# Calculate the module interval in seconds
-	$module_conf->{'module_interval'} = 1 unless defined ($module_conf->{'module_interval'});
+	if (defined($module_conf->{'cron_interval'})) {
-	$module_conf->{'module_interval'} *= $interval if (defined ($module_conf->{'module_interval'}));
+		$module_conf->{'module_interval'} = 1 unless defined ($module_conf->{'module_interval'});
+		$module_conf->{'module_interval'} *= $interval if (defined ($module_conf->{'module_interval'}));
+	} else {
+		$module_conf->{'module_interval'} = $module_conf->{'cron_interval'};
+	}
 	
 	# Allow , as a decimal separator
 	$module_conf->{'post_process'} =~ s/,/./ if (defined ($module_conf->{'post_process'}));

pandora_server/lib/PandoraFMS/PluginServer.pm

@@ -300,7 +300,7 @@ sub data_consumer ($$) {
 	}
 
 	if (! defined $module_data || $module_data eq '') {
-		logger ($pa_config,"[ERROR] Undefined value returned by plug-in module " . $agent->{'nombre'} . " agent " . $agent->{'nombre'} . ". Is the server out of memory?" , 3);
+		logger ($pa_config,"[ERROR] Undefined value returned by plug-in module " . $module->{'nombre'} . " agent " . $agent->{'nombre'} . ". Is the server out of memory?" , 3);
 		pandora_update_module_on_error ($pa_config, $module, $dbh);
 		return;
 	}

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -31,7 +31,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.719";
-my $pandora_build = "180226";
+my $pandora_build = "180228";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.719
-%define release     180226
+%define release     180228
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.719
-%define release     180226
+%define release     180228
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.719"
-PI_BUILD="180226"
+PI_BUILD="180228"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.719 PS180226";
+my $version = "7.0NG.719 PS180228";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.719 PS180226";
+my $version = "7.0NG.719 PS180228";
 
 # save program name for logging
 my $progname = basename($0);