Merge branch 'develop' into 'ent-1175-copyright-actualizados'

# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.751-201214
+Version: 7.0NG.751-201223
 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.751-201214"
+pandora_version="7.0NG.751-201223"
 
 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

@@ -20,6 +20,977 @@ Version 6.0
 
 =cut
 
+=pod
+ This section is copied from PandoraFMS::Omnishell. Do not develop anything here
+ Go to Omnishell.pm to apply all fixes you need, and then copy entire library 
+ here to allow pandora_agent run from this single
+
+=cut
+BEGIN {
+	package PandoraFMS::Omnishell;
+	################################################################################
+	# Pandora FMS Omnishell common functions.
+	#
+	# (c) Fco de Borja Sánchez <fborja.sanchez@pandorafms.com>
+	#
+	################################################################################
+	use strict;
+	use warnings;
+
+	use File::Copy;
+	use Scalar::Util qw(looks_like_number);
+	use lib '/usr/lib/perl5';
+
+	################################################################################
+	# Erase blank spaces before and after the string
+	################################################################################
+	sub trim {
+		my $string = shift;
+		if (empty($string)){
+			return "";
+		}
+
+		$string =~ s/\r//g;
+
+		chomp($string);
+		$string =~ s/^\s+//g;
+		$string =~ s/\s+$//g;
+
+		return $string;
+	}
+
+	################################################################################
+	# Empty
+	################################################################################
+	sub empty {
+		my $str = shift;
+
+		if (!(defined($str)) ){
+			return 1;
+		}
+
+		if(looks_like_number($str)){
+			return 0;
+		}
+
+		if (ref($str) eq "ARRAY") {
+			return (($#{$str}<0)?1:0);
+		}
+
+		if (ref($str) eq "HASH") {
+			my @tmp = keys %{$str};
+			return (($#tmp<0)?1:0);
+		}
+
+		if ($str =~ /^\ *[\n\r]{0,2}\ *$/) {
+			return 1;
+		}
+		return 0;
+	}
+
+	################################################################################
+	# initialize plugin (advanced - hashed configuration)
+	################################################################################
+	sub init {
+		my $options = shift;
+		my $conf;
+
+		eval {
+			$conf = init_system($options);
+
+			if (defined($options->{lwp_enable})) {
+				if (empty($options->{lwp_timeout})) {
+					$options->{lwp_timeout} = 3;
+				}
+
+				$conf->{'__system'}->{ua} = LWP::UserAgent->new((keep_alive => "10"));
+				$conf->{'__system'}->{ua}->timeout($options->{lwp_timeout});
+				# Enable environmental proxy settings
+				$conf->{'__system'}->{ua}->env_proxy;
+				# Enable in-memory cookie management
+				$conf->{'__system'}->{ua}->cookie_jar( {} );
+				if ( defined($options->{ssl_verify}) && ( ($options->{ssl_verify} eq "no") || (!is_enabled($options->{ssl_verify})) ) ) {
+					# Disable verify host certificate (only needed for self-signed cert)
+					$conf->{'__system'}->{ua}->ssl_opts( 'verify_hostname' => 0 );
+					$conf->{'__system'}->{ua}->ssl_opts( 'SSL_verify_mode' => 0x00 );
+
+					# Disable library extra checks 
+					BEGIN {
+						$ENV{PERL_NET_HTTPS_SSL_SOCKET_CLASS} = "Net::SSL";
+						$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
+					}
+				}
+			}
+		};
+		if($@) {
+			# Failed
+			return {
+				error => $@
+			};
+		}
+
+		return $conf;
+	}
+
+	################################################################################
+	# initialize plugin (basic)
+	################################################################################
+	sub init_system {
+		my ($conf) = @_;
+
+		my %system;
+
+		if ($^O =~ /win/i ){
+			$system{devnull} = "NUL";
+			$system{cat}     = "type";
+			$system{os}      = "Windows";
+			$system{ps}      = "tasklist";
+			$system{grep}    = "findstr";
+			$system{echo}    = "echo";
+			$system{wcl}     = "wc -l";
+			$system{tmp}     = ".\\";
+			$system{cmdsep}  = "\&";
+		}
+		else {
+			$system{devnull} = "/dev/null";
+			$system{cat}     = "cat";
+			$system{os}      = "Linux";
+			$system{ps}      = "ps -eo pmem,pcpu,comm";
+			$system{grep}    = "grep";
+			$system{echo}    = "echo";
+			$system{wcl}     = "wc -l";
+			$system{tmp}     = "/tmp";
+			$system{cmdsep}  = ";";
+
+			if ($^O =~ /hpux/i) {
+				$system{os}      = "HPUX";
+				$system{ps}      = "ps -eo pmem,pcpu,comm";
+			}
+
+			if ($^O =~ /solaris/i ) {
+				$system{os}      = "solaris";
+				$system{ps}      = "ps -eo pmem,pcpu,comm";
+			}
+		}
+
+		$conf->{'__system'} = \%system;
+		return $conf;
+	}
+
+	################################################################################
+	## Reads a file and returns entire content or undef if error.
+	################################################################################
+	sub read_file {
+		my $path = shift;
+
+		my $_FILE;
+		if( !open($_FILE, "<", $path) ) {
+
+			# failed to open, return undef
+			return undef;
+		}
+
+		# Slurp configuration file content.
+		my $content = do { local $/; <$_FILE> };
+
+		# Close file
+		close($_FILE);
+
+		return $content;
+	}
+
+	################################################################################
+	# Mix hashses
+	################################################################################
+	sub merge_hashes {
+		my $_h1 = shift;
+		my $_h2 = shift;
+
+		if (ref($_h1) ne "HASH") {
+			return \%{$_h2} if (ref($_h2) eq "HASH");
+		}
+
+		if (ref($_h2) ne "HASH") {
+			return \%{$_h1} if (ref($_h1) eq "HASH");
+		}
+
+		if ((ref($_h1) ne "HASH") && (ref($_h2) ne "HASH")) {
+			return {};
+		}
+
+		my %ret = (%{$_h1}, %{$_h2});
+
+		return \%ret;
+	}
+
+	################################################################################
+	# is Enabled 
+	################################################################################
+	sub is_enabled {
+		my $value = shift;
+		
+		if ((defined ($value)) && looks_like_number($value) && ($value > 0)){
+			# return true
+			return 1;
+		}
+		#return false
+		return 0;
+
+	}
+
+	################################################################################
+	# Parses any configuration, from file (1st arg to program) or direct arguments 
+	#
+	# Custom evals are defined in an array reference of hash references:
+	# 
+	#   $custom_eval = [
+	#   	{
+	#   		'exp'    => 'regular expression to match',
+	#   		'target' => \&target_custom_method_to_parse_line
+	#   	},
+	#   	{
+	#   		'exp'    => 'another regular expression to search',
+	#   		'target' => \&target_custom_method_to_parse_line2
+	#   	},
+	#   ]
+	#
+	# Target is an user defined function wich will be invoked with following
+	# arguments:
+	# 
+	#  $config          : The configuration read to the point the regex matches
+	#  $exp             : The matching regex which fires this action
+	#  $line            : The complete line readed from the file
+	#  $file_pointer    : A pointer to the file which is being parsed.
+	#  $current_entity  : The current_entity (optional) when regex matches
+	#  
+	#  E.g.
+	#  
+	#  sub target_custom_method_to_parse_line {
+	#  	my ($config, $exp, $line, $file_pointer, $current_entity) = @_;
+	#  	
+	#  	if ($line =~ /$exp/) {
+	#  		$config->{'my_key'} = complex_operation_on_data($1,$2,$3);
+	#  	}
+	#  	
+	#  	return $config;
+	#  }
+	#
+	################################################################################
+	sub read_configuration {
+		my ($config, $separator, $custom_eval) = @_;
+
+		if ((!empty(@ARGV)) && (-f $ARGV[0])) {
+				$config = merge_hashes($config, parse_configuration(shift @ARGV, $separator, $custom_eval));
+		}
+		$config = merge_hashes($config, parse_arguments(\@ARGV));
+
+		if(is_enabled($config->{'as_agent_plugin'})) {
+			$config->{'as_server_plugin'} = 0 if (empty($config->{'as_server_plugin'}));
+		}
+		else {
+			$config->{'as_server_plugin'} = 1 if (empty($config->{'as_server_plugin'}));
+		}
+
+		if(is_enabled($config->{'as_server_plugin'})) {
+			$config->{'as_agent_plugin'} = 0 if (empty($config->{'as_agent_plugin'}));
+		}
+		else {
+			$config->{'as_agent_plugin'} = 1 if (empty($config->{'as_agent_plugin'}));
+		}
+
+		return $config;
+	}
+
+	my $YAML = 0;
+	# Dynamic load. Avoid unwanted behaviour.
+	eval {
+		eval 'require YAML::Tiny;1' or die('YAML::Tiny lib not found, commands feature won\'t be available');
+	};
+	if ($@) {
+		$YAML = 0;
+	} else {
+		$YAML = 1;
+	}
+
+	use lib '/usr/lib/perl5';
+
+	our @ISA = ("Exporter");
+	our %EXPORT_TAGS = ( 'all' => [ qw( ) ] );
+	our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+	our @EXPORT = qw();
+
+	# 2 to the power of 32.
+	use constant POW232 => 2**32;
+
+	################################################################################
+	# Return the MD5 checksum of the given string as a hex string.
+	# Pseudocode from: http://en.wikipedia.org/wiki/MD5#Pseudocode
+	################################################################################
+	my @S = (
+		7, 12, 17, 22,  7, 12, 17, 22,  7, 12, 17, 22,  7, 12, 17, 22,
+		5,  9, 14, 20,  5,  9, 14, 20,  5,  9, 14, 20,  5,  9, 14, 20,
+		4, 11, 16, 23,  4, 11, 16, 23,  4, 11, 16, 23,  4, 11, 16, 23,
+		6, 10, 15, 21,  6, 10, 15, 21,  6, 10, 15, 21,  6, 10, 15, 21
+	);
+	my @K = (
+		0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
+		0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
+		0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
+		0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
+		0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
+		0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
+		0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
+		0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
+		0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
+		0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
+		0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05,
+		0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
+		0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
+		0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
+		0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
+		0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391
+	);
+	sub md5 {
+		my $str = shift;
+
+		# No input!
+		if (!defined($str)) {
+			return "";
+		}
+
+		# Note: All variables are unsigned 32 bits and wrap modulo 2^32 when
+		# calculating.
+
+		# Initialize variables.
+		my $h0 = 0x67452301;
+		my $h1 = 0xEFCDAB89;
+		my $h2 = 0x98BADCFE;
+		my $h3 = 0x10325476;
+
+		# Pre-processing.
+		my $msg = unpack ("B*", pack ("A*", $str));
+		my $bit_len = length ($msg);
+
+		# Append "1" bit to message.
+		$msg .= '1';
+
+		# Append "0" bits until message length in bits ≡ 448 (mod 512).
+		$msg .= '0' while ((length ($msg) % 512) != 448);
+
+		# Append bit /* bit, not byte */ length of unpadded message as 64-bit
+		# little-endian integer to message.
+		$msg .= unpack ("B32", pack ("V", $bit_len));
+		$msg .= unpack ("B32", pack ("V", ($bit_len >> 16) >> 16));
+
+		# Process the message in successive 512-bit chunks.
+		for (my $i = 0; $i < length ($msg); $i += 512) {
+
+			my @w;
+			my $chunk = substr ($msg, $i, 512);
+
+			# Break chunk into sixteen 32-bit little-endian words w[i], 0 <= i <=
+			# 15.
+			for (my $j = 0; $j < length ($chunk); $j += 32) {
+				push (@w, unpack ("V", pack ("B32", substr ($chunk, $j, 32))));
+			}
+
+			# Initialize hash value for this chunk.
+			my $a = $h0;
+			my $b = $h1;
+			my $c = $h2;
+			my $d = $h3;
+			my $f;
+			my $g;
+
+			# Main loop.
+			for (my $y = 0; $y < 64; $y++) {
+				if ($y <= 15) {
+					$f = $d ^ ($b & ($c ^ $d));
+					$g = $y;
+				}
+				elsif ($y <= 31) {
+					$f = $c ^ ($d & ($b ^ $c));
+					$g = (5 * $y + 1) % 16;
+				}
+				elsif ($y <= 47) {
+					$f = $b ^ $c ^ $d;
+					$g = (3 * $y + 5) % 16;
+				}
+				else {
+					$f = $c ^ ($b | (0xFFFFFFFF & (~ $d)));
+					$g = (7 * $y) % 16;
+				}
+
+				my $temp = $d;
+				$d = $c;
+				$c = $b;
+				$b = ($b + leftrotate (($a + $f + $K[$y] + $w[$g]) % POW232, $S[$y])) % POW232;
+				$a = $temp;
+			}
+
+			# Add this chunk's hash to result so far.
+			$h0 = ($h0 + $a) % POW232;
+			$h1 = ($h1 + $b) % POW232;
+			$h2 = ($h2 + $c) % POW232;
+			$h3 = ($h3 + $d) % POW232;
+		}
+
+		# Digest := h0 append h1 append h2 append h3 #(expressed as little-endian)
+		return unpack ("H*", pack ("V", $h0)) .
+					unpack ("H*", pack ("V", $h1)) .
+					unpack ("H*", pack ("V", $h2)) .
+					unpack ("H*", pack ("V", $h3));
+	}
+
+	################################################################################
+	# MD5 leftrotate function. See: http://en.wikipedia.org/wiki/MD5#Pseudocode
+	################################################################################
+	sub leftrotate {
+		my ($x, $c) = @_;
+
+		return (0xFFFFFFFF & ($x << $c)) | ($x >> (32 - $c));
+	}
+
+	################################################################################
+	# return last error.
+	################################################################################
+	sub get_last_error {
+		my ($self) = @_;
+
+		if (!empty($self->{'last_error'})) {
+			return $self->{'last_error'};
+		}
+
+		return '';
+	}
+
+	################################################################################
+	# Update last error.
+	################################################################################
+	sub set_last_error {
+		my ($self, $error) = @_;
+
+		$self->{'last_error'} = $error;
+	}
+
+	################################################################################
+	# Try to load extra libraries.c
+	################################################################################
+	sub load_libraries {
+		my $self = shift;
+
+		# Dynamic load. Avoid unwanted behaviour.
+		eval {eval 'require YAML::Tiny;1' or die('YAML::Tiny lib not found, commands feature won\'t be available');};
+		if ($@) {
+			$self->set_last_error($@);
+			return 0;
+		} else {
+			return 1;
+		}
+	}
+
+	################################################################################
+	# Create new omnishell handler.
+	################################################################################
+	sub new {
+		my ($class, $args) = @_;
+
+		if (ref($args) ne 'HASH') {
+			return undef;
+		}
+
+		my $system = init();
+		my $self = {
+		'server_ip' => 'localhost',
+			'server_path' => '/var/spool/pandora/data_in',
+			'server_port' => 41121,
+			'transfer_mode' => 'tentacle',
+			'transfer_mode_user' => 'apache',
+			'transfer_timeout' => 30,
+			'server_user' => 'pandora',
+			'server_pwd' => '',
+			'server_ssl' => '0',
+			'server_opts' => '',
+			'delayed_startup' => 0,
+			'pandora_nice' => 10,
+			'cron_mode' => 0,
+			'last_error' => undef,
+			%{$system},
+			%{$args},
+		};
+
+		$self->{'temporal'} =~ s/\"|\'//g;
+		$self = bless($self, $class);
+		$self->prepare_commands();
+
+		return $self;
+	}
+
+	################################################################################
+	# Run all, output mode 'xml'  will dump to STDOUT and return an array of strings
+	#, any other option will return an array with all results.
+	################################################################################
+	sub run {
+		my ($self, $output_mode) = @_;
+
+		my @results;
+
+		foreach my $ref (keys %{$self->{'commands'}}) {
+			my $rs = $self->runCommand($ref, $output_mode);
+			if ($rs) {
+				push @results, $rs;
+			}
+		}
+
+		if ($output_mode eq 'xml') {
+			print join("\n",@results);
+		}
+
+		return \@results;
+	}
+
+	################################################################################
+	# Run command, output mode 'xml'  will dump to STDOUT, other will return a hash
+	# with all results.
+	################################################################################
+	sub runCommand {
+		my ($self, $ref, $output_mode) = @_;
+
+		if($self->load_libraries()) {
+			# Functionality possible.
+			my $command = $self->{'commands'}->{$ref};
+			my $result = $self->evaluate_command($ref);
+			if (ref($result) eq "HASH") {
+				# Process command result.
+				if (defined($output_mode) && $output_mode eq 'xml') {
+					my $output = '';
+					$output .= "<cmd_report>\n";
+					$output .= "  <cmd_response>\n";
+					$output .= "    <cmd_name><![CDATA[".$result->{'name'}."]]></cmd_name>\n";
+					$output .= "    <cmd_key><![CDATA[".$ref."]]></cmd_key>\n";
+					$output .= "    <cmd_errorlevel><![CDATA[".$result->{'error_level'}."]]></cmd_errorlevel>\n";
+					$output .= "    <cmd_stdout><![CDATA[".$result->{'stdout'}."]]></cmd_stdout>\n";
+					$output .= "    <cmd_stderr><![CDATA[".$result->{'stderr'}."]]></cmd_stderr>\n";
+					$output .= "  </cmd_response>\n";
+					$output .= "</cmd_report>\n";
+
+					return $output;
+				}
+				return $result;
+			} else {
+				$self->set_last_error('Failed to process ['.$ref.']: '.$result);
+			}
+		}
+
+		return undef;
+	}
+
+	################################################################################
+	# Check for remote commands defined.
+	################################################################################
+	sub prepare_commands {
+		my ($self) = @_;
+
+		if ($YAML == 0) {
+			$self->set_last_error('Cannot use commands without YAML dependency, please install it.');
+			return;
+		}
+
+		# Force configuration file read.
+		my $commands = $self->{'commands'};  
+
+		if (empty($commands)) {
+			$self->{'commands'} = {};
+		} else {
+			foreach my $rcmd (keys %{$commands}) {
+				$self->{'commands'}->{trim($rcmd)} = {};
+			}
+		}
+
+		# Cleanup old commands. Not registered.
+		$self->cleanup_old_commands();
+
+		foreach my $ref (keys %{$self->{'commands'}}) {
+			my $file_content;
+			my $download = 0;
+			my $rcmd_file = $self->{'ConfDir'}.'/commands/'.$ref.'.rcmd';
+
+			# Search for local .rcmd file
+			if (-e $rcmd_file) {
+				my $remote_md5_file = $self->{'temporal'}.'/'.$ref.'.md5';
+
+				$file_content = read_file($rcmd_file);
+				if ($self->recv_file($ref.'.md5', $remote_md5_file) != 0) {
+					# Remote file could not be retrieved, skip.
+					delete $self->{'commands'}->{$ref};
+					next;
+				}
+
+				my $local_md5 = md5($file_content);
+				my $remote_md5 = md5(read_file($remote_md5_file));
+
+				if ($local_md5 ne $remote_md5) {
+					# Must be downloaded again.
+					$download = 1;
+				}
+			} else {
+				$download = 1;
+			}
+			
+			# Search for remote .rcmd file
+			if ($download == 1) {
+				# Download .rcmd file
+				if ($self->recv_file($ref.'.rcmd') != 0) {
+					# Remote file could not be retrieved, skip.
+					delete $self->{'commands'}->{$ref};
+					next;
+				} else {
+					# Success
+					move($self->{'temporal'}.'/'.$ref.'.rcmd', $rcmd_file);
+				}
+			}
+			
+			# Parse and prepare in memory skel.
+			eval {
+				$self->{'commands'}->{$ref} = YAML::Tiny->read($rcmd_file);
+			};
+			if ($@) {
+				# Failed.
+				$self->set_last_error('Failed to decode command. ' . "\n".$@);
+				delete $self->{'commands'}->{$ref};
+				next;
+			}
+
+		}
+	}
+
+	################################################################################
+	# Command report.
+	################################################################################
+	sub report_command {
+		my ($self, $ref, $err_level) = @_;
+
+		# Retrieve content from .stdout and .stderr
+		my $stdout_file = $self->{'temporal'}.'/'.$ref.'.stdout';
+		my $stderr_file = $self->{'temporal'}.'/'.$ref.'.stderr';
+
+		my $return;
+		eval {
+			$return = {
+				'error_level' => $err_level,
+				'stdout' => read_file($stdout_file),
+				'stderr' => read_file($stderr_file),
+			};
+
+			$return->{'name'} = $self->{'commands'}->{$ref}->[0]->{'name'};
+		};
+		if ($@) {
+			$self->set_last_error('Failed to report command output. ' . $@);
+		}
+
+		# Cleanup
+		unlink($stdout_file) if (-e $stdout_file);
+		unlink($stderr_file) if (-e $stderr_file);
+
+		# Mark command as done.
+		open (my $R_FILE, '> '.$self->{'ConfDir'}.'/commands/'.$ref.'.rcmd.done');
+		print $R_FILE $err_level;
+		close($R_FILE);
+
+
+		$return->{'stdout'} = '' unless defined ($return->{'stdout'});
+		$return->{'stderr'} = '' unless defined ($return->{'stderr'});
+
+		return $return;
+	}
+
+	################################################################################
+	# Cleanup unreferenced rcmd and rcmd.done files.
+	################################################################################
+	sub cleanup_old_commands {
+		my ($self) = @_;
+
+		# Cleanup old .rcmd and .rcmd.done files.
+		my %registered = map { $_.'.rcmd' => 1 } keys %{$self->{'commands'}};
+		if(opendir(my $dir, $self->{'ConfDir'}.'/commands/')) {
+			while (my $item = readdir($dir)) {
+
+				# Skip other files.
+				next if ($item !~ /\.rcmd$/);
+
+				# Clean .rcmd.done file if its command is not referenced in conf.
+				if (!defined($registered{$item})) {
+					if (-e $self->{'ConfDir'}.'/commands/'.$item) {
+						unlink($self->{'ConfDir'}.'/commands/'.$item);
+					}
+					if (-e $self->{'ConfDir'}.'/commands/'.$item.'.done') {
+						unlink($self->{'ConfDir'}.'/commands/'.$item.'.done');
+					}
+				}
+			}
+
+			# Close dir.
+			closedir($dir);
+		}
+
+	}
+
+	################################################################################
+	# Executes a command using defined timeout.
+	################################################################################
+	sub execute_command_timeout {
+		my ($self, $cmd, $timeout) = @_;
+
+		if (!defined($timeout)
+			|| !looks_like_number($timeout)
+			|| $timeout <= 0
+		) {
+			`$cmd`;
+			return $?>>8;
+		}
+
+		my $remaining_timeout = $timeout;
+
+		my $RET;
+		my $output;
+
+		my $pid = open ($RET, "-|");
+		if (!defined($pid)) {
+			# Failed to fork.
+			$self->set_last_error('[command] Failed to fork.');
+			return undef;
+		}
+		if ($pid == 0) {
+			# Child.
+			my $ret;
+			eval {
+				local $SIG{ALRM} = sub { die "timeout\n" };
+				alarm $timeout;
+				`$cmd`;
+				alarm 0;
+			};
+
+			my $result = ($?>>8);
+			return $result;
+
+			# Exit child.
+			# Child finishes.
+			exit;
+
+		} else {
+			# Parent waiting.
+			while( --$remaining_timeout > 0 ){
+				if (wait == -1) {
+					last;
+				}
+				# Wait child up to timeout seconds.
+				sleep 1;
+			}
+		}
+
+		if ($remaining_timeout > 0) {
+			# Retrieve output from child.
+			$output = do { local $/; <$RET> };
+			$output = $output>>8;
+		}
+		else {
+			# Timeout expired.
+			return 124;
+		}
+
+		close($RET);
+
+		return $output;
+	}
+
+	################################################################################
+	# Executes a block of commands, returns error level, leaves output in 
+	# redirection set by $std_files. E.g:
+	# $std_files = ' >>  /tmp/stdout 2>> /tmp/stderr
+	################################################################################
+	sub execute_command_block {
+		my ($self, $commands, $std_files, $timeout, $retry) = @_;
+
+		return 0 unless defined($commands);
+
+		my $retries = $retry;
+
+		$retries = 1 unless looks_like_number($retries) && $retries > 0;
+
+		my $err_level = 0;
+		$std_files = '' unless defined ($std_files);
+
+		if (ref($commands) ne "ARRAY") {
+			return 0 if $commands eq '';
+
+			do {
+				$err_level = $self->execute_command_timeout(
+					"($commands) $std_files",
+					$timeout
+				);
+
+				# Do not retry if success.
+				last if looks_like_number($err_level) && $err_level == 0;
+			} while ((--$retries) > 0);
+
+		} else {
+			foreach my $comm (@{$commands}) {
+				next unless defined($comm);
+				$retries = $retry;
+				$retries = 1 unless looks_like_number($retries) && $retries > 0;
+
+				do {
+					$err_level = $self->execute_command_timeout(
+						"($comm) $std_files",
+						$timeout
+					);
+
+					# Do not retry if success.
+					$retries = 0 if looks_like_number($err_level) && $err_level == 0;
+
+				} while ((--$retries) > 0);
+
+				# Do not continue evaluating block if failed.
+				last unless ($err_level == 0);
+			}
+		}
+
+		return $err_level;
+	}
+
+	################################################################################
+	# Evalate given command.
+	################################################################################
+	sub evaluate_command {
+		my ($self, $ref) = @_;
+
+		# Not found.
+		return "undefined command" unless defined $self->{'commands'}->{$ref};
+
+		# Already completed.
+		return "already executed" if (-e $self->{'ConfDir'}.'/commands/'.$ref.'.rcmd.done');
+
+		# [0] because how library works.
+		my $cmd = $self->{'commands'}->{$ref}->[0];
+
+		my $std_files = ' >> "'.$self->{'temporal'}.'/'.$ref.'.stdout" ';
+		$std_files .= ' 2>> "'.$self->{'temporal'}.'/'.$ref.'.stderr" ';
+
+		# Check preconditions
+		my $err_level;
+		
+		$err_level = $self->execute_command_block(
+			$cmd->{'preconditions'},
+			$std_files,
+			$cmd->{'timeout'}
+		);
+
+		# Precondition not satisfied.
+		return $self->report_command($ref, $err_level) unless ($err_level == 0);
+
+		# Main run.
+		$err_level = $self->execute_command_block(
+			$cmd->{'script'},
+			$std_files,
+			$cmd->{'timeout'}
+		);
+
+		# Script not success.
+		return $self->report_command($ref, $err_level) unless ($err_level == 0);
+
+		# Check postconditions
+		$err_level = $self->execute_command_block(
+			$cmd->{'postconditions'},
+			$std_files,
+			$cmd->{'timeout'}
+		);
+
+		# Return results.
+		return $self->report_command($ref, $err_level);
+	}
+
+	################################################################################
+	# File transference and imported methods
+	################################################################################
+	################################################################################
+	## Remove any trailing / from directory names.
+	################################################################################
+	sub fix_directory ($) {
+		my $dir = shift;
+
+		my $char = chop($dir);
+		return $dir if ($char eq '/');
+		return $dir . $char;
+	}
+
+	################################################################################
+	# Receive a file from the server.
+	################################################################################
+	sub recv_file {
+		my ($self, $file, $relative) = @_;
+		my $output;
+
+		my $DevNull = $self->{'__system'}->{'devnull'};
+		my $CmdSep = $self->{'__system'}->{'cmdsep'};
+		
+		my $pid = fork();
+			return 1 unless defined $pid;
+
+		# Fix remote dir to some transfer mode
+		my $remote_dir = $self->{'server_path'};
+		$remote_dir .= "/" . fix_directory($relative) if defined($relative);
+
+		if ($pid == 0) {
+			# execute the transfer program by child process.
+			eval {
+				local $SIG{'ALRM'} = sub {die};
+				alarm ($self->{'transfer_timeout'});
+				if ($self->{'transfer_mode'} eq 'tentacle') {
+					$output = `cd "$self->{'temporal'}"$CmdSep tentacle_client -v -g -a $self->{'server_ip'} -p $self->{'server_port'} $self->{'server_opts'} $file 2>&1 >$DevNull`
+				} elsif ($self->{'transfer_mode'} eq 'ssh') {
+					$output = `scp -P $self->{'server_port'} pandora@"$self->{'server_ip'}:$self->{'server_path'}/$file" $self->{'temporal'} 2>&1 >$DevNull`;
+				} elsif ($self->{'transfer_mode'} eq 'ftp') {
+					my $base = basename ($file);
+					my $dir = dirname ($file);
+
+					$output = `ftp -n $self->{'server_opts'} $self->{'server_ip'} $self->{'server_port'} 2>&1 >$DevNull <<FEOF1
+					quote USER $self->{'server_user'}
+					quote PASS $self->{'server_pwd'}
+					lcd "$self->{'temporal'}"
+					cd "$self->{'server_path'}"
+					get "$file"
+					quit
+					FEOF1`
+				} elsif ($self->{'transfer_mode'} eq 'local') {
+					$output = `cp "$remote_dir/$file" $self->{'temporal'} 2>&1 >$DevNull`;
+				}
+				alarm (0);
+			};
+
+			if ($@) {
+				$self->set_last_error("Error retrieving file: '.$file.' File transfer command is not responding.");
+				exit 1;
+			}
+
+			# Get the errorlevel
+			my $rc = $? >> 8;
+			if ($rc != 0) {
+				$self->set_last_error("Error retrieving file: '$file' $output");
+			}
+			exit $rc;
+		}
+
+		# Wait the child process termination and get the errorlevel
+		waitpid ($pid, 0);
+		my $rc = $? >> 8;
+
+		return $rc;
+	}
+
+	1;
+}
+
+package main;
 
 use strict;
 use warnings;
@@ -34,7 +1005,6 @@ use Sys::Syslog;
 use Time::Local;
 
 use lib '/usr/lib/perl5';
-use PandoraFMS::Omnishell;
 
 # Agent XML data
 my $Xml;
@@ -46,7 +1016,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.751';
-use constant AGENT_BUILD => '201214';
+use constant AGENT_BUILD => '201223';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
@@ -3401,3 +4371,5 @@ This is released under the GNU Lesser General Public License.
 Copyright (c) 2005-2010 Artica Soluciones Tecnologicas S.L
 
 =cut
+
+

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.751
-%define release     201214
+%define release     201223
 
 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.751
-%define release     201214
+%define release     201223
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.751"
-PI_BUILD="201214"
+PI_BUILD="201223"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201214}
+{201223}
 
 ViewReadme
 {Yes}

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.751(Build 201214)")
+#define PANDORA_VERSION ("7.0NG.751(Build 201223)")
 
 string pandora_path;
 string pandora_dir;

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.751(Build 201214))"
+      VALUE "ProductVersion", "(7.0NG.751(Build 201223))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.751-201214
+Version: 7.0NG.751-201223
 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.751-201214"
+pandora_version="7.0NG.751-201223"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/mr/44.sql

@@ -0,0 +1,15 @@
+START TRANSACTION;
+
+ALTER TABLE `talert_templates`
+ADD COLUMN `field16` TEXT NOT NULL AFTER `field15`
+,ADD COLUMN `field17` TEXT NOT NULL AFTER `field16`
+,ADD COLUMN `field18` TEXT NOT NULL AFTER `field17`
+,ADD COLUMN `field19` TEXT NOT NULL AFTER `field18`
+,ADD COLUMN `field20` TEXT NOT NULL AFTER `field19`
+,ADD COLUMN `field16_recovery` TEXT NOT NULL AFTER `field15_recovery`
+,ADD COLUMN `field17_recovery` TEXT NOT NULL AFTER `field16_recovery`
+,ADD COLUMN `field18_recovery` TEXT NOT NULL AFTER `field17_recovery`
+,ADD COLUMN `field19_recovery` TEXT NOT NULL AFTER `field18_recovery`
+,ADD COLUMN `field20_recovery` TEXT NOT NULL AFTER `field19_recovery`;
+
+COMMIT;

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -1267,11 +1267,21 @@ ALTER TABLE talert_templates ADD COLUMN `field12` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_templates ADD COLUMN `field13` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_templates ADD COLUMN `field14` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_templates ADD COLUMN `field15` TEXT NOT NULL DEFAULT "";
+ALTER TABLE talert_templates ADD COLUMN `field16` TEXT NOT NULL DEFAULT "";
+ALTER TABLE talert_templates ADD COLUMN `field17` TEXT NOT NULL DEFAULT "";
+ALTER TABLE talert_templates ADD COLUMN `field18` TEXT NOT NULL DEFAULT "";
+ALTER TABLE talert_templates ADD COLUMN `field19` TEXT NOT NULL DEFAULT "";
+ALTER TABLE talert_templates ADD COLUMN `field20` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_templates ADD COLUMN `field11_recovery` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_templates ADD COLUMN `field12_recovery` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_templates ADD COLUMN `field13_recovery` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_templates ADD COLUMN `field14_recovery` TEXT NOT NULL DEFAULT "";
 ALTER TABLE talert_templates ADD COLUMN `field15_recovery` TEXT NOT NULL DEFAULT "";
+ALTER TABLE talert_templates ADD COLUMN `field16_recovery` TEXT NOT NULL DEFAULT "";
+ALTER TABLE talert_templates ADD COLUMN `field17_recovery` TEXT NOT NULL DEFAULT "";
+ALTER TABLE talert_templates ADD COLUMN `field18_recovery` TEXT NOT NULL DEFAULT "";
+ALTER TABLE talert_templates ADD COLUMN `field19_recovery` TEXT NOT NULL DEFAULT "";
+ALTER TABLE talert_templates ADD COLUMN `field20_recovery` TEXT NOT NULL DEFAULT "";
 ALTER TABLE `talert_templates` ADD COLUMN `disable_event` tinyint(1) DEFAULT 0;
 
 -- ---------------------------------------------------------------------

pandora_console/general/header.php

@@ -1,15 +1,18 @@
 <?php
-// Pandora FMS - http://pandorafms.com
+/**
-// ==================================================
+ * Pandora FMS - http://pandorafms.com
-// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
+ * ==================================================
-// Please see http://pandorafms.org for full contribution list
+ * Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
-// This program is free software; you can redistribute it and/or
+ * Please see http://pandorafms.org for full contribution list
-// modify it under the terms of the GNU General Public License
+ * This program is free software; you can redistribute it and/or
-// as published by the Free Software Foundation; version 2
+ * modify it under the terms of the GNU General Public License
-// This program is distributed in the hope that it will be useful,
+ * as published by the Free Software Foundation; version 2
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
 require_once 'include/functions_messages.php';
 require_once 'include/functions_servers.php';
 require_once 'include/functions_notifications.php';
@@ -142,7 +145,7 @@ if ($config['menu_type'] == 'classic') {
         }
 
         if ($_GET['sec'] == 'main' || !isset($_GET['sec'])) {
-            // home screen chosen by the user
+            // Home screen chosen by the user.
             $home_page = '';
             if (isset($config['id_user'])) {
                 $user_info = users_get_user_by_id($config['id_user']);
@@ -169,6 +172,7 @@ if ($config['menu_type'] == 'classic') {
                     break;
 
                     case 'Default':
+                    default:
                         $_GET['sec2'] = 'general/logon_ok';
                     break;
 
@@ -763,6 +767,7 @@ if ($config['menu_type'] == 'classic') {
                     page: 'include/ajax/order_interpreter',
                     method: 'getResult',
                     text: $('#keywords').val(),
+                    enterprise: <?php echo (int) enterprise_installed(); ?>,
                 },
                 success: function (data) {
                    $('#result_order').html(data);

pandora_console/general/login_page.php

@@ -159,11 +159,31 @@ echo '<div class="container_login">';
 echo '<div class="login_page">';
     echo '<form method="post" action="'.ui_get_full_url('index.php'.$url).'" ><div class="login_logo_icon">';
         echo '<a href="'.$logo_link.'">';
-if (defined('METACONSOLE')) {
+if (is_metaconsole() === true) {
     if (!isset($config['custom_logo_login'])) {
-        html_print_image(ui_get_full_url('images/custom_logo_login/login_logo.png'), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(
+            'enterprise/images/custom_logo_login/login_logo.png',
+            false,
+            [
+                'class'  => 'login_logo',
+                'alt'    => 'logo',
+                'border' => 0,
+                'title'  => $logo_title,
+            ],
+            false
+        );
     } else {
-        html_print_image(ui_get_full_url('images/custom_logo_login/'.$config['custom_logo_login']), false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
+        html_print_image(
+            'enterprise/images/custom_logo_login/'.$config['custom_logo_login'],
+            false,
+            [
+                'class'  => 'login_logo',
+                'alt'    => 'logo',
+                'border' => 0,
+                'title'  => $logo_title,
+            ],
+            false
+        );
     }
 } else if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
     if (!isset($config['custom_logo_login'])) {
@@ -344,9 +364,27 @@ if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
         echo '<div class ="img_banner_login">';
 if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
     if (isset($config['custom_splash_login'])) {
-        html_print_image('enterprise/images/custom_splash_login/'.$config['custom_splash_login'], false, [ 'alt' => 'splash', 'border' => 0], false, true);
+        html_print_image(
+            'enterprise/images/custom_splash_login/'.$config['custom_splash_login'],
+            false,
+            [
+                'alt'    => 'splash',
+                'border' => 0,
+            ],
+            false,
+            false
+        );
     } else {
-        html_print_image('enterprise/images/custom_splash_login/splash_image_default.png', false, ['alt' => 'logo', 'border' => 0], false, true);
+        html_print_image(
+            'enterprise/images/custom_splash_login/splash_image_default.png',
+            false,
+            [
+                'alt'    => 'logo',
+                'border' => 0,
+            ],
+            false,
+            false
+        );
     }
 } else {
     html_print_image('images/splash_image_default.png', false, ['alt' => 'logo', 'border' => 0], false, true);

pandora_console/general/sap_view.php

@@ -1,10 +1,10 @@
 <?php
 /**
- * Credential store
+ * Monitoring SAP View
  *
- * @category   HelperFeedBack
+ * @category   Operations
  * @package    Pandora FMS
- * @subpackage Help Feedback
+ * @subpackage Monitoring
  * @version    1.0.0
  * @license    See below
  *
@@ -38,16 +38,6 @@ enterprise_include_once('/include/class/SAPView.class.php');
 
 $ajaxPage = 'general/sap_view';
 
-// Header.
-ui_print_page_header(
-    __('SAP view'),
-    '',
-    false,
-    'sap_view',
-    false,
-    ''
-);
-
 // Control call flow.
 try {
     // User access and validation is being processed on class constructor.

pandora_console/godmode/alerts/alert_templates.php

@@ -148,7 +148,7 @@ if ($update_template) {
     $recovery_notify = (bool) get_parameter('recovery_notify');
 
     $fields_recovery = [];
-    for ($i = 1; $i <= 10; $i++) {
+    for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
         $values['field'.$i] = (string) get_parameter('field'.$i);
         $values['field'.$i.'_recovery'] = ($recovery_notify) ? (string) get_parameter('field'.$i.'_recovery') : '';
     }

pandora_console/godmode/modules/manage_network_components.php

@@ -643,6 +643,9 @@ $url = ui_get_url_refresh(
 
 $search_id_group = (int) get_parameter('search_id_group');
 $search_string = (string) get_parameter('search_string');
+if (!empty($search_string)) {
+    $search_string = trim($search_string, ' ');
+}
 
 $table = new stdClass();
 $table->width = '100%';

pandora_console/godmode/reporting/graph_builder.graph_editor.php

@@ -193,11 +193,13 @@ if ($editGraph) {
 
 
 $count_module_array = count($module_array);
-if ($count_module_array > 10) {
+if ($count_module_array > $config['items_combined_charts']) {
     ui_print_warning_message(
         __(
-            'The maximum number of items in a chart is 10. You have %s elements, only first 10 will be displayed.',
+            'The maximum number of items in a chart is %d. You have %d elements, only first %d will be displayed.',
-            $count_module_array
+            $config['items_combined_charts'],
+            $count_module_array,
+            $config['items_combined_charts']
         )
     );
 }

pandora_console/godmode/setup/setup_visuals.php

@@ -463,19 +463,15 @@ if (enterprise_installed()) {
     $row++;
 }
 
-// Title Header
+// Title Header.
-if (enterprise_installed()) {
+$table_styles->data[$row][0] = __('Title (header)');
-    $table_styles->data[$row][0] = __('Title (header)');
+$table_styles->data[$row][1] = html_print_input_text('custom_title_header', $config['custom_title_header'], '', 50, 40, true);
-    $table_styles->data[$row][1] = html_print_input_text('custom_title_header', $config['custom_title_header'], '', 50, 40, true);
+$row++;
-    $row++;
-}
 
-// Subtitle Header
+// Subtitle Header.
-if (enterprise_installed()) {
+$table_styles->data[$row][0] = __('Subtitle (header)');
-    $table_styles->data[$row][0] = __('Subtitle (header)');
+$table_styles->data[$row][1] = html_print_input_text('custom_subtitle_header', $config['custom_subtitle_header'], '', 50, 40, true);
-    $table_styles->data[$row][1] = html_print_input_text('custom_subtitle_header', $config['custom_subtitle_header'], '', 50, 40, true);
+$row++;
-    $row++;
-}
 
 // login title1
 if (enterprise_installed()) {
@@ -908,6 +904,20 @@ $row++;
     );
     $row++;
 
+    $table_chars->data[$row][0] = __('Number of elements in Custom Graph');
+    $table_chars->data[$row][1] = html_print_input_text(
+        'items_combined_charts',
+        $config['items_combined_charts'],
+        '',
+        5,
+        5,
+        true,
+        false,
+        false,
+        ''
+    );
+    $row++;
+
     $table_chars->data[$row][0] = __('Use round corners');
     $table_chars->data[$row][1] = html_print_checkbox_switch(
         'round_corner',
@@ -1624,6 +1634,13 @@ var added_config1 = {
 
 $(document).ready (function () {
 
+    var enterprise = '<?php echo enterprise_installed(); ?>';
+
+    if (enterprise === '') {
+        $('#text-custom_title_header').prop( "disabled", true );
+        $('#text-custom_subtitle_header').prop( "disabled", true );
+    }
+
     // Show the cache expiration conf or not.
     $("input[name=legacy_vc]").change(function (e) {
         if ($(this).prop("checked") === true) {

pandora_console/godmode/users/configure_user.php

@@ -558,15 +558,51 @@ if ($update_user) {
     if ($config['user_can_update_password']) {
         $password_new = (string) get_parameter('password_new', '');
         $password_confirm = (string) get_parameter('password_confirm', '');
+        $own_password_confirm = (string) get_parameter('own_password_confirm', '');
+
         if ($password_new != '') {
+            $correct_password = false;
+
+            $user_credentials_check = process_user_login($config['id_user'], $own_password_confirm, true);
+
+            if ($user_credentials_check !== false) {
+                $correct_password = true;
+            }
+
             if ($password_confirm == $password_new) {
-                if ((!is_user_admin($config['id_user']) || $config['enable_pass_policy_admin']) && $config['enable_pass_policy']) {
+                if ($correct_password === true || is_user_admin($config['id_user'])) {
-                    $pass_ok = login_validate_pass($password_new, $id, true);
+                    if ((!is_user_admin($config['id_user']) || $config['enable_pass_policy_admin']) && $config['enable_pass_policy']) {
-                    if ($pass_ok != 1) {
+                        $pass_ok = login_validate_pass($password_new, $id, true);
-                        ui_print_error_message($pass_ok);
+                        if ($pass_ok != 1) {
+                            ui_print_error_message($pass_ok);
+                        } else {
+                            $res2 = update_user_password($id, $password_new);
+                            if ($res2) {
+                                db_process_sql_insert(
+                                    'tsesion',
+                                    [
+                                        'id_sesion'   => '',
+                                        'id_usuario'  => $id,
+                                        'ip_origen'   => $_SERVER['REMOTE_ADDR'],
+                                        'accion'      => 'Password change',
+                                        'descripcion' => 'Access password updated',
+                                        'fecha'       => date('Y-m-d H:i:s'),
+                                        'utimestamp'  => time(),
+                                    ]
+                                );
+                                $res3 = save_pass_history($id, $password_new);
+                            }
+
+                            ui_print_result_message(
+                                $res1 || $res2,
+                                __('User info successfully updated'),
+                                __('Error updating user info (no change?)')
+                            );
+                        }
                     } else {
                         $res2 = update_user_password($id, $password_new);
                         if ($res2) {
+                            $res3 = save_pass_history($id, $password_new);
                             db_process_sql_insert(
                                 'tsesion',
                                 [
@@ -579,7 +615,6 @@ if ($update_user) {
                                     'utimestamp'  => time(),
                                 ]
                             );
-                            $res3 = save_pass_history($id, $password_new);
                         }
 
                         ui_print_result_message(
@@ -589,28 +624,11 @@ if ($update_user) {
                         );
                     }
                 } else {
-                    $res2 = update_user_password($id, $password_new);
+                    if ($own_password_confirm === '') {
-                    if ($res2) {
+                        ui_print_error_message(__('Password of the active user is required to perform password change'));
-                        $res3 = save_pass_history($id, $password_new);
+                    } else {
-                        db_process_sql_insert(
+                        ui_print_error_message(__('Password of active user is not correct'));
-                            'tsesion',
-                            [
-                                'id_sesion'   => '',
-                                'id_usuario'  => $id,
-                                'ip_origen'   => $_SERVER['REMOTE_ADDR'],
-                                'accion'      => 'Password change',
-                                'descripcion' => 'Access password updated',
-                                'fecha'       => date('Y-m-d H:i:s'),
-                                'utimestamp'  => time(),
-                            ]
-                        );
                     }
-
-                    ui_print_result_message(
-                        $res1 || $res2,
-                        __('User info successfully updated'),
-                        __('Error updating user info (no change?)')
-                    );
                 }
             } else {
                 db_process_sql_insert(
@@ -877,6 +895,25 @@ if ($config['user_can_update_password']) {
         true,
         true
     ).'</span></div>';
+
+    if (!is_user_admin($config['id_user'])) {
+        $own_pass_confirm = '<div class="label_select_simple"><span>'.html_print_input_text_extended(
+            'own_password_confirm',
+            '',
+            'own_password_confirm',
+            '',
+            '20',
+            '45',
+            $view_mode,
+            '',
+            [
+                'class'       => 'input',
+                'placeholder' => __('Own password confirmation'),
+            ],
+            true,
+            true
+        ).'</span></div>';
+    }
 }
 
 $own_info = get_user_info($config['id_user']);
@@ -1191,7 +1228,7 @@ if (is_metaconsole()) {
 
 if ($id != '' && !$is_err) {
     $div_user_info = '<div class="edit_user_info_left">'.$avatar.$user_id_create.'</div>
-    <div class="edit_user_info_right">'.$user_id_update_view.$full_name.$new_pass.$new_pass_confirm.$global_profile.'</div>';
+    <div class="edit_user_info_right">'.$user_id_update_view.$full_name.$new_pass.$new_pass_confirm.$own_pass_confirm.$global_profile.'</div>';
 } else {
     $div_user_info = '<div class="edit_user_info_left">'.$avatar.'</div>
     <div class="edit_user_info_right">'.$user_id_create.$user_id_update_view.$full_name.$new_pass.$new_pass_confirm.$global_profile.'</div>';

pandora_console/include/class/AgentWizard.class.php

@@ -1452,7 +1452,7 @@ class AgentWizard extends HTML
         foreach (array_keys($data) as $k) {
             foreach ($modulesActivated as $key => $value) {
                 $valueStr = preg_replace('/\//', '\/', $value);
-                if (empty(preg_match('/'.$valueStr.'$/', $k)) === false) {
+                if (empty(preg_match('/-'.$valueStr.'$/', $k)) === false) {
                     if (empty(preg_match('/module-name-set/', $k)) === false) {
                         $result[$value]['name'] = $data[$k];
                     } else if (empty(preg_match('/module-description-set/', $k)) === false) {

pandora_console/include/class/ModuleTemplates.class.php

@@ -309,14 +309,19 @@ class ModuleTemplates extends HTML
 
             switch ($this->action) {
                 case 'update':
-                    $dbResult_tnp = db_process_sql_update(
+                    if (empty($this->name)) {
-                        'tnetwork_profile',
+                        $dbResult_tnp = false;
-                        [
+                    } else {
-                            'name'        => $this->name,
+                        $dbResult_tnp = db_process_sql_update(
-                            'description' => $this->description,
+                            'tnetwork_profile',
-                        ],
+                            [
-                        ['id_np' => $this->id_np]
+                                'name'        => $this->name,
-                    );
+                                'description' => $this->description,
+                            ],
+                            ['id_np' => $this->id_np]
+                        );
+                    }
+
                     if ($dbResult_tnp === false) {
                         $success = false;
                     } else {
@@ -352,13 +357,18 @@ class ModuleTemplates extends HTML
                 break;
 
                 case 'create':
-                    $dbResult_tnp = db_process_sql_insert(
+                    if (empty($this->name)) {
-                        'tnetwork_profile',
+                        $dbResult_tnp = false;
-                        [
+                    } else {
-                            'name'        => $this->name,
+                        $dbResult_tnp = db_process_sql_insert(
-                            'description' => $this->description,
+                            'tnetwork_profile',
-                        ]
+                            [
-                    );
+                                'name'        => $this->name,
+                                'description' => $this->description,
+                            ]
+                        );
+                    }
+
                     // The insert gone fine!
                     if ($dbResult_tnp != false) {
                         // Set the new id_np.
@@ -610,17 +620,67 @@ class ModuleTemplates extends HTML
             }
         } else if ($modulesToAdd != '') {
             $modulesToAddList = explode(',', $modulesToAdd);
+
+            $modulesAddedList = db_get_all_rows_in_table('tnetwork_profile_component');
+
+            $modulesToAdd = [];
+
             foreach ($modulesToAddList as $module) {
-                db_process_sql_insert(
+                $is_added = false;
-                    'tnetwork_profile_component',
+                foreach ($modulesAddedList as $item) {
-                    [
+                    if ($item['id_nc'] === $module
-                        'id_nc' => $module,
+                        && $item['id_np'] === $this->id_np
-                        'id_np' => $this->id_np,
+                    ) {
-                    ]
+                            $is_added = true;
-                );
+                    }
+                }
+
+                if ($is_added === false) {
+                    $name = io_safe_output(
+                        db_get_row_filter(
+                            'tnetwork_component',
+                            ['id_nc' => $module],
+                            'name'
+                        )
+                    );
+                    $modulesToAdd[] = $name;
+                    db_process_sql_insert(
+                        'tnetwork_profile_component',
+                        [
+                            'id_nc' => $module,
+                            'id_np' => $this->id_np,
+                        ]
+                    );
+                } else {
+                    $message = 'Some modules already exists<br>';
+                }
             }
 
-            $this->ajaxMsg('result', __('Components added sucessfully'));
+            if (empty($modulesToAdd)) {
+                $this->ajaxMsg(
+                    'error',
+                    __('The modules is already added')
+                );
+                return false;
+            }
+
+            if ($message === '') {
+                $message = 'Following modules will be added:';
+            } else {
+                $message .= 'Following modules will be added:';
+            }
+
+            $message .= '<ul>';
+            foreach ($modulesToAdd as $key => $value) {
+                $message .= '<li>'.$value['name'].'</li>';
+            }
+
+            $message .= '</ul>';
+
+            $this->ajaxMsg(
+                'result',
+                __($message)
+            );
         }
     }
 

pandora_console/include/class/OrderInterpreter.class.php

@@ -380,7 +380,7 @@ class OrderInterpreter extends Wizard
 
         // Take value from input search.
         $text = get_parameter('text', '');
-        $array_found = [];
+        $enterprise = (bool) get_parameter('enterprise', false);
         $iterator = 0;
         $more_results = 0;
 
@@ -394,7 +394,7 @@ class OrderInterpreter extends Wizard
                     __('GO TO '.$value['name'])
                 ) && $value['acl']
                 ) {
-                    if ($iterator <= 9) {
+                    if ($iterator <= 9 && $this->canShowItem($enterprise, $this->pages_menu[$key]['url'])) {
                         echo '<li class="list_found" name="'.$iterator.'" id="'.$iterator.'">';
                         echo '
                         Go to &nbsp;
@@ -432,6 +432,28 @@ class OrderInterpreter extends Wizard
     }
 
 
+    /**
+     * Determines if the element must be shown or not.
+     *
+     * @param boolean $isEnterprise Define if the console is Enterprise.
+     * @param string  $url          Url of the element for select.
+     *
+     * @return boolean
+     */
+    private function canShowItem(bool $isEnterprise, string $url)
+    {
+        $canShow = false;
+
+        $hasEnterpriseLocation = strpos($url, '&sec2=enterprise') !== false;
+
+        if (($isEnterprise === false && $hasEnterpriseLocation === false) || $isEnterprise === true) {
+            $canShow = true;
+        }
+
+        return $canShow;
+    }
+
+
     /**
      * Load JS content.
      * function to create JS actions.

pandora_console/include/class/Tree.class.php

@@ -690,9 +690,24 @@ class Tree
             );
         }
 
-        // Alerts fired image
+        $module_alerts = alerts_get_alerts_agent_module($module['id']);
+
+        $module_alert_triggered = false;
+
+        foreach ($module_alerts as $module_alert) {
+            if ($module_alert['times_fired'] > 0) {
+                $module_alert_triggered = true;
+            }
+        }
+
+        // Module has alerts.
         if ((bool) $module['alerts']) {
-            $module['alertsImageHTML'] = html_print_image('images/bell.png', true, ['title' => __('Module alerts')]);
+            // Module has alerts triggered.
+            if ($module_alert_triggered === true) {
+                $module['alertsImageHTML'] = html_print_image('images/bell_orange.png', true, ['title' => __('Module alerts')]);
+            } else {
+                $module['alertsImageHTML'] = html_print_image('images/bell_green.png', true, ['title' => __('Module alerts')]);
+            }
         }
     }
 
@@ -814,7 +829,7 @@ class Tree
 
         // Quiet image
         if (isset($agent['quiet']) && $agent['quiet']) {
-            $agent['quietImageHTML'] = html_print_image('/images/dot_blue.png', true, ['title' => __('Quiet')]);
+               $agent['statusImageHTML'] = ui_print_status_sets('agent_no_monitors_ball.png', __('Quiet'), 1, ['class' => 'status_balls', 'style' => 'background: '.COL_QUIET.';'], '', false);
         }
 
         // Children

pandora_console/include/config_process.php

@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC201214';
+$build_version = 'PC201223';
 $pandora_version = 'v7.0NG.751';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/constants.php

@@ -153,6 +153,7 @@ define('COL_MINOR', '#F099A2');
 define('COL_MAJOR', '#C97A4A');
 define('COL_INFORMATIONAL', '#4a83f3');
 define('COL_MAINTENANCE', '#E4E4E4');
+define('COL_QUIET', '#5AB7E5');
 
 define('COL_GRAPH1', '#C397F2');
 define('COL_GRAPH2', '#FFE66C');

pandora_console/include/functions.php

@@ -4107,6 +4107,11 @@ function generator_chart_to_pdf(
     if ($type_graph_pdf === 'vbar') {
         $width_img  = $params['generals']['pdf']['width'];
         $height_img = $params['generals']['pdf']['height'];
+    } else if ($type_graph_pdf === 'combined'
+        && $params_combined['stacked'] == CUSTOM_GRAPH_VBARS
+    ) {
+        $width_img = 650;
+        $height_img = ($params['height'] + 50);
     } else {
         $width_img  = 550;
         $height_img = $params['height'];

pandora_console/include/functions_config.php

@@ -1177,6 +1177,10 @@ function config_update_config()
                         $error_update[] = __('Default type of module charts.');
                     }
 
+                    if (!config_update_value('items_combined_charts', (string) get_parameter('items_combined_charts', 10))) {
+                        $error_update[] = __('Default Number of elements in Custom Graph.');
+                    }
+
                     if (!config_update_value('type_interface_charts', (string) get_parameter('type_interface_charts', 'line'))) {
                         $error_update[] = __('Default type of interface charts.');
                     }
@@ -2869,6 +2873,10 @@ function config_process_config()
         config_update_value('type_module_charts', 'area');
     }
 
+    if (!isset($config['items_combined_charts'])) {
+        config_update_value('items_combined_charts', 10);
+    }
+
     if (!isset($config['type_interface_charts'])) {
         config_update_value('type_interface_charts', 'line');
     }

pandora_console/include/functions_graph.php

@@ -1557,7 +1557,7 @@ function graphic_combined_module(
                 }
 
                 // Only 10 item for chart.
-                if ($i > 9) {
+                if ($i >= $config['items_combined_charts']) {
                     break;
                 }
 
@@ -2153,7 +2153,12 @@ function graphic_combined_module(
         case CUSTOM_GRAPH_HBARS:
         case CUSTOM_GRAPH_VBARS:
             $label = '';
+            $i = 0;
             foreach ($module_list as $module_item) {
+                if ($i >= $config['items_combined_charts']) {
+                    break;
+                }
+
                 if (is_metaconsole() === true) {
                     $server = metaconsole_get_connection_by_id(
                         $module_item['server']
@@ -2213,6 +2218,8 @@ function graphic_combined_module(
                 if (is_metaconsole() === true) {
                     metaconsole_restore_db();
                 }
+
+                $i++;
             }
 
             $color = color_graph_array();
@@ -2267,7 +2274,7 @@ function graphic_combined_module(
 
                 $options['generals']['rotate'] = true;
                 $options['generals']['forceTicks'] = true;
-                $options['x']['labelWidth'] = $sizeLabelTickWidth;
+                $options['x']['labelWidth'] = ($params['pdf'] === true) ? 30 : $sizeLabelTickWidth;
                 $options['generals']['arrayColors'] = $color;
                 $options['grid']['backgroundColor'] = 'transparent';
                 $options['grid']['backgroundColor'] = $background_color;
@@ -3924,6 +3931,7 @@ function graph_custom_sql_graph(
             $options['generals']['arrayColors'] = $color;
             $options['x']['labelWidth'] = 75;
             if ($ttl === 2) {
+                $options['x']['labelWidth'] = 35;
                 $options['backgroundColor'] = 'transparent';
                 $options['grid']['backgroundColor'] = 'transparent';
                 $options['y']['color'] = 'transparent';

pandora_console/include/functions_reporting.php

@@ -3007,25 +3007,94 @@ function reporting_group_report($report, $content)
 {
     global $config;
 
-    $metaconsole_on = ($config['metaconsole'] == 1) && is_metaconsole();
-
     $return['type'] = 'group_report';
 
     if (empty($content['name'])) {
         $content['name'] = __('Group Report');
     }
 
-    if (is_metaconsole()) {
+    if (is_metaconsole() === true) {
-        $server = metaconsole_get_connection_names();
+        if (isset($content['server_name']) === true
-        $connection = metaconsole_get_connection($server);
+            && empty($content['server_name']) === false
+        ) {
+            $id_meta = metaconsole_get_id_server($content['server_name']);
+            $server = metaconsole_get_connection_by_id($id_meta);
+            metaconsole_connect($server);
+
+            $data = reporting_groups_nodes($content);
+
+            if (is_metaconsole() === true) {
+                metaconsole_restore_db();
+            }
+        } else {
+            $servers = metaconsole_get_connection_names();
+            if (isset($servers) === true && is_array($servers) === true) {
+                $group_stats = [
+                    'monitor_checks'            => 0,
+                    'monitor_not_init'          => 0,
+                    'monitor_unknown'           => 0,
+                    'monitor_ok'                => 0,
+                    'monitor_bad'               => 0,
+                    'monitor_warning'           => 0,
+                    'monitor_critical'          => 0,
+                    'monitor_not_normal'        => 0,
+                    'monitor_alerts'            => 0,
+                    'monitor_alerts_fired'      => 0,
+                    'monitor_alerts_fire_count' => 0,
+                    'total_agents'              => 0,
+                    'total_alerts'              => 0,
+                    'total_checks'              => 0,
+                    'alerts'                    => 0,
+                    'agents_unknown'            => 0,
+                    'monitor_health'            => 0,
+                    'alert_level'               => 0,
+                    'module_sanity'             => 0,
+                    'server_sanity'             => 0,
+                    'total_not_init'            => 0,
+                    'monitor_non_init'          => 0,
+                    'agent_ok'                  => 0,
+                    'agent_warning'             => 0,
+                    'agent_critical'            => 0,
+                    'agent_unknown'             => 0,
+                    'agent_not_init'            => 0,
+                    'global_health'             => 0,
+                    'alert_fired'               => 0,
+                ];
+
+                $count_events = 0;
+
+                foreach ($servers as $k_server => $v_server) {
+                    $id_meta = metaconsole_get_id_server($v_server);
+                    $server = metaconsole_get_connection_by_id($id_meta);
+                    metaconsole_connect($server);
+
+                    $data_node = reporting_groups_nodes($content);
+                    $count_events += $data_node['count_events'];
+                    foreach ($data_node['group_stats'] as $key => $value) {
+                        $group_stats[$key] += $value;
+                    }
+
+                    if (is_metaconsole() === true) {
+                        metaconsole_restore_db();
+                    }
+                }
+
+                $data = [
+                    'count_events' => $count_events,
+                    'group_stats'  => $group_stats,
+                ];
+            }
+        }
+    } else {
+        $data = reporting_groups_nodes($content);
     }
 
     $items_label = [
         'agent_group' => groups_get_name($content['id_group'], true),
     ];
 
-     // Apply macros
+    // Apply macros.
-     $title = (isset($content['name'])) ? $content['name'] : '';
+    $title = (isset($content['name'])) ? $content['name'] : '';
     if ($title != '') {
         $title = reporting_label_macro(
             $items_label,
@@ -3033,7 +3102,7 @@ function reporting_group_report($report, $content)
         );
     }
 
-    $return['server_name'] = $server[0];
+    $return['server_name'] = $content['server_name'];
     $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
@@ -3043,17 +3112,42 @@ function reporting_group_report($report, $content)
 
     $return['data'] = [];
 
-    $id_group = groups_safe_acl($config['id_user'], $content['id_group'], 'ER');
+    $return['data']['count_events'] = $data['count_events'];
+
+    $return['data']['group_stats'] = $data['group_stats'];
+
+    return reporting_check_structure_content($return);
+}
+
+
+/**
+ * Return stats groups for node.
+ *
+ * @param array $content Info report.
+ *
+ * @return array Result.
+ */
+function reporting_groups_nodes($content)
+{
+    global $config;
+    $id_group = groups_safe_acl(
+        $config['id_user'],
+        $content['id_group'],
+        'ER'
+    );
 
     if (empty($id_group)) {
         $events = [];
     } else {
-        $sql_where = sprintf(' WHERE id_grupo IN (%s) AND estado<>1 ', implode(',', $id_group));
+        $sql_where = sprintf(
+            ' WHERE id_grupo IN (%s) AND estado<>1 ',
+            implode(',', $id_group)
+        );
         $events = events_get_events_grouped(
             $sql_where,
             0,
             1000,
-            is_metaconsole()
+            false
         );
     }
 
@@ -3061,19 +3155,15 @@ function reporting_group_report($report, $content)
         $events = [];
     }
 
-    $return['data']['count_events'] = count($events);
+    $return['count_events'] = count($events);
 
-    $return['data']['group_stats'] = reporting_get_group_stats(
+    $return['group_stats'] = reporting_get_group_stats(
         $content['id_group'],
         'AR',
         (bool) $content['recursion']
     );
 
-    if ($config['metaconsole']) {
+    return $return;
-        metaconsole_restore_db();
-    }
-
-    return reporting_check_structure_content($return);
 }
 
 
@@ -9882,7 +9972,6 @@ function reporting_get_group_stats_resume($id_group=0, $access='AR')
     $data['monitor_unknown'] = 0;
     $data['monitor_ok'] = 0;
     $data['monitor_bad'] = 0;
-    // Critical + Unknown + Warning
     $data['monitor_warning'] = 0;
     $data['monitor_critical'] = 0;
     $data['monitor_not_normal'] = 0;
@@ -9908,7 +9997,7 @@ function reporting_get_group_stats_resume($id_group=0, $access='AR')
 
     $cur_time = get_system_time();
 
-    // Check for access credentials using check_acl. More overhead, much safer
+    // Check for access credentials using check_acl. More overhead, much safer.
     if (!check_acl($config['id_user'], $id_group, $access)) {
         return $data;
     }
@@ -9965,113 +10054,107 @@ function reporting_get_group_stats_resume($id_group=0, $access='AR')
         // Realtime stats, done by PHP Console
         // -------------------------------------------------------------------
     } else {
-        if (!empty($id_group)) {
+        if (empty($id_group) === false) {
-            // check tags for user
-            $tags = db_get_value('tags', 'tusuario_perfil', 'id_usuario', $config['id_user']);
-            if ($tags) {
-                $tags_sql = " AND tae.id_agente_modulo IN ( SELECT id_agente_modulo 
-                                                           FROM ttag_module 
-                                                           WHERE id_tag IN ($tags) ) ";
-            } else {
-                $tags_sql = '';
-            }
-
             if (is_array($id_group)) {
                 $id_group = implode(',', $id_group);
             }
 
-            // for stats modules
+            $agent_table = (is_metaconsole() === true) ? 'tmetaconsole_agent' : 'tagente';
-            $sql = "SELECT tg.id_grupo as id, tg.nombre as name, 
+            $agent_secondary_table = (is_metaconsole() === true) ? 'tmetaconsole_agent_secondary_group' : 'tagent_secondary_group';
-                    SUM(tae.estado=0) as monitor_ok,
-                    SUM(tae.estado=1) as monitor_critical,
-                    SUM(tae.estado=2) as monitor_warning,
-                    SUM(tae.estado=3) as monitor_unknown,
-                    SUM(tae.estado=4) as monitor_not_init,
-                    COUNT(tae.estado) as monitor_total
-
-                    FROM
-                        tagente_estado tae,
-                        tagente        ta,
-                        tagente_modulo tam,
-                        tgrupo         tg
-    
-                    WHERE 1=1
-                        AND tae.id_agente = ta.id_agente
-                        AND tae.id_agente_modulo = tam.id_agente_modulo
-                        AND ta.id_grupo = tg.id_grupo
-                        AND tam.disabled = 0
-                        AND ta.disabled = 0
-                        AND ta.id_grupo IN ($id_group) $tags_sql 
-                    GROUP BY tg.id_grupo;";
-            $data_array = db_get_all_rows_sql($sql);
-
-            $data = $data_array[0];
-
-            // Get alerts configured, except disabled
-            $data['monitor_alerts'] += groups_monitor_alerts($group_array);
-
-            // Get alert configured currently FIRED, except disabled
-            $data['monitor_alerts_fired'] += groups_monitor_fired_alerts($group_array);
-
-            // for stats agents
-            $sql = "SELECT tae.id_agente id_agente, tg.id_grupo id_grupo,
-                    SUM(tae.estado=0) as monitor_agent_ok,
-                    SUM(tae.estado=1) as monitor_agent_critical,
-                    SUM(tae.estado=2) as monitor_agent_warning,
-                    SUM(tae.estado=3) as monitor_agent_unknown,
-                    SUM(tae.estado=4) as monitor_agent_not_init,
-                    COUNT(tae.estado) as monitor_agent_total
 
+            $sql = sprintf(
+                'SELECT tg.id_grupo AS id_group,
+                    IF (SUM(modules_total) IS NULL,0,SUM(modules_total)) AS modules,
+                    IF (SUM(modules_ok) IS NULL,0,SUM(modules_ok)) AS normal,
+                    IF (SUM(modules_critical) IS NULL,0,SUM(modules_critical)) AS critical,
+                    IF (SUM(modules_warning) IS NULL,0,SUM(modules_warning)) AS warning,
+                    IF (SUM(modules_unknown) IS NULL,0,SUM(modules_unknown)) AS unknown,
+                    IF (SUM(modules_not_init) IS NULL,0,SUM(modules_not_init)) AS `non-init`,
+                    IF (SUM(alerts_fired) IS NULL,0,SUM(alerts_fired)) AS alerts_fired,
+                    IF (SUM(agents_total) IS NULL,0,SUM(agents_total)) AS agents,
+                    IF (SUM(agents_unknown) IS NULL,0,SUM(agents_unknown)) AS agents_unknown,
+                    IF (SUM(agents_critical) IS NULL,0,SUM(agents_critical)) AS agents_critical,
+                    IF (SUM(agents_warnings) IS NULL,0,SUM(agents_warnings)) AS agents_warnings,
+                    IF (SUM(agents_not_init) IS NULL,0,SUM(agents_not_init)) AS agents_not_init,
+                    IF (SUM(agents_normal) IS NULL,0,SUM(agents_normal)) AS agents_normal,
+                    UNIX_TIMESTAMP() AS utimestamp
                 FROM
-                    tagente_estado tae,
+                (
-                    tagente        ta,
+                    SELECT SUM(ta.normal_count) AS modules_ok,
-                    tagente_modulo tam,
+                        SUM(ta.critical_count) AS modules_critical,
-                    tgrupo         tg
+                        SUM(ta.warning_count) AS modules_warning,
+                        SUM(ta.unknown_count) AS modules_unknown,
+                        SUM(ta.notinit_count) AS modules_not_init,
+                        SUM(ta.total_count) AS modules_total,
+                        SUM(ta.fired_count) AS alerts_fired,
+                        SUM(IF(ta.critical_count > 0, 1, 0)) AS agents_critical,
+                        SUM(IF(ta.warning_count > 0 AND ta.critical_count = 0, 1, 0)) AS agents_warnings,
+                        SUM(IF(ta.total_count = ta.notinit_count OR ta.total_count = 0, 1, 0)) AS agents_not_init,
+                        SUM(IF(ta.critical_count = 0 AND ta.warning_count = 0 AND ta.unknown_count = 0 AND ta.normal_count > 0, 1, 0)) AS agents_normal,
+                        SUM(IF(ta.critical_count = 0 AND ta.warning_count = 0 AND ta.unknown_count > 0, 1, 0)) AS agents_unknown,
+                        COUNT(ta.id_agente) AS agents_total,
+                        ta.id_grupo AS g
+                    FROM %s ta
+                    WHERE ta.disabled = 0
+                        AND ta.id_grupo IN (%s)
+                    GROUP BY g
+                    UNION ALL
+                    SELECT SUM(ta.normal_count) AS modules_ok,
+                        SUM(ta.critical_count) AS modules_critical,
+                        SUM(ta.warning_count) AS modules_warning,
+                        SUM(ta.unknown_count) AS modules_unknown,
+                        SUM(ta.notinit_count) AS modules_not_init,
+                        SUM(ta.total_count) AS modules_total,
+                        SUM(ta.fired_count) AS alerts_fired,
+                        SUM(IF(ta.critical_count > 0, 1, 0)) AS agents_critical,
+                        SUM(IF(ta.warning_count > 0 AND ta.critical_count = 0, 1, 0)) AS agents_warnings,
+                        SUM(IF(ta.total_count = ta.notinit_count OR ta.total_count = 0, 1, 0)) AS agents_not_init,
+                        SUM(IF(ta.critical_count = 0 AND ta.warning_count = 0 AND ta.unknown_count = 0 AND ta.normal_count > 0, 1, 0)) AS agents_normal,
+                        SUM(IF(ta.critical_count = 0 AND ta.warning_count = 0 AND ta.unknown_count > 0, 1, 0)) AS agents_unknown,
+                        COUNT(ta.id_agente) AS agents_total,
+                        tasg.id_group AS g
+                    FROM %s ta
+                    LEFT JOIN %s tasg
+                        ON ta.id_agente = tasg.id_agent
+                    WHERE ta.disabled = 0
+                        AND (ta.id_grupo IN (%s) OR tasg.id_group IN (%s))
+                    GROUP BY g
+                ) counters
+                RIGHT JOIN tgrupo tg
+                    ON counters.g = tg.id_grupo
+                WHERE tg.id_grupo IN (%s)
+                GROUP BY tg.id_grupo',
+                $agent_table,
+                $id_group,
+                $agent_table,
+                $agent_secondary_table,
+                $id_group,
+                $id_group,
+                $id_group
+            );
 
-                WHERE 1=1
+            $group_stat = db_get_all_rows_sql($sql);
-                    AND tae.id_agente = ta.id_agente
+            $data = [
-                    AND tae.id_agente_modulo = tam.id_agente_modulo
+                'monitor_checks'            => (int) $group_stat[0]['modules'],
-                    AND ta.id_grupo = tg.id_grupo
+                'monitor_alerts'            => (int) groups_monitor_alerts($group_array),
-                    AND tam.disabled = 0
+                'monitor_alerts_fired'      => (int) $group_stat[0]['alerts_fired'],
-                    AND ta.disabled = 0
+                'monitor_alerts_fire_count' => (int) $group_stat[0]['alerts_fired'],
-                    AND ta.id_grupo IN ($id_group) $tags_sql
+                'monitor_ok'                => (int) $group_stat[0]['normal'],
-                GROUP BY tae.id_agente;";
+                'monitor_warning'           => (int) $group_stat[0]['warning'],
-            $data_array_2 = db_get_all_rows_sql($sql);
+                'monitor_critical'          => (int) $group_stat[0]['critical'],
-
+                'monitor_unknown'           => (int) $group_stat[0]['unknown'],
-            if (is_array($data_array_2) || is_object($data_array_2)) {
+                'monitor_not_init'          => (int) $group_stat[0]['non-init'],
-                foreach ($data_array_2 as $key => $value) {
+                'agent_not_init'            => (int) $group_stat[0]['agents_not_init'],
-                    if ($value['monitor_agent_critical'] != 0) {
+                'agent_unknown'             => (int) $group_stat[0]['agents_unknown'],
-                        $data['agent_critical'] ++;
+                'agent_ok'                  => (int) $group_stat[0]['agents_normal'],
-                    } else if ($value['monitor_agent_critical'] == 0 && $value['monitor_agent_warning'] != 0) {
+                'agent_warning'             => (int) $group_stat[0]['agents_warnings'],
-                        $data['agent_warning'] ++;
+                'agent_critical'            => (int) $group_stat[0]['agents_critical'],
-                    } else if ($value['monitor_agent_critical'] == 0 && $value['monitor_agent_warning'] == 0
+                'total_checks'              => (int) $group_stat[0]['modules'],
-                        && $value['monitor_agent_unknown'] != 0
+                'total_alerts'              => (int) groups_monitor_alerts($group_array),
-                    ) {
+                'total_agents'              => (int) $group_stat[0]['agents'],
-                        $data['agent_unknown'] ++;
+                'utimestamp'                => (int) $group_stat[0]['utimestamp'],
-                    } else if ($value['monitor_agent_critical'] == 0 && $value['monitor_agent_warning'] == 0
+            ];
-                        && $value['monitor_agent_unknown'] == 0 && $value['monitor_agent_ok'] != 0
-                    ) {
-                        $data['agent_ok'] ++;
-                    } else if ($value['monitor_agent_critical'] == 0 && $value['monitor_agent_warning'] == 0
-                        && $value['monitor_agent_unknown'] == 0 && $value['monitor_agent_ok'] == 0
-                        && $value['monitor_agent_not_init'] != 0
-                    ) {
-                        $data['agent_not_init'] ++;
-                    }
-
-                    $data['total_agents'] ++;
-                }
-            }
-
-            // Get total count of monitors for this group, except disabled.
-            $data['monitor_checks'] = ($data['monitor_not_init'] + $data['monitor_unknown'] + $data['monitor_warning'] + $data['monitor_critical'] + $data['monitor_ok']);
-
-            // Calculate not_normal monitors
-            $data['monitor_not_normal'] += ($data['monitor_checks'] - $data['monitor_ok']);
         }
-
-        // Get total count of monitors for this group, except disabled.
-        $data['monitor_checks'] = ($data['monitor_not_init'] + $data['monitor_unknown'] + $data['monitor_warning'] + $data['monitor_critical'] + $data['monitor_ok']);
     }
 
     if ($data['monitor_unknown'] > 0 && $data['monitor_checks'] > 0) {
@@ -11256,7 +11339,7 @@ function reporting_tiny_stats(
 
     if (isset($counts_info['total_count'])) {
         $not_init = isset($counts_info['notinit_count']) ? $counts_info['notinit_count'] : 0;
-        $total_count = ($counts_info['total_count'] - $not_init);
+        $total_count = $counts_info['total_count'];
         $stats[] = [
             'name'  => 'total_count',
             'count' => $total_count,

pandora_console/include/functions_tactical.php

@@ -142,7 +142,7 @@ function tactical_get_data($id_user=false, $user_strict=false, $acltags, $return
                 $list['_monitors_warning_'] += (int) $value['monitors_warning'];
                 $list['_monitors_unknown_'] += (int) $value['monitors_unknown'];
                 $list['_monitors_not_init_'] += (int) $value['monitors_not_init'];
-                $list['_monitor_alerts_fire_count_'] += (int) $value['alerts_fired'];
+                $list['_monitors_alerts_fired_'] += (int) $value['alerts_fired'];
             }
 
             if (!empty($data_stats_unknown)) {

pandora_console/include/functions_treeview.php

@@ -529,16 +529,16 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
         }
     }
 
-    // Get the agent info
+    // Get the agent info.
     $agent = db_get_row('tagente', 'id_agente', $id_agente);
     if ($agent == false) {
         return;
     }
 
-    // Check all groups
+    // Check all groups.
     $groups = agents_get_all_groups_agent($id_agente, $agent['id_grupo']);
 
-    if (is_metaconsole()) {
+    if (is_metaconsole() === true) {
         if (! check_acl_one_of_groups($config['id_user'], $groups, 'AR', false)
             && ! check_acl_one_of_groups($config['id_user'], $groups, 'AW', false)
         ) {
@@ -548,7 +548,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
         }
     }
 
-    if (is_metaconsole()) {
+    if (is_metaconsole() === true) {
         metaconsole_restore_db();
     }
 
@@ -565,6 +565,12 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
         return;
     }
 
+    if (is_metaconsole()) {
+        if (metaconsole_connect($server_data) != NOERR) {
+            return;
+        }
+    }
+
     if ($agent === false) {
         ui_print_error_message(__('There was a problem loading agent'));
         if (!empty($server_data) && is_metaconsole()) {

pandora_console/include/functions_ui.php

@@ -1473,15 +1473,16 @@ function ui_require_css_file($name, $path='include/styles/', $echo_tag=false)
         && ! file_exists($config['homedir'].'/'.$filename)
         && ! file_exists($config['homedir'].'/'.ENTERPRISE_DIR.'/'.$filename)
     ) {
-        return false;
+        if (is_metaconsole() === true
-    }
+            && file_exists('/../../'.$filename) === true
-
+        ) {
-    if (is_metaconsole()) {
+            $filename = '/../../'.$filename;
-        $config['css'][$name] = '/../../'.$filename;
+        } else {
-    } else {
+            return false;
-        $config['css'][$name] = $filename;
+        }
     }
 
+    $config['css'][$name] = $filename;
     return true;
 }
 
@@ -2821,7 +2822,8 @@ function ui_print_status_sets(
     $title='',
     $return=false,
     $options=false,
-    $extra_info=''
+    $extra_info='',
+    $get_status_color=true
 ) {
     global $config;
 
@@ -2830,9 +2832,13 @@ function ui_print_status_sets(
     }
 
     if (isset($options['style'])) {
-        $options['style'] .= ' background: '.modules_get_color_status($status).'; display: inline-block;';
+        $options['style'] .= ' display: inline-block;';
     } else {
-        $options['style'] = 'background: '.modules_get_color_status($status).'; display: inline-block;';
+        $options['style'] = 'display: inline-block;';
+    }
+
+    if ($get_status_color === true) {
+        $options['style'] .= ' background: '.modules_get_color_status($status).';';
     }
 
     if (isset($options['class'])) {
@@ -5701,7 +5707,7 @@ function ui_print_module_string_value(
                 $title_dialog = modules_get_agentmodule_agent_alias($id_agente_module).' / '.$module_name;
                 $salida = '<div '."id='hidden_value_module_".$id_agente_module."'
 					style='display: none; width: 100%; height: 100%; overflow: auto; padding: 10px; font-size: 14px; line-height: 16px; font-family: mono,monospace; text-align: left' title='".$title_dialog."'>".$value.'</div><span '."id='value_module_".$id_agente_module."'
-					style='white-space: nowrap;'>".'<span id="value_module_text_'.$id_agente_module.'">'.$sub_string.'</span> '."<a href='javascript: toggle_full_value(".$id_agente_module.")'>".html_print_image('images/zoom.png', true).'</a></span>';
+					style='white-space: nowrap;'>".'<span id="value_module_text_'.$id_agente_module.'">'.$sub_string.'</span> '."<a href='javascript: toggle_full_value(".$id_agente_module.")'>".html_print_image('images/zoom.png', true, ['style' => 'max-height: 20px; vertical-align: middle;']).'</a></span>';
             }
         }
     }
@@ -5822,6 +5828,7 @@ function ui_get_snapshot_image($link, $is_image)
             'border' => '0',
             'alt'    => '',
             'title'  => __('Snapshot view'),
+            'style'  => 'max-height: 20px; vertical-align: middle;',
         ]
     ).'</a>';
 

pandora_console/include/functions_visual_map.php

@@ -1712,7 +1712,7 @@ function visual_map_print_item(
                 $img_style_title = strip_tags($label);
                 if ($layoutData['type'] == STATIC_GRAPH) {
                     if ($layoutData['id_agente_modulo'] != 0) {
-                        if ($layoutData['id_metaconsole'] != 0) {
+                        if (is_metaconsole() && $layoutData['id_metaconsole'] != 0) {
                             // Metaconsole db connection
                             $connection = db_get_row_filter(
                                 'tmetaconsole_setup',

pandora_console/include/javascript/ace/ace.js

@@ -1606,7 +1606,7 @@ ace.define(
       if (e.type == "dblclick") return 0;
       if (
         e.type == "contextmenu" ||
-        (useragent.isMac && (e.ctrlKey && !e.altKey && !e.shiftKey))
+        (useragent.isMac && e.ctrlKey && !e.altKey && !e.shiftKey)
       )
         return 2;
       return e.button;

pandora_console/include/lib/Dashboard/Manager.php

@@ -702,8 +702,8 @@ class Manager
                 FROM tdashboard td
                 LEFT JOIN twidget_dashboard twd
                     ON td.id = twd.id_dashboard
-				WHERE (td.id_group IN (%s) AND td.id_user = '') OR
+				WHERE ((td.id_group IN (%s) AND td.id_user = '') OR
-					td.id_user = '%s' %s
+					td.id_user = '%s') %s
                 GROUP BY td.id
 				ORDER BY name%s",
                     $string_groups,

pandora_console/include/lib/Dashboard/Widgets/maps_made_by_user.php

@@ -368,26 +368,27 @@ class MapsMadeByUser extends Widget
         // of the visual consoles.
         $output .= '<style type="text/css">';
         $output .= '.c-'.$uniq.', .c-'.$uniq.' *:not(.parent_graph p table tr td span) { font-size: '.(8 * $ratio_t).'pt; line-height:'.(8 * ($ratio_t) * 1.5).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_4pt, .c-'.$uniq.' .visual_font_size_4pt * { font-size: '.(4 * $ratio_t).'pt; line-height:'.(4 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual-console-item-label table tr td span { font-size: '.(4 * $ratio_t).'pt; line-height:'.(4 * $ratio_t * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_6pt, .c-'.$uniq.' .visual_font_size_6pt * { font-size: '.(6 * $ratio_t).'pt; line-height:'.(6 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_4pt, .c-'.$uniq.' .visual_font_size_4pt * { font-size: '.(4 * $ratio_t).'pt; line-height:'.(4 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_8pt, .c-'.$uniq.' .visual_font_size_8pt * { font-size: '.(8 * $ratio_t).'pt; line-height:'.(8 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_6pt, .c-'.$uniq.' .visual_font_size_6pt * { font-size: '.(6 * $ratio_t).'pt; line-height:'.(6 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_10pt, .c-'.$uniq.' .visual_font_size_10pt * { font-size: '.(10 * $ratio_t).'pt; line-height:'.(10 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_8pt, .c-'.$uniq.' .visual_font_size_8pt * { font-size: '.(8 * $ratio_t).'pt; line-height:'.(8 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_12pt, .c-'.$uniq.' .visual_font_size_12pt * { font-size: '.(12 * $ratio_t).'pt; line-height:'.(12 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_10pt, .c-'.$uniq.' .visual_font_size_10pt * { font-size: '.(10 * $ratio_t).'pt; line-height:'.(10 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_14pt, .c-'.$uniq.' .visual_font_size_14pt * { font-size: '.(14 * $ratio_t).'pt; line-height:'.(14 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_12pt, .c-'.$uniq.' .visual_font_size_12pt * { font-size: '.(12 * $ratio_t).'pt; line-height:'.(12 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_18pt, .c-'.$uniq.' .visual_font_size_18pt * { font-size: '.(18 * $ratio_t).'pt; line-height:'.(18 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_14pt, .c-'.$uniq.' .visual_font_size_14pt * { font-size: '.(14 * $ratio_t).'pt; line-height:'.(14 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_24pt, .c-'.$uniq.' .visual_font_size_24pt * { font-size: '.(24 * $ratio_t).'pt; line-height:'.(24 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_18pt, .c-'.$uniq.' .visual_font_size_18pt * { font-size: '.(18 * $ratio_t).'pt; line-height:'.(18 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_28pt, .c-'.$uniq.' .visual_font_size_28pt * { font-size: '.(28 * $ratio_t).'pt; line-height:'.(28 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_24pt, .c-'.$uniq.' .visual_font_size_24pt * { font-size: '.(24 * $ratio_t).'pt; line-height:'.(24 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_36pt, .c-'.$uniq.' .visual_font_size_36pt * { font-size: '.(36 * $ratio_t).'pt; line-height:'.(36 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_28pt, .c-'.$uniq.' .visual_font_size_28pt * { font-size: '.(28 * $ratio_t).'pt; line-height:'.(28 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_48pt, .c-'.$uniq.' .visual_font_size_48pt * { font-size: '.(48 * $ratio_t).'pt; line-height:'.(48 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_36pt, .c-'.$uniq.' .visual_font_size_36pt * { font-size: '.(36 * $ratio_t).'pt; line-height:'.(36 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_60pt, .c-'.$uniq.' .visual_font_size_60pt * { font-size: '.(60 * $ratio_t).'pt; line-height:'.(60 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_48pt, .c-'.$uniq.' .visual_font_size_48pt * { font-size: '.(48 * $ratio_t).'pt; line-height:'.(48 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_72pt, .c-'.$uniq.' .visual_font_size_72pt * { font-size: '.(72 * $ratio_t).'pt; line-height:'.(72 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_60pt, .c-'.$uniq.' .visual_font_size_60pt * { font-size: '.(60 * $ratio_t).'pt; line-height:'.(60 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_84pt, .c-'.$uniq.' .visual_font_size_84pt * { font-size: '.(84 * $ratio_t).'pt; line-height:'.(84 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_72pt, .c-'.$uniq.' .visual_font_size_72pt * { font-size: '.(72 * $ratio_t).'pt; line-height:'.(72 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_96pt, .c-'.$uniq.' .visual_font_size_96pt * { font-size: '.(96 * $ratio_t).'pt; line-height:'.(96 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_84pt, .c-'.$uniq.' .visual_font_size_84pt * { font-size: '.(84 * $ratio_t).'pt; line-height:'.(84 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_116pt, .c-'.$uniq.' .visual_font_size_116pt * { font-size: '.(116 * $ratio_t).'pt; line-height:'.(116 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_96pt, .c-'.$uniq.' .visual_font_size_96pt * { font-size: '.(96 * $ratio_t).'pt; line-height:'.(96 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_128pt, .c-'.$uniq.' .visual_font_size_128pt * { font-size: '.(128 * $ratio_t).'pt; line-height:'.(128 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_116pt, .c-'.$uniq.' .visual_font_size_116pt * { font-size: '.(116 * $ratio_t).'pt; line-height:'.(116 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_140pt, .c-'.$uniq.' .visual_font_size_140pt * { font-size: '.(140 * $ratio_t).'pt; line-height:'.(140 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_128pt, .c-'.$uniq.' .visual_font_size_128pt * { font-size: '.(128 * $ratio_t).'pt; line-height:'.(128 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_154pt, .c-'.$uniq.' .visual_font_size_154pt * { font-size: '.(154 * $ratio_t).'pt; line-height:'.(154 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_140pt, .c-'.$uniq.' .visual_font_size_140pt * { font-size: '.(140 * $ratio_t).'pt; line-height:'.(140 * ($ratio_t) * 1.8).'pt; }';
-        $output .= '.c-'.$uniq.' .visual_font_size_196pt, .c-'.$uniq.' .visual_font_size_196pt * { font-size: '.(196 * $ratio_t).'pt; line-height:'.(196 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_154pt, .c-'.$uniq.' .visual_font_size_154pt * { font-size: '.(154 * $ratio_t).'pt; line-height:'.(154 * ($ratio_t) * 1.8).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_196pt, .c-'.$uniq.' .visual_font_size_196pt * { font-size: '.(196 * $ratio_t).'pt; line-height:'.(196 * ($ratio_t) * 1.8).'pt; }';
         $output .= '.c-'.$uniq.' .flot-text, .c-'.$uniq.' .flot-text * { font-size: '.(8 * $ratio_t).'pt !important; line-height:'.(8 * ($ratio_t)).'pt !important; }';
         $output .= '.c-'.$uniq.' .visual-console-item .digital-clock span.time {font-size: '.(50 * $ratio_t).'px !important; line-height: '.(50 * $ratio_t).'px !important;}';
         $output .= '.c-'.$uniq.' .visual-console-item .digital-clock span.date {font-size: '.(25 * $ratio_t).'px !important; line-height: '.(25 * $ratio_t).'px !important;}';

pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php

@@ -167,10 +167,12 @@ final class DonutGraph extends Item
             );
         } else {
             $src = 'images/console/signes/wrong_donut_graph.png';
-            if (\is_metaconsole() === true && $metaconsoleId !== null) {
+            if (\is_metaconsole() === true) {
                 $src = '../../'.$src;
             }
 
+            $src = ui_get_full_url($src);
+
             $style = 'width:'.$width.'px; height:'.$height.'px;';
             $data['html'] = '<img src="'.$src.'" style="'.$style.'">';
         }

pandora_console/include/styles/pandora.css

@@ -4776,7 +4776,9 @@ input:checked + .p-slider:before {
 }
 
 .edit_user_info_right #password_new,
-.edit_user_info_right #password_conf {
+.edit_user_info_right #password_conf,
+.edit_user_info_right #own_password_confirm,
+.edit_user_info_right #current_password {
   background-image: url("../../images/user_password.png");
 }
 

pandora_console/include/styles/visual_maps.css

@@ -8,6 +8,23 @@ div#vc-controls {
   position: fixed;
   top: 30px;
   right: 20px;
+  width: 350px;
+  background-color: #ececec;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 5px;
+  border-radius: 3px;
+}
+
+div#vc-controls div#menu_tab {
+  margin: 0px;
+}
+
+div#vc-controls ul.white-box-content {
+  background-color: #ececec;
+  border: 0px;
 }
 
 div#vc-controls div.vc-title,

pandora_console/index.php

@@ -1216,6 +1216,11 @@ if ($searchPage) {
                         $_GET[$key] = $param;
                     }
                 break;
+
+                case 'External link':
+                    $home_url = io_safe_output($home_url);
+                    echo '<script type="text/javascript">document.location="'.$home_url.'"</script>';
+                break;
             }
 
             if (isset($_GET['sec2'])) {

pandora_console/install.php

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

pandora_console/operation/agentes/status_monitor.php

@@ -75,6 +75,7 @@ if (! defined('METACONSOLE')) {
         exit();
     }
 } else {
+    $section = (string) get_parameter('sec', 'estado');
     ui_meta_print_header(__('Monitor view'));
 }
 
@@ -740,7 +741,7 @@ foreach ($custom_fields as $custom_field) {
     $table_custom_fields->data[] = $row;
 }
 
-$filters = '<form method="post" action="index.php?sec=view&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params.'">';
+$filters = '<form method="post" action="index.php?sec='.$section.'&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params.'">';
 if (is_metaconsole()) {
     $table->colspan[4][0] = 7;
     $table->cellstyle[4][0] = 'padding: 10px;';
@@ -755,7 +756,7 @@ if (is_metaconsole()) {
 
     $filters .= html_print_table($table, true);
     $filters .= '</form>';
-    ui_toggle($filters, __('Show Options'), '', '', false);
+    ui_toggle($filters, __('Show filters'), '', '', false);
 } else {
     $table->colspan[4][0] = 7;
     $table->cellstyle[4][0] = 'padding-left: 10px;';
@@ -1141,16 +1142,16 @@ if (($config['dbtype'] == 'oracle') && ($result !== false)) {
 
 
 // Urls to sort the table.
-$url_agent_name = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_agent_name = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
-$url_type = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_type = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
-$url_module_name = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_module_name = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
-$url_server_type = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_server_type = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
-$url_interval = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_interval = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
-$url_status = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_status = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
-$url_status = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_status = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
-$url_data = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_data = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
-$url_timestamp_up = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_timestamp_up = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
-$url_timestamp_down = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_timestamp_down = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
 
 $url_agent_name .= '&refr='.$refr.'&datatype='.$datatype.'&moduletype='.$moduletype.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
 $url_type .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;

pandora_console/operation/users/user_edit.php

@@ -72,6 +72,7 @@ if (isset($_GET['modified']) && !$view_mode) {
     $upd_info['lastname'] = get_parameter_post('lastname', $user_info['lastname']);
     $password_new = get_parameter_post('password_new', '');
     $password_confirm = get_parameter_post('password_conf', '');
+    $current_password = get_parameter_post('current_password', '');
     $upd_info['email'] = get_parameter_post('email', '');
     $upd_info['phone'] = get_parameter_post('phone', '');
     $upd_info['comments'] = get_parameter_post('comments', '');
@@ -144,21 +145,37 @@ if (isset($_GET['modified']) && !$view_mode) {
     }
 
     if (!empty($password_new)) {
+        $correct_password = false;
+
+        $user_credentials_check = process_user_login($config['id_user'], $current_password, true);
+
+        if ($user_credentials_check !== false) {
+            $correct_password = true;
+        }
+
         if ($config['user_can_update_password'] && $password_confirm == $password_new) {
-            if ((!$is_admin || $config['enable_pass_policy_admin'])
+            if ($correct_password === true) {
-                && $config['enable_pass_policy']
+                if ((!$is_admin || $config['enable_pass_policy_admin'])
-            ) {
+                    && $config['enable_pass_policy']
-                $pass_ok = login_validate_pass($password_new, $id, true);
+                ) {
-                if ($pass_ok != 1) {
+                    $pass_ok = login_validate_pass($password_new, $id, true);
-                    ui_print_error_message($pass_ok);
+                    if ($pass_ok != 1) {
+                        ui_print_error_message($pass_ok);
+                    } else {
+                        $return = update_user_password($id, $password_new);
+                        if ($return) {
+                            $return2 = save_pass_history($id, $password_new);
+                        }
+                    }
                 } else {
                     $return = update_user_password($id, $password_new);
-                    if ($return) {
-                        $return2 = save_pass_history($id, $password_new);
-                    }
                 }
             } else {
-                $return = update_user_password($id, $password_new);
+                if ($current_password === '') {
+                    $error_msg = __('Current password of user is required to perform password change');
+                } else {
+                    $error_msg = __('Current password of user is not correct');
+                }
             }
         } else if ($password_new !== 'NON-INIT') {
             $error_msg = __('Passwords didn\'t match or other problem encountered while updating passwords');
@@ -280,9 +297,11 @@ if ($view_mode === false) {
     if ($config['user_can_update_password']) {
         $new_pass = '<div class="label_select_simple"><span>'.html_print_input_text_extended('password_new', '', 'password_new', '', '25', '45', $view_mode, '', ['class' => 'input', 'placeholder' => __('New Password')], true, true).'</span></div>';
         $new_pass_confirm = '<div class="label_select_simple"><span>'.html_print_input_text_extended('password_conf', '', 'password_conf', '', '20', '45', $view_mode, '', ['class' => 'input', 'placeholder' => __('Password confirmation')], true, true).'</span></div>';
+        $current_pass = '<div class="label_select_simple"><span>'.html_print_input_text_extended('current_password', '', 'current_password', '', '20', '45', $view_mode, '', ['class' => 'input', 'placeholder' => __('Current password')], true, true).'</span></div>';
     } else {
         $new_pass = '<i>'.__('You cannot change your password under the current authentication scheme').'</i>';
         $new_pass_confirm = '';
+        $current_pass = '';
     }
 }
 
@@ -634,7 +653,7 @@ if (is_metaconsole()) {
             <div class="user_edit_first_row">
                 <div class="edit_user_info white_box">
                     <div class="edit_user_info_left">'.$avatar.$user_id.'</div>
-                    <div class="edit_user_info_right">'.$full_name.$email.$phone.$new_pass.$new_pass_confirm.'</div>
+                    <div class="edit_user_info_right">'.$full_name.$email.$phone.$new_pass.$new_pass_confirm.$current_pass.'</div>
                 </div>  
                 <div class="edit_user_autorefresh white_box">'.$autorefresh_show.$time_autorefresh.'</div>
             </div> 

pandora_console/pandora_console.redhat.spec

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

pandora_console/pandora_console.rhel7.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.751
-%define release     201214
+%define release     201223
 
 # 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.751
-%define release     201214
+%define release     201223
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb.sql

@@ -469,6 +469,11 @@ CREATE TABLE IF NOT EXISTS `talert_templates` (
 	`field13` text NOT NULL,
 	`field14` text NOT NULL,
 	`field15` text NOT NULL,
+	`field16` text NOT NULL,
+	`field17` text NOT NULL,
+	`field18` text NOT NULL,
+	`field19` text NOT NULL,
+	`field20` text NOT NULL,
 	`type` ENUM ('regex', 'max_min', 'max', 'min', 'equal', 'not_equal', 'warning', 'critical', 'onchange', 'unknown', 'always', 'not_normal'),
 	`value` varchar(255) default '',
 	`matches_value` tinyint(1) default 0,
@@ -502,6 +507,11 @@ CREATE TABLE IF NOT EXISTS `talert_templates` (
 	`field13_recovery` text NOT NULL,
 	`field14_recovery` text NOT NULL,
 	`field15_recovery` text NOT NULL,
+	`field16_recovery` text NOT NULL,
+	`field17_recovery` text NOT NULL,
+	`field18_recovery` text NOT NULL,
+	`field19_recovery` text NOT NULL,
+	`field20_recovery` text NOT NULL,
 	`priority` tinyint(4) default '0',
 	`id_group` mediumint(8) unsigned NULL default 0,
 	`special_day` tinyint(1) default 0,

pandora_console/pandoradb_data.sql

@@ -109,10 +109,10 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('custom_report_front_logo', 'images/pandora_logo_white.jpg'),
 ('custom_report_front_header', ''),
 ('custom_report_front_footer', ''),
-('MR', 42),
+('MR', 43),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
-('current_package_enterprise', 750),
+('current_package_enterprise', 751),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.00097656250000":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'),
 ('custom_docs_logo', 'default_docs.png'),
 ('custom_support_logo', 'default_support.png'),
@@ -1348,255 +1348,252 @@ VALUES
 -- 
 -- Dumping data for table `tlayout_data`
 -- 
-INSERT INTO `tlayout_data`
+INSERT INTO `tlayout_data` VALUES
-VALUES
+	(1,1,998,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-  (1,1,998,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(2,1,998,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(2,1,998,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(3,1,1016,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(3,1,1016,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(4,1,1016,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(4,1,1016,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(5,1,1034,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(5,1,1034,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(6,1,1034,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(6,1,1034,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(7,1,1052,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(7,1,1052,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(8,1,1052,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(8,1,1052,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(9,1,1070,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(9,1,1070,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(10,1,1070,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(10,1,1070,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(11,1,1088,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(11,1,1088,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(12,1,1088,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(12,1,1088,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(13,1,1106,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(13,1,1106,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(14,1,1106,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(14,1,1106,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(15,1,1124,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(15,1,1124,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(16,1,1124,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(16,1,1124,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(17,1,1142,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(17,1,1142,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(18,1,1142,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(18,1,1142,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(19,1,1160,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(19,1,1160,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(20,1,1160,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(20,1,1160,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(21,1,1178,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(21,1,1178,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(22,1,1178,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(22,1,1178,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(23,1,1196,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(23,1,1196,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(24,1,1196,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(24,1,1196,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(25,1,1214,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(25,1,1214,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(26,1,1214,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(26,1,1214,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(27,1,1232,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(27,1,1232,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(28,1,1232,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(28,1,1232,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(29,1,1250,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(29,1,1250,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(30,1,1250,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(30,1,1250,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(31,1,1268,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(31,1,1268,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(32,1,1268,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(32,1,1268,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(33,1,1286,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(33,1,1286,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(34,1,1286,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(34,1,1286,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(35,1,1286,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(35,1,1286,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(36,1,1304,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(36,1,1304,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(37,1,1304,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(37,1,1304,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(38,1,1322,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(38,1,1322,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(39,1,1322,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(39,1,1322,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(40,1,1340,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(40,1,1340,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(41,1,1507,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(41,1,1507,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(42,1,1536,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(42,1,1536,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(43,1,1568,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(43,1,1568,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(44,1,1599,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(44,1,1599,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(45,1,1627,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(45,1,1627,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(46,1,1656,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(46,1,1656,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(47,1,1685,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(47,1,1685,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(48,1,1714,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(48,1,1714,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(49,1,1743,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(49,1,1743,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(50,1,1772,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(50,1,1772,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(51,1,1449,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(51,1,1449,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(52,1,1800,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(52,1,1800,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(53,1,1413,243,205,426,'','rack_frame',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(53,1,1413,243,205,426,'','rack_frame',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(54,1,962,381,73,408,'','rack_firewall',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(54,1,962,381,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(55,1,962,454,73,408,'','rack_pdu',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(55,1,962,454,73,408,'','rack_pdu',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(56,1,530,732,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(56,1,530,732,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(57,1,962,233,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(57,1,962,233,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(58,1,962,307,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(58,1,962,307,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(59,1,530,658,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(59,1,530,658,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(60,1,530,350,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(60,1,530,350,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(61,1,530,204,73,408,'','rack_psa',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(61,1,530,204,73,408,'','rack_psa',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(62,1,530,277,73,408,'','rack_pdu',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(62,1,530,277,73,408,'','rack_pdu',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(63,1,530,585,73,408,'','rack_firewall',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(63,1,530,585,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(64,1,530,424,161,411,'','rack_double_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(64,1,530,424,161,411,'','rack_double_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(65,1,1426,448,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(65,1,1426,448,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(66,1,1495,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(66,1,1495,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(67,1,1423,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(67,1,1423,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(68,1,1463,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(68,1,1463,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(69,1,1433,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(69,1,1433,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(70,1,74,733,73,408,'','rack_pdu',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(70,1,74,733,73,408,'','rack_pdu',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(71,1,1098,701,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(71,1,1098,701,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(72,1,1148,701,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(72,1,1148,701,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(73,1,1340,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(73,1,1340,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(74,1,1358,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(74,1,1358,783,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(75,1,1358,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(75,1,1358,699,80,18,'','rack_hard_disk_2',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(76,1,1143,783,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(76,1,1143,783,80,18,'','rack_hard_disk',0,3600,9,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(77,1,962,682,205,426,'','rack_frame',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(77,1,962,682,205,426,'','rack_frame',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(78,1,1522,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(78,1,1522,540,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(79,1,1419,521,205,426,'','rack_frame',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(79,1,1419,521,205,426,'','rack_frame',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(80,1,74,278,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(80,1,74,278,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(81,1,74,572,161,411,'','rack_double_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(81,1,74,572,161,411,'','rack_double_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(82,1,1418,729,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(82,1,1418,729,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(83,1,962,527,73,408,'','rack_switch',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(83,1,962,527,73,408,'','rack_switch',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(84,1,74,352,73,408,'','rack_router',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(84,1,74,352,73,408,'','rack_router',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(85,1,962,600,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(85,1,962,600,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(86,1,530,806,73,408,'','rack_firewall',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(86,1,530,806,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(87,1,74,425,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(87,1,74,425,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(88,1,74,499,73,408,'','rack_switch',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(88,1,74,499,73,408,'','rack_switch',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(89,1,74,806,73,408,'','rack_psa',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(89,1,74,806,73,408,'','rack_psa',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(90,1,74,204,74,413,'','rack_server',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(90,1,74,204,74,413,'','rack_server',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(91,1,1424,806,73,408,'','rack_firewall',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(91,1,1424,806,73,408,'','rack_firewall',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(92,1,1486,907,0,0,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 8 - </span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 2</span></p>','white',4,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(92,1,1486,907,0,0,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 8 - </span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 2</span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(93,1,1048,889,58,281,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 8 - </span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 1</span></p>','white',4,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(93,1,1048,889,58,281,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 8 - </span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 1</span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(94,1,580,904,0,0,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 7 - </span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 2</span></p>','white',4,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(94,1,580,904,0,0,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 7 - </span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 2</span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(95,1,132,907,0,0,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 7 - </span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 1</span></p>','white',4,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(95,1,132,907,0,0,'<p style="text-align: center; overflow: hidden;"><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;"><strong><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Office 7 - </span></strong></span><span class="visual_font_size_28pt" style="color: #ffffff; font-family: opensans;">Rack 1</span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(96,1,733,20,0,0,'<p style="overflow: hidden;"><span class="visual_font_size_48pt"><strong><span style="color: #ffffff; font-family: opensans;">OFFICE RACKS</span></strong></span></p>','white',4,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(96,1,733,20,0,0,'<p style="overflow: hidden;"><span class="visual_font_size_48pt"><strong><span style="color: #ffffff; font-family: opensans;">OFFICE RACKS</span></strong></span></p>','white',4,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(97,1,1479,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,60),
-	(97,1,1479,260,174,29,'','rack_server_rack',0,3600,1,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60),
+	(98,2,709,103,0,400,'','white',19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','timedate','Europe/Madrid',0,0),
-    (98,2,709,103,0,400,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','timedate','Europe/Madrid',0,0),
+	(99,2,178,481,111,111,'','status',0,3600,11556,430,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (99,2,178,481,111,111,'','status',0,3600,11556,430,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(100,2,542,481,111,111,'','status',0,3600,13,2,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (100,2,542,481,111,111,'','status',0,3600,13,2,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(101,2,905,481,111,111,'','status',0,3600,114,11,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (101,2,905,481,111,111,'','status',0,3600,114,11,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(102,2,1276,481,111,111,'','status',0,3600,7,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (102,2,1276,481,111,111,'','status',0,3600,7,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(103,2,1631,482,111,111,'','status',0,3600,11547,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (103,2,1631,482,111,111,'','status',0,3600,11547,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(104,2,157,393,0,0,'<p style=\"line-height: 18px;\"><span class=\"visual_font_size_28pt\" style=\"line-height: 18px; color: #ffffff;\">Backups</span></p>\n<p style=\"line-height: 18px;\"> </p>','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (104,2,157,393,0,0,'<p style=\"line-height: 18px;\"><span class=\"visual_font_size_28pt\" style=\"line-height: 18px; color: #ffffff;\">Backups</span></p>\n<p style=\"line-height: 18px;\"> </p>','white',              
+	(105,2,512,382,96,172,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;font-family:&#x20;opensans;&#x20;color:&#x20;#ffffff;&quot;&gt;DB&#x20;Status&lt;/span&gt;&lt;/p&gt;&#x0a;&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&amp;nbsp;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),     
+	(106,2,886,382,0,0,'<p style=\"line-height: 18px; overflow: hidden;\"><span class=\"visual_font_size_28pt\" style=\"color: #ffffff; font-family: opensans;\">Disk slave</span></p>\n<p style=\"line-height: 18px; overflow: hidden;\"> </p>','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (105,2,512,382,96,172,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;font-family:&#x20;opensans;&#x20;color:&#x20;#ffffff;&quot;&gt;DB&#x20;Status&lt;/span&gt;&lt;/p&gt;&#x0a;&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&amp;nbsp;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),            
+	(107,2,1251,382,0,0,'<p style=\"line-height: 18px; overflow: hidden;\"><span class=\"visual_font_size_28pt\" style=\"color: #ffffff; font-family: opensans;\">Disk /var</span></p>\n<p style=\"line-height: 18px; overflow: hidden;\"> </p>','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (106,2,886,382,0,0,'<p style=\"line-height: 18px; overflow: hidden;\"><span class=\"visual_font_size_28pt\" style=\"color: #ffffff; font-family: opensans;\">Disk slave</span></p>\n<p style=\"line-height: 18px; overflow: hidden;\"> </p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(108,2,1547,382,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Authentification&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (107,2,1251,382,0,0,'<p style=\"line-height: 18px; overflow: hidden;\"><span class=\"visual_font_size_28pt\" style=\"color: #ffffff; font-family: opensans;\">Disk /var</span></p>\n<p style=\"line-height: 18px; overflow: hidden;\"> </p>','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(109,2,126,820,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_36pt&quot;&#x20;style=&quot;font-family:&#x20;opensans;&#x20;color:&#x20;#ffffff;&quot;&gt;Processing&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (108,2,1547,382,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Authentification&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0), 
+	(110,2,755,820,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_36pt&quot;&#x20;style=&quot;font-family:&#x20;opensans;&#x20;color:&#x20;#ffffff;&quot;&gt;Network&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (109,2,126,820,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_36pt&quot;&#x20;style=&quot;font-family:&#x20;opensans;&#x20;color:&#x20;#ffffff;&quot;&gt;Processing&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(111,2,1281,820,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_36pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Storage&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-    (110,2,755,820,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_36pt&quot;&#x20;style=&quot;font-family:&#x20;opensans;&#x20;color:&#x20;#ffffff;&quot;&gt;Network&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(113,3,851,932,0,0,'','white',19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
-    (111,2,1281,820,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_36pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Storage&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(114,3,946,314,60,60,'','status',0,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(113,3,851,932,0,0,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
+	(115,3,604,351,60,60,'','status',0,3600,0,0,5,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(114,3,946,314,60,60,'','status',0,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(116,3,840,314,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;EUROPE&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(115,3,604,351,60,60,'','status',0,3600,0,0,5,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(117,3,664,374,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;USA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,5,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(116,3,840,314,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;EUROPE&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(118,3,57,182,60,60,'','status',0,3600,0,0,5,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(117,3,664,374,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;USA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,5,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(119,3,56,258,60,60,'','status',0,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(118,3,57,182,60,60,'','status',0,3600,0,0,5,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(121,3,138,183,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;USA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,5,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(119,3,56,258,60,60,'','status',0,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(122,3,138,259,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;EUROPE&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(121,3,138,183,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;USA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,5,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(123,4,839,525,60,60,'','status',0,3600,0,0,8,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(122,3,138,259,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;EUROPE&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(124,4,699,583,60,60,'','status',0,3600,0,0,9,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(123,4,839,525,60,60,'','status',0,3600,0,0,8,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(125,4,585,705,60,60,'','status',0,3600,0,0,6,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(124,4,699,583,60,60,'','status',0,3600,0,0,9,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(126,4,563,754,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;SPAIN&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,6,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(125,4,585,705,60,60,'','status',0,3600,0,0,6,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(127,4,681,629,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;FRANCE&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,9,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(126,4,563,754,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;SPAIN&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,6,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(128,4,832,576,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;GERMANY&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,8,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(127,4,681,629,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;FRANCE&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,9,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(129,4,51,177,60,60,'','status',0,3600,0,0,8,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(128,4,832,576,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;GERMANY&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,8,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(130,4,124,176,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;GERMANY&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,8,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(129,4,51,177,60,60,'','status',0,3600,0,0,8,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(131,4,51,255,60,60,'','status',0,3600,0,0,9,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(130,4,124,176,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;GERMANY&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,8,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(132,4,127,256,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;FRANCE&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,9,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(131,4,51,255,60,60,'','status',0,3600,0,0,9,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(133,4,51,333,60,60,'','status',0,3600,0,0,7,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(132,4,127,256,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;FRANCE&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,9,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(134,4,129,333,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;SPAIN&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,6,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(133,4,51,333,60,60,'','status',0,3600,0,0,7,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(136,4,816,928,0,0,'','white',19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
-	(134,4,129,333,0,0,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;SPAIN&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,6,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(137,4,1674,184,132,200,'','worldmap',5,3600,0,0,3,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(136,4,816,928,0,0,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
+	(143,6,972,452,60,60,'','status',0,3600,0,0,7,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(137,4,1674,184,132,200,'','worldmap',5,3600,0,0,3,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(144,6,1039,223,60,60,'','status',0,3600,0,0,11,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(143,6,972,452,60,60,'','status',0,3600,0,0,7,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(145,6,1339,366,60,60,'','status',0,3600,0,0,10,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(144,6,1039,223,60,60,'','status',0,3600,0,0,11,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(146,6,841,699,60,60,'','status',0,3600,0,0,12,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(145,6,1339,366,60,60,'','status',0,3600,0,0,10,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(147,6,1677,183,132,200,'','worldmap',5,3600,0,0,3,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(146,6,841,699,60,60,'','status',0,3600,0,0,12,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(148,6,1674,341,132,200,'','europemap',5,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(147,6,1677,183,132,200,'','worldmap',5,3600,0,0,3,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(149,6,1023,288,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;BASQUE&#x20;COUNTRY&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,11,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(148,6,1674,341,132,200,'','europemap',5,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(150,6,1324,425,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;CATALONIA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,10,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(149,6,1023,288,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;BASQUE&#x20;COUNTRY&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,11,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(151,6,963,511,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;MADRID&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,7,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(150,6,1324,425,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;CATALONIA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,10,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(152,6,843,749,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;ANDALUSIA&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,12,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(151,6,963,511,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;MADRID&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,7,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(153,6,52,179,60,60,'','status',0,3600,0,0,11,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(152,6,843,749,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;ANDALUSIA&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,12,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(154,6,125,184,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;BASQUE&#x20;COUNTRY&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,11,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(153,6,52,179,60,60,'','status',0,3600,0,0,11,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(155,6,53,260,60,60,'','status',0,3600,0,0,7,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(154,6,125,184,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;BASQUE&#x20;COUNTRY&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,11,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(156,6,132,264,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;MADRID&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,7,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(155,6,53,260,60,60,'','status',0,3600,0,0,7,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(157,6,52,339,60,60,'','status',0,3600,0,0,10,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(156,6,132,264,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;MADRID&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,7,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(158,6,132,343,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;CATALONIA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,10,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(157,6,52,339,60,60,'','status',0,3600,0,0,10,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(159,6,52,413,60,60,'','status',0,3600,0,0,12,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(158,6,132,343,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;CATALONIA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,10,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(160,6,132,423,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;ANDALUSIA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,12,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(159,6,52,413,60,60,'','status',0,3600,0,0,12,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(161,11,761,345,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(160,6,132,423,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;ANDALUSIA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,12,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(162,11,791,401,0,0,'&lt;p&#x20;style=&quot;margin-top:&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;BILBAO&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(161,11,761,345,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(163,11,53,183,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(162,11,791,401,0,0,'&lt;p&#x20;style=&quot;margin-top:&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;BILBAO&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(164,11,131,191,0,0,'&lt;p&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;BILBAO&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(163,11,53,183,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(165,11,1675,184,132,200,'','worldmap',5,3600,0,0,3,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(164,11,131,191,0,0,'&lt;p&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;BILBAO&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(167,11,1675,340,132,200,'','europemap',5,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(165,11,1675,184,132,200,'','worldmap',5,3600,0,0,3,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(168,11,1673,507,132,200,'','spainmap',5,3600,0,0,6,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(167,11,1675,340,132,200,'','europemap',5,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(169,10,1075,607,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(168,11,1673,507,132,200,'','spainmap',5,3600,0,0,6,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(170,10,1012,539,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(169,10,1075,607,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(171,10,57,266,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(170,10,1012,539,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(172,10,55,183,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(171,10,57,266,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(173,10,131,189,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;BARCELONA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(172,10,55,183,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(174,10,1044,670,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;BARCELONA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(173,10,131,189,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;BARCELONA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(175,10,1000,488,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;MANRESA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(174,10,1044,670,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;BARCELONA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(176,10,134,265,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;MANRESA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(175,10,1000,488,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;MANRESA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(177,10,1675,184,132,200,'','worldmap',5,3600,0,0,3,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(176,10,134,265,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;MANRESA&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(178,10,1675,342,132,200,'','europemap',5,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(177,10,1675,184,132,200,'','worldmap',5,3600,0,0,3,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(179,10,1673,508,132,200,'','spainmap',5,3600,0,0,6,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(178,10,1675,342,132,200,'','europemap',5,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(180,7,1675,184,132,200,'','worldmap',5,3600,0,0,3,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(179,10,1673,508,132,200,'','spainmap',5,3600,0,0,6,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(181,7,1673,340,132,200,'','europemap',5,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(180,7,1675,184,132,200,'','worldmap',5,3600,0,0,3,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(182,7,1675,505,132,200,'','spainmap',5,3600,0,0,6,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(181,7,1673,340,132,200,'','europemap',5,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(183,7,960,571,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(182,7,1675,505,132,200,'','spainmap',5,3600,0,0,6,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(184,7,1089,529,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(183,7,960,571,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(185,7,865,541,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(184,7,1089,529,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(186,7,958,475,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(185,7,865,541,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(187,7,54,182,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(186,7,958,475,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(188,7,58,417,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(187,7,54,182,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(189,7,55,258,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(188,7,58,417,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(191,7,56,338,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(189,7,55,258,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(192,7,947,631,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;MADRID&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(191,7,56,338,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(193,7,790,598,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;LAS&#x20;ROZAS&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(192,7,947,631,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;MADRID&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(194,7,914,429,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;ALCOBENDAS&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(193,7,790,598,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;LAS&#x20;ROZAS&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(195,7,1065,583,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&#x20;text-align:&#x20;center;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;ALCAL&amp;Aacute;&#x20;DE&#x20;&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#x0a;&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&#x20;text-align:&#x20;center;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;HENARES&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(194,7,914,429,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;ALCOBENDAS&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(196,7,134,267,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;ALCOBENDAS&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(195,7,1065,583,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&#x20;text-align:&#x20;center;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;ALCAL&amp;Aacute;&#x20;DE&#x20;&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;&#x0a;&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&#x20;text-align:&#x20;center;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;HENARES&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(197,7,133,193,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;MADRID&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(196,7,134,267,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;ALCOBENDAS&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(198,7,134,347,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;LAS&#x20;ROZAS&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(197,7,133,193,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;MADRID&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(199,7,135,425,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;ALCAL&amp;Aacute;&#x20;DE&#x20;HENARES&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(198,7,134,347,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;LAS&#x20;ROZAS&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(200,12,757,537,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(199,7,135,425,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_14pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;ALCAL&amp;Aacute;&#x20;DE&#x20;HENARES&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(201,12,1022,656,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(200,12,757,537,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(202,12,54,182,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(201,12,1022,656,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(203,12,54,260,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(202,12,54,182,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(204,12,751,593,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;SEVILLA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(203,12,54,260,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(205,12,1047,716,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;MALAGA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(204,12,751,593,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;&lt;strong&gt;SEVILLA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(206,12,133,266,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;MALAGA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(205,12,1047,716,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;MALAGA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(207,12,132,190,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;SEVILLA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(206,12,133,266,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;MALAGA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(208,12,1675,184,132,200,'','worldmap',5,3600,0,0,3,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(207,12,132,190,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;SEVILLA&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(209,12,1675,341,132,200,'','europemap',5,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(208,12,1675,184,132,200,'','worldmap',5,3600,0,0,3,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(210,12,1674,505,132,200,'','spainmap',5,3600,0,0,6,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(209,12,1675,341,132,200,'','europemap',5,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(211,12,842,935,0,0,'',NULL,19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
-	(210,12,1674,505,132,200,'','spainmap',5,3600,0,0,6,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(212,7,848,941,0,0,'','white',19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
-	(211,12,842,935,0,0,'',NULL,19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
+	(213,10,844,940,0,0,'','white',19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
-	(212,7,848,941,0,0,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
+	(214,11,847,948,0,0,'','white',19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
-	(213,10,844,940,0,0,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
+	(215,5,525,608,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(214,11,847,948,0,0,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
+	(216,5,1412,351,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(215,5,525,608,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(217,5,966,697,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(216,5,1412,351,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(218,5,458,672,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;CALIFORNIA&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(217,5,966,697,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(219,5,954,759,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;TEXAS&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(218,5,458,672,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;CALIFORNIA&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(220,5,1468,389,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;NEW&#x20;YORK&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(219,5,954,759,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;TEXAS&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(221,5,56,182,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(220,5,1468,389,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;NEW&#x20;YORK&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(222,5,57,258,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(221,5,56,182,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(223,5,57,338,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(222,5,57,258,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(224,5,137,189,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;CALIFORNIA&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(223,5,57,338,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(225,5,139,264,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;TEXAS&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(224,5,137,189,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;CALIFORNIA&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(226,5,138,342,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;NUEVA&#x20;YORK&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(225,5,139,264,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;TEXAS&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(227,5,1677,189,132,200,'','worldmap',5,3600,0,0,3,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(226,5,138,342,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;NUEVA&#x20;YORK&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;','white',4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(228,9,907,353,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(227,5,1677,189,132,200,'','worldmap',5,3600,0,0,3,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(229,9,1068,599,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(228,9,907,353,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(230,9,60,182,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(229,9,1068,599,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(231,9,61,258,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(230,9,60,182,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(232,9,138,187,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;PARIS&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(231,9,61,258,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(233,9,139,257,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;LYON&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(232,9,138,187,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;PARIS&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(234,9,1063,660,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#333333;&quot;&gt;&lt;strong&gt;LYON&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(233,9,139,257,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;&lt;strong&gt;LYON&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(235,9,905,416,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#333333;&quot;&gt;&lt;strong&gt;PARIS&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(234,9,1063,660,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#333333;&quot;&gt;&lt;strong&gt;LYON&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(236,9,1676,184,132,200,'','worldmap',5,3600,0,0,3,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(235,9,905,416,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#333333;&quot;&gt;&lt;strong&gt;PARIS&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(237,9,1673,340,132,200,'','europemap',5,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(236,9,1676,184,132,200,'','worldmap',5,3600,0,0,3,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(238,8,1098,397,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(237,9,1673,340,132,200,'','europemap',5,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(239,8,989,775,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(238,8,1098,397,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(240,8,824,595,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(239,8,989,775,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(241,8,59,183,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(240,8,824,595,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(242,8,62,335,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(241,8,59,183,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(243,8,60,260,60,60,'','status',0,3600,0,1,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(242,8,62,335,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(244,8,1077,456,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;BERLIN&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(243,8,60,260,60,60,'','status',0,3600,0,1,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(245,8,143,262,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;FRANCFORT&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(244,8,1077,456,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;BERLIN&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(246,8,144,341,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;MUNICH&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(245,8,143,262,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;FRANCFORT&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(247,8,957,827,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;MUNICH&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(246,8,144,341,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;MUNICH&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(248,8,795,655,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;FRANCFORT&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(247,8,957,827,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;MUNICH&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(249,8,143,183,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;BERLIN&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(248,8,795,655,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;style=&quot;color:&#x20;#000000;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&gt;FRANCFORT&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(250,8,1676,185,132,200,'','worldmap',5,3600,0,0,3,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(249,8,143,183,0,0,'&lt;p&#x20;style=&quot;line-height:&#x20;18px;&#x20;overflow:&#x20;hidden;&quot;&gt;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_18pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&quot;&gt;BERLIN&lt;/span&gt;&lt;/strong&gt;&lt;/p&gt;',NULL,4,3600,0,0,0,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(251,8,1677,343,132,200,'','europemap',5,3600,0,0,4,0,1,1,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
-	(250,8,1676,185,132,200,'','worldmap',5,3600,0,0,3,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(252,8,846,940,0,0,'','white',19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
-	(251,8,1677,343,132,200,'','europemap',5,3600,0,0,4,0,1,0,0,0,0,'line','down','','',0,0,'default',0,0.000,0.000,0,0,'analogic_1','time','Europe/Madrid',0,0),
+	(253,9,848,944,0,0,'','white',19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
-	(252,8,846,940,0,0,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
+	(254,6,848,943,0,0,'','white',19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
-	(253,9,848,944,0,0,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
+	(255,5,846,941,0,0,'','white',19,3600,0,0,0,0,1,1,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0);
-	(254,6,848,943,0,0,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0),
-	(255,5,846,941,0,0,'','white',19,3600,0,0,0,0,1,0,0,0,0,'line','down','','#FFFFFF',0,0,'default',0,0.000,0.000,0,0,'digital_1','time','Europe/Madrid',0,0)
-;
 
 -- 
 -- Dumping data for table `tpen`

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.751-201214
+Version: 7.0NG.751-201223
 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.751-201214"
+pandora_version="7.0NG.751-201223"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

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

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.751";
-my $pandora_build = "201214";
+my $pandora_build = "201223";
 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.751
-%define release     201214
+%define release     201223
 
 Summary:            Pandora FMS Server
 Name:               %{name}
@@ -28,7 +28,7 @@ Requires:           perl(HTTP::Request::Common) perl(LWP::Simple) perl(LWP::User
 Requires:           perl(XML::Simple) perl(XML::Twig) net-snmp-utils
 Requires:           perl(NetAddr::IP) net-snmp net-tools
 Requires:           perl(IO::Socket::INET6) perl(IO::Socket::SSL) perl(Net::Telnet)
-Requires:           nmap sudo perl(JSON)
+Requires:           fping nmap sudo perl(JSON)
 Requires:           perl(Time::HiRes) perl(Encode::Locale)
 Requires:           perl perl(Sys::Syslog) perl(HTML::Entities) perl(Geo::IP)
 

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.751
-%define release     201214
+%define release     201223
 
 Summary:            Pandora FMS Server
 Name:               %{name}
@@ -24,7 +24,7 @@ AutoReq:            0
 Provides:           %{name}-%{version}
 Requires:           perl-DBI perl-DBD-mysql perl-libwww-perl
 Requires:           perl-NetAddr-IP net-snmp net-tools perl-XML-Twig
-Requires:           nmap sudo perl-HTML-Tree perl-XML-Simple perl-Net-Telnet
+Requires:           fping nmap sudo perl-HTML-Tree perl-XML-Simple perl-Net-Telnet
 Requires:           perl-IO-Socket-INET6 perl-Socket6 perl-IO-Socket-SSL snmp-mibs perl-JSON
 Requires:           perl-Encode-Locale perl-Geo-IP
 

pandora_server/pandora_server_installer

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

pandora_server/util/pandora_db.pl

@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.751 PS201214";
+my $version = "7.0NG.751 PS201223";
 
 # 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.751 PS201214";
+my $version = "7.0NG.751 PS201223";
 
 # save program name for logging
 my $progname = basename($0);