diff --git a/extras/chrome_extension/js/popup.js b/extras/chrome_extension/js/popup.js
index 44e0725a73..e323a9b12b 100644
--- a/extras/chrome_extension/js/popup.js
+++ b/extras/chrome_extension/js/popup.js
@@ -1,170 +1,183 @@
 var max_events;
 var bg;
-$(document).ready(function(){
-	max_events=localStorage["events"];
-	if(localStorage["events"]==undefined){
-		localStorage["events"]="20";
-	}
-	bg=chrome.extension.getBackgroundPage();
+$(document).ready(function() {
+  max_events = localStorage["events"];
+  if (localStorage["events"] == undefined) {
+    localStorage["events"] = "20";
+  }
+  bg = chrome.extension.getBackgroundPage();
 
-	// Display the information
-	if (bg.fetchEvents().length == 0) {
-		showError("Error in fetching data!! Check your internet connection");
-	} else {
-		showEvents();
-	}
+  // Display the information
+  if (bg.fetchEvents().length == 0) {
+    showError("No events");
+  } else {
+    showEvents();
+  }
 
-	// Adding buttons listeners
-	document.getElementById("m_refresh").addEventListener("click", mrefresh);
+  // Adding buttons listeners
+  document.getElementById("m_refresh").addEventListener("click", mrefresh);
 
-	// Added listener to background messages
-	chrome.runtime.onMessage.addListener(function(message,sender,sendResponse){
-		switch (message.text) {
-			case "FETCH_EVENTS":
-				setSpinner();
-				//$('div.b').hide();
-				break;
-			case "FETCH_EVENTS_SUCCESS":
-				unsetSpinner();
-				showEvents();
-				break;
-			case "FETCH_EVENTS_DATA_ERROR":
-				unsetSpinner();
-				showError("Error in fetching data!! Check your internet connection");
-				break;
-			case "FETCH_EVENTS_URL_ERROR":
-				unsetSpinner();
-				showError("Configure ip address,API password, user name and password with correct values");
-				break;
-			default:
-				console.log("Unrecognized message: ", message.text);
-				break;
-		}
-	});
+  // Added listener to background messages
+  chrome.runtime.onMessage.addListener(function(message, sender, sendResponse) {
+    switch (message.text) {
+      case "FETCH_EVENTS":
+        setSpinner();
+        //$('div.b').hide();
+        break;
+      case "FETCH_EVENTS_SUCCESS":
+        unsetSpinner();
+        showEvents();
+        break;
+      case "FETCH_EVENTS_DATA_ERROR":
+        unsetSpinner();
+        showError("Error in fetching data!! Check your internet connection");
+        break;
+      case "FETCH_EVENTS_URL_ERROR":
+        unsetSpinner();
+        showError(
+          "Configure ip address,API password, user name and password with correct values"
+        );
+        break;
+      default:
+        console.log("Unrecognized message: ", message.text);
+        break;
+    }
+  });
 });
 
-function setSpinner () {
-	$('#refr_img_id').attr("src", "images/spinny.gif");
+function setSpinner() {
+  $("#refr_img_id").attr("src", "images/spinny.gif");
 }
 
 function unsetSpinner() {
-	$('#refr_img_id').attr("src", "images/refresh.png");
+  $("#refr_img_id").attr("src", "images/refresh.png");
 }
 
 function clearError() {
-	$('.error').hide();
-	$('.error a').text("");
-	$('.result').css('height', null);
+  $(".error").hide();
+  $(".error a").text("");
+  $(".result").css("height", null);
 }
 
-function showError(text){
-	$('.error a').text(text);
-	$('.error').show();
-	$('.result').height(420);
+function showError(text) {
+  $(".error a").text(text);
+  $(".error").show();
+  $(".result").height(420);
 }
 
-function showEvents(){
+function showEvents() {
+  clearError();
+  $("#events").empty();
+  var e_refr = document.getElementById("event_temp");
+  if (e_refr) {
+    wrapper.removeChild(e_refr);
+  }
+  var allEvents = bg.fetchEvents();
+  var notVisitedEvents = bg.fetchNotVisited();
+  var eve = document.createElement("div");
+  eve.id = "event_temp";
+  eve.setAttribute("class", "b");
 
-	clearError();
-	$('#events').empty();
-	var e_refr = document.getElementById('event_temp');
-	if(e_refr){
-			wrapper.removeChild(e_refr);
-	}
-	var allEvents = bg.fetchEvents();
-	var notVisitedEvents = bg.fetchNotVisited();
-	var eve=document.createElement('div');
-	eve.id="event_temp";
-	eve.setAttribute("class","b");
-	
-	var i=0;
-	if(allEvents.length>0){
-		while(i<max_events && i<allEvents.length){
-			var eve_title=document.createElement('div');
-			eve_title.id = 'e_' + i  + '_' + allEvents[i]['id'];
-			var img = document.createElement('img');
-			img.src = 'images/plus.png';
-			img.className ='pm';
-			img.id='i_' + i  + '_' + allEvents[i]['id'];
-			eve_title.appendChild(img);
-			var div_empty = document.createElement('img');
-			var a = document.createElement('a');
-			var temp_style;
-			
-			var agent_url = (allEvents[i]["agent"] == 0)
-				? localStorage["ip_address"]
-					+ "/index.php?sec=eventos&sec2=operation/events/events"
-				: localStorage["ip_address"]
-					+ "/index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente="
-					+ allEvents[i]['agent'];
-			a.setAttribute("href",agent_url);
-			a.target = "_blank";
-			a.className = 'a_2_mo';
-			
-			
-			a.innerText = allEvents[i]['title'];			
-			eve_title.setAttribute("class","event sev-" + allEvents[i]['severity']);
+  var i = 0;
+  if (allEvents.length > 0) {
+    while (i < max_events && i < allEvents.length) {
+      var eve_title = document.createElement("div");
+      eve_title.id = "e_" + i + "_" + allEvents[i]["id"];
+      var img = document.createElement("img");
+      img.src = "images/plus.png";
+      img.className = "pm";
+      img.id = "i_" + i + "_" + allEvents[i]["id"];
+      eve_title.appendChild(img);
+      var div_empty = document.createElement("img");
+      var a = document.createElement("a");
+      var temp_style;
 
-			if (notVisitedEvents[allEvents[i]['id']] === true) {
-				eve_title.style.fontWeight = 600;
-			}
-			
-			eve_title.appendChild(a);
-			eve.appendChild(eve_title);
-			
-			var time=allEvents[i]['date'].split(" ");
-			var time_text = time[0]+" "+time[1];
-			
-			var p = document.createElement('p');
-			var id = (allEvents[i]['module']==0)
-				? "."
-				: " in the module with Id "+ allEvents[i]['module'] + ".";
-		   
-			p.innerText = allEvents[i]['type']+" : "+allEvents[i]['source']+". Event occured at "+ time_text+id;
-			p.id = 'p_' + i;
-			eve_title.appendChild(p);
-			i++;
-		}
-	
-		$('#events').append(eve);
+      var agent_url =
+        allEvents[i]["agent"] == 0
+          ? localStorage["ip_address"] +
+            "/index.php?sec=eventos&sec2=operation/events/events"
+          : localStorage["ip_address"] +
+            "/index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=" +
+            allEvents[i]["agent"];
+      a.setAttribute("href", agent_url);
+      a.target = "_blank";
+      a.className = "a_2_mo";
 
-		$('img.pm').click(showHide);
-		$('div.b').show();
-	} else {
-		showError("Error in fetching data!! Check your internet connection");
-	}
-	
-	localStorage["new_events"]=0;
-	bg.updateBadge();
+      a.innerText = allEvents[i]["title"];
+      eve_title.setAttribute("class", "event sev-" + allEvents[i]["severity"]);
+
+      if (notVisitedEvents[allEvents[i]["id"]] === true) {
+        eve_title.style.fontWeight = 600;
+      }
+
+      eve_title.appendChild(a);
+      eve.appendChild(eve_title);
+
+      var time = allEvents[i]["date"].split(" ");
+      var time_text = time[0] + " " + time[1];
+
+      var p = document.createElement("p");
+      var id =
+        allEvents[i]["module"] == 0
+          ? "."
+          : " in the module with Id " + allEvents[i]["module"] + ".";
+
+      p.innerText =
+        allEvents[i]["type"] +
+        " : " +
+        allEvents[i]["source"] +
+        ". Event occured at " +
+        time_text +
+        id;
+      p.id = "p_" + i;
+      eve_title.appendChild(p);
+      i++;
+    }
+
+    $("#events").append(eve);
+
+    $("img.pm").click(showHide);
+    $("div.b").show();
+  } else {
+    showError("No events");
+  }
+
+  localStorage["new_events"] = 0;
+  bg.updateBadge();
 }
 
 function showHide() {
-	var id = $(this).attr('id');
-	// Image id has the form i_<position>_<eventId>
-	var nums = id.split('_');
-	var pid = "p_" + nums[1];
+  var id = $(this).attr("id");
+  // Image id has the form i_<position>_<eventId>
+  var nums = id.split("_");
+  var pid = "p_" + nums[1];
 
-	// Mark as visited if visited
-	if($(this).parent().css('font-weight') == '600') {
-		bg.removeNotVisited(nums[2]);
-		$(this).parent().css('font-weight', '');
-	}
+  // Mark as visited if visited
+  if (
+    $(this)
+      .parent()
+      .css("font-weight") == "600"
+  ) {
+    bg.removeNotVisited(nums[2]);
+    $(this)
+      .parent()
+      .css("font-weight", "");
+  }
 
-	// Toggle information
-	if($('#' + pid).css('display') == 'none') {
-		$('#' + pid).slideDown();
-		$(this).attr({src: 'images/minus.png'});
-	}
-	else {
-		$('#' + pid).slideUp();
-		$(this).attr({src: 'images/plus.png'});
-	}
+  // Toggle information
+  if ($("#" + pid).css("display") == "none") {
+    $("#" + pid).slideDown();
+    $(this).attr({ src: "images/minus.png" });
+  } else {
+    $("#" + pid).slideUp();
+    $(this).attr({ src: "images/plus.png" });
+  }
 }
 
-function mrefresh(){
-	localStorage["new_events"]=0;
-	bg.updateBadge();
-	clearError();
-	bg.resetInterval();
-	bg.main();
+function mrefresh() {
+  localStorage["new_events"] = 0;
+  bg.updateBadge();
+  clearError();
+  bg.resetInterval();
+  bg.main();
 }
diff --git a/extras/chrome_extension/manifest.json b/extras/chrome_extension/manifest.json
index b591121309..bff5586f0c 100644
--- a/extras/chrome_extension/manifest.json
+++ b/extras/chrome_extension/manifest.json
@@ -1,30 +1,30 @@
 {
-    "name": "__MSG_name__",
-    "version": "2.1",
-    "manifest_version": 2,
-    "description": "Pandora FMS Event viewer Chrome extension",
-    "homepage_url": "http://pandorafms.com",
-    "browser_action": {
-        "default_title": "__MSG_default_title__",
-        "default_icon": "images/icon.png",
-        "default_popup": "popup.html"
-    },
-    "background": {
-        "page": "background.html"
-    },
-    "icons": {
-        "128": "images/icon128.png",
-        "16": "images/icon16.png",
-        "32": "images/icon32.png",
-        "48": "images/icon48.png"
-    },
-    "options_page": "options.html",
-    "permissions": [
-        "tabs",
-        "notifications",
-        "http://*/*",
-        "https://*/*",
-        "background"
-    ],
-    "default_locale": "en"
- }
+  "name": "__MSG_name__",
+  "version": "2.2",
+  "manifest_version": 2,
+  "description": "Pandora FMS Event viewer Chrome extension",
+  "homepage_url": "http://pandorafms.com",
+  "browser_action": {
+    "default_title": "__MSG_default_title__",
+    "default_icon": "images/icon.png",
+    "default_popup": "popup.html"
+  },
+  "background": {
+    "page": "background.html"
+  },
+  "icons": {
+    "128": "images/icon128.png",
+    "16": "images/icon16.png",
+    "32": "images/icon32.png",
+    "48": "images/icon48.png"
+  },
+  "options_page": "options.html",
+  "permissions": [
+    "tabs",
+    "notifications",
+    "http://*/*",
+    "https://*/*",
+    "background"
+  ],
+  "default_locale": "en"
+}
diff --git a/pandora_agents/Dockerfile b/pandora_agents/Dockerfile
new file mode 100644
index 0000000000..945a74b1c9
--- /dev/null
+++ b/pandora_agents/Dockerfile
@@ -0,0 +1,50 @@
+FROM centos:centos7
+MAINTAINER Pandora FMS Team <info@pandorafms.com>
+
+# Add Pandora FMS agent installer
+ADD unix /tmp/pandora_agent/unix
+
+# Install dependencies
+RUN yum -y install \
+	epel-release \
+	unzip \
+	perl \
+	sed \
+	"perl(Sys::Syslog)"
+
+# Install Pandora FMS agent
+RUN cd /tmp/pandora_agent/unix \
+	&& chmod +x pandora_agent_installer \
+	&& ./pandora_agent_installer --install
+
+# Set default variables
+ENV SERVER_IP '127.0.0.1'
+ENV REMOTE_CONFIG '0'
+ENV GROUP 'Servers'
+ENV DEBUG '0'
+ENV AGENT_NAME 'agent_docker'
+ENV AGENT_ALIAS 'agent_docker'
+ENV TIMEZONE 'UTC'
+ENV SECONDARY_GROUPS ''
+
+# Create the entrypoint script.
+RUN echo -e '#/bin/bash\n \
+sed -i "s/^server_ip.*$/server_ip $SERVER_IP/g" /etc/pandora/pandora_agent.conf\n \
+sed -i "s/^remote_config.*$/remote_config $REMOTE_CONFIG/g" /etc/pandora/pandora_agent.conf\n \
+sed -i "s/^group.*$/group $GROUP/g" /etc/pandora/pandora_agent.conf\n \
+sed -i "s/^debug.*$/debug $DEBUG/g" /etc/pandora/pandora_agent.conf\n \
+sed -i "s/^#agent_name.*$/agent_name $AGENT_NAME/g" /etc/pandora/pandora_agent.conf\n \
+sed -i "s/^#agent_alias.*$/agent_alias $AGENT_ALIAS/g" /etc/pandora/pandora_agent.conf\n \
+sed -i "s/^# secondary_groups.*$/secondary_groups $SECONDARY_GROUPS/g" /etc/pandora/pandora_agent.conf\n \
+if [ $TIMEZONE != "" ]; then\n \
+\tln -sfn /usr/share/zoneinfo/$TIMEZONE /etc/localtime\n \
+fi\n \
+/etc/init.d/pandora_agent_daemon start\n \
+rm -f $0\n \
+tail -f /var/log/pandora/pandora_agent.log' \
+>> /entrypoint.sh && \
+chmod +x /entrypoint.sh
+
+# Entrypoint + CMD
+ENTRYPOINT ["bash"]
+CMD ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/pandora_agents/build_agent_docker.sh b/pandora_agents/build_agent_docker.sh
new file mode 100644
index 0000000000..0ebf8ac7a0
--- /dev/null
+++ b/pandora_agents/build_agent_docker.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+source /root/code/pandorafms/extras/build_vars.sh
+
+# Set tag for docker build
+if [ "$1" == "nightly" ]; then
+	LOCAL_VERSION="latest"
+else
+	LOCAL_VERSION=$VERSION
+fi
+
+# Build image with code
+docker build --rm=true --pull --no-cache -t pandorafms/pandorafms-agent:$LOCAL_VERSION -f $CODEHOME/pandora_agents/Dockerfile $CODEHOME/pandora_agents/
+
+# Push image
+docker push pandorafms/pandorafms-agent:$LOCAL_VERSION
+
+# Delete local image
+docker image rm -f pandorafms/pandorafms-agent:$LOCAL_VERSION
\ No newline at end of file
diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf
index 30fb45624c..fbea6eb404 100644
--- a/pandora_agents/pc/AIX/pandora_agent.conf
+++ b/pandora_agents/pc/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, AIX version
+# Version 7.0NG.738, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf
index fc704fb87b..ded3ec4b9c 100644
--- a/pandora_agents/pc/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, FreeBSD Version
+# Version 7.0NG.738, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf
index 46789e8bea..0d3e20d05e 100644
--- a/pandora_agents/pc/HP-UX/pandora_agent.conf
+++ b/pandora_agents/pc/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, HP-UX Version
+# Version 7.0NG.738, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf
index ce69b462a5..5d951d984d 100644
--- a/pandora_agents/pc/Linux/pandora_agent.conf
+++ b/pandora_agents/pc/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, GNU/Linux
+# Version 7.0NG.738, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf
index 904015a997..1c73d12fc9 100644
--- a/pandora_agents/pc/NT4/pandora_agent.conf
+++ b/pandora_agents/pc/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, GNU/Linux
+# Version 7.0NG.738, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf
index d2d0661065..fc59e308e4 100644
--- a/pandora_agents/pc/SunOS/pandora_agent.conf
+++ b/pandora_agents/pc/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, Solaris Version
+# Version 7.0NG.738, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf
index d0593ebcc9..f12cb5089c 100644
--- a/pandora_agents/pc/Win32/pandora_agent.conf
+++ b/pandora_agents/pc/Win32/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2010 Artica Soluciones Tecnologicas 
-# Version 7.0NG.736
+# Version 7.0NG.738
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf
index 74c397dc94..863ab92907 100644
--- a/pandora_agents/shellscript/aix/pandora_agent.conf
+++ b/pandora_agents/shellscript/aix/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.736, AIX version
+# Version 7.0NG.738, AIX version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
index b7a30f962e..f56402fbcc 100644
--- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
+++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.736
+# Version 7.0NG.738
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 
diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
index 9114cd7348..55576e58fd 100644
--- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf
+++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.736, HPUX Version
+# Version 7.0NG.738, HPUX Version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index 8eb9c0bbc8..a584a597cb 100644
--- a/pandora_agents/shellscript/linux/pandora_agent.conf
+++ b/pandora_agents/shellscript/linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736
+# Version 7.0NG.738
 # Licensed under GPL license v2,
 # (c) 2003-2010 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
index 24d44d51fc..18db7a174f 100644
--- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf
+++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736
+# Version 7.0NG.738
 # Licensed under GPL license v2,
 # (c) 2003-2009 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf
index a940b58a89..d3266f091d 100644
--- a/pandora_agents/shellscript/openWRT/pandora_agent.conf
+++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736
+# Version 7.0NG.738
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 
diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf
index 13611f36c0..aa59a262c4 100644
--- a/pandora_agents/shellscript/solaris/pandora_agent.conf
+++ b/pandora_agents/shellscript/solaris/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.736, Solaris version
+# Version 7.0NG.738, Solaris version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 6a826afd8b..dedf2c366f 100644
--- a/pandora_agents/unix/AIX/pandora_agent.conf
+++ b/pandora_agents/unix/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, AIX version
+# Version 7.0NG.738, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index b6ecacb2b4..1a4e8a2121 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.736-190712
+Version: 7.0NG.738-190916
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index c7f4f3334e..5ebc768ca9 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/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.736-190712"
+pandora_version="7.0NG.738-190916"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf
index 35a24de477..4624a5ceff 100644
--- a/pandora_agents/unix/Darwin/pandora_agent.conf
+++ b/pandora_agents/unix/Darwin/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, GNU/Linux
+# Version 7.0NG.738, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf
index fba8f9fa24..0895974d7b 100644
--- a/pandora_agents/unix/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, FreeBSD Version
+# Version 7.0NG.738, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index 36164100be..bfd0612672 100644
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, HP-UX Version
+# Version 7.0NG.738, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 6012f59705..e1a83ed6e5 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, GNU/Linux
+# Version 7.0NG.738, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf
index 300c03a3f5..b0841bd0f7 100644
--- a/pandora_agents/unix/NT4/pandora_agent.conf
+++ b/pandora_agents/unix/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, GNU/Linux
+# Version 7.0NG.738, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf
index e899eed824..4d96ba223d 100644
--- a/pandora_agents/unix/NetBSD/pandora_agent.conf
+++ b/pandora_agents/unix/NetBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, NetBSD Version
+# Version 7.0NG.738, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf
index be7904794d..c4a4c578d9 100644
--- a/pandora_agents/unix/SunOS/pandora_agent.conf
+++ b/pandora_agents/unix/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.736, Solaris Version
+# Version 7.0NG.738, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 1298d9c2f9..42a6fb38d8 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -41,8 +41,8 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.736';
-use constant AGENT_BUILD => '190712';
+use constant AGENT_VERSION => '7.0NG.738';
+use constant AGENT_BUILD => '190916';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 5fdc516b68..8cf4666656 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.736
-%define release     190712
+%define version     7.0NG.738
+%define release     190916
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 891b2769f1..6af72cc966 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.736
-%define release     190712
+%define version     7.0NG.738
+%define release     190916
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 01d573fb70..e51d9cb3d1 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -9,8 +9,8 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.736"
-PI_BUILD="190712"
+PI_VERSION="7.0NG.738"
+PI_BUILD="190916"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 9c2fe6d01d..c74dadfff6 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2017 Artica Soluciones Tecnologicas 
-# Version 7.0NG.736
+# Version 7.0NG.738
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index d20217c6a0..e01ce765e0 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.736}
+{Pandora FMS Windows Agent v7.0NG.738}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190712}
+{190916}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/modules/pandora_module_factory.cc b/pandora_agents/win32/modules/pandora_module_factory.cc
index a4d9553c20..4c84910ac5 100644
--- a/pandora_agents/win32/modules/pandora_module_factory.cc
+++ b/pandora_agents/win32/modules/pandora_module_factory.cc
@@ -1214,7 +1214,8 @@ Pandora_Module_Factory::getModuleFromDefinition (string definition) {
 						      module_source,
 						      module_eventtype,
 						      module_eventcode,
-						      module_pattern);
+						      module_pattern,
+						      module_application);
 	} else if (module_wmiquery != "") {
 		module = new Pandora_Module_WMIQuery (module_name,
 						      module_wmiquery, module_wmicolumn);
diff --git a/pandora_agents/win32/modules/pandora_module_logchannel.cc b/pandora_agents/win32/modules/pandora_module_logchannel.cc
index 4ec72df63c..3c1c4666dd 100755
--- a/pandora_agents/win32/modules/pandora_module_logchannel.cc
+++ b/pandora_agents/win32/modules/pandora_module_logchannel.cc
@@ -53,7 +53,7 @@ static EvtUpdateBookmarkT EvtUpdateBookmarkF = NULL;
  * @param name Module name.
  * @param service_name Service internal name to check.
  */
-Pandora_Module_Logchannel::Pandora_Module_Logchannel (string name, string source, string type, string id, string pattern)
+Pandora_Module_Logchannel::Pandora_Module_Logchannel (string name, string source, string type, string id, string pattern, string application)
 	: Pandora_Module (name) {
     int i;
 	vector<wstring> query;
@@ -93,6 +93,13 @@ Pandora_Module_Logchannel::Pandora_Module_Logchannel (string name, string source
 		query.push_back(ss.str());
 	}
 
+	// Set the application
+	if (application != "") {
+		wstringstream ss;
+		ss << L"*[System/Provider[@Name='" << application.c_str() << L"']]";
+		query.push_back(ss.str());
+	}
+
 	// Fill the filter
 	if (query.size() == 0) {
 		this->filter = L"*";
@@ -579,4 +586,4 @@ Pandora_Module_Logchannel::GetMessageString(EVT_HANDLE hMetadata, EVT_HANDLE hEv
 	}
 
 	return pBuffer;
-}
\ No newline at end of file
+}
diff --git a/pandora_agents/win32/modules/pandora_module_logchannel.h b/pandora_agents/win32/modules/pandora_module_logchannel.h
index 19cde78b93..c008c0aac1 100755
--- a/pandora_agents/win32/modules/pandora_module_logchannel.h
+++ b/pandora_agents/win32/modules/pandora_module_logchannel.h
@@ -75,7 +75,7 @@ namespace Pandora_Modules {
 		LPWSTR GetMessageString(EVT_HANDLE hMetadata, EVT_HANDLE hEvent, EVT_FORMAT_MESSAGE_FLAGS FormatId);
 
 	public:
-		Pandora_Module_Logchannel (string name, string source, string type, string id, string pattern);
+		Pandora_Module_Logchannel (string name, string source, string type, string id, string pattern, string application);
 		void run ();
 	};
 }
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 51c386db55..88a69124af 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/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.736(Build 190712)")
+#define PANDORA_VERSION ("7.0NG.738(Build 190916)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index feb8e814e1..f67a031fae 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/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.736(Build 190712))"
+      VALUE "ProductVersion", "(7.0NG.738(Build 190916))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 901b426196..c6757cd683 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.736-190712
+Version: 7.0NG.738-190916
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 98935e7bf9..8bd5474f4e 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/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.736-190712"
+pandora_version="7.0NG.738-190916"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/extensions/files_repo/files_repo_form.php b/pandora_console/extensions/files_repo/files_repo_form.php
index 2035cfbd1a..b8e6a084b9 100644
--- a/pandora_console/extensions/files_repo/files_repo_form.php
+++ b/pandora_console/extensions/files_repo/files_repo_form.php
@@ -44,24 +44,16 @@ $groups = groups_get_all();
 // Add the All group to the beginning to be always the first
 // Use this instead array_unshift to keep the array keys
 $groups = ([0 => __('All')] + $groups);
-$html = '';
-$style = 'style="padding: 2px 10px; display: inline-block;"';
+$groups_selected = [];
 foreach ($groups as $id => $name) {
-    $checked = in_array($id, $file['groups']);
-    $all_checked = false;
-    if ($id === 0) {
-        $checkbox = html_print_checkbox_extended('groups[]', $id, $checked, false, '', 'class="chkb_all"', true);
-        $all_checked = $checked;
-    } else {
-        $checkbox = html_print_checkbox_extended('groups[]', $id, $checked, $all_checked, '', 'class="chkb_group"', true);
+    if (in_array($id, $file['groups'])) {
+        $groups_selected[] = $id;
     }
-
-    $html .= "<div $style>$name&nbsp;$checkbox</div>";
 }
 
 $row = [];
 $row[0] = __('Groups');
-$row[1] = $html;
+$row[1] = html_print_select($groups, 'groups[]', $groups_selected, '', '', '', true, true, '', '', '');
 $table->data[] = $row;
 $table->colspan[][1] = 3;
 
diff --git a/pandora_console/extensions/files_repo/functions_files_repo.php b/pandora_console/extensions/files_repo/functions_files_repo.php
index 3d9bdccd38..32ce4c216c 100644
--- a/pandora_console/extensions/files_repo/functions_files_repo.php
+++ b/pandora_console/extensions/files_repo/functions_files_repo.php
@@ -193,7 +193,7 @@ function files_repo_add_file($file_input_name='upfile', $description='', $groups
     global $config;
 
     $attachment_path = io_safe_output($config['attachment_store']);
-    $files_repo_path = $attachment_path.'/'.'files_repo';
+    $files_repo_path = $attachment_path.'/files_repo';
 
     $result = [];
     $result['status'] = false;
diff --git a/pandora_console/extras/delete_files/delete_files.txt b/pandora_console/extras/delete_files/delete_files.txt
new file mode 100644
index 0000000000..c0d8f0a9db
--- /dev/null
+++ b/pandora_console/extras/delete_files/delete_files.txt
@@ -0,0 +1 @@
+operation/servers/recon_view.php
\ No newline at end of file
diff --git a/pandora_console/extras/mr/30.sql b/pandora_console/extras/mr/30.sql
index eeb3b8d797..84e5adfa3e 100644
--- a/pandora_console/extras/mr/30.sql
+++ b/pandora_console/extras/mr/30.sql
@@ -10,4 +10,42 @@ ALTER TABLE `treport_content_template` ADD COLUMN `failover_type` tinyint(1) DEF
 
 ALTER TABLE `tmodule_relationship` ADD COLUMN `type` ENUM('direct', 'failover') DEFAULT 'direct';
 
-COMMIT;
\ No newline at end of file
+ALTER TABLE `treport_content` MODIFY COLUMN `name` varchar(300) NULL;
+
+CREATE TABLE `tagent_repository` (
+  `id` SERIAL,
+  `id_os` INT(10) UNSIGNED DEFAULT 0,
+  `arch` ENUM('x64', 'x86') DEFAULT 'x64',
+  `version` VARCHAR(10) DEFAULT '',
+  `path` text,
+  `uploaded_by` VARCHAR(100) DEFAULT '',
+  `uploaded` bigint(20) NOT NULL DEFAULT 0 COMMENT "When it was uploaded",
+  `last_err` text,
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`id_os`) REFERENCES `tconfig_os`(`id_os`)
+    ON UPDATE CASCADE ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `tdeployment_hosts` (
+  `id` SERIAL,
+  `id_cs` VARCHAR(100),
+  `ip` VARCHAR(100) NOT NULL UNIQUE,
+  `id_os` INT(10) UNSIGNED DEFAULT 0,
+  `os_version` VARCHAR(100) DEFAULT '' COMMENT "OS version in STR format",
+  `arch` ENUM('x64', 'x86') DEFAULT 'x64',
+  `current_agent_version` VARCHAR(100) DEFAULT '' COMMENT "String latest installed agent",
+  `target_agent_version_id` BIGINT UNSIGNED,
+  `deployed` bigint(20) NOT NULL DEFAULT 0 COMMENT "When it was deployed",
+  `server_ip` varchar(100) default NULL COMMENT "Where to point target agent",
+  `last_err` text,
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`id_cs`) REFERENCES `tcredential_store`(`identifier`)
+    ON UPDATE CASCADE ON DELETE SET NULL,
+  FOREIGN KEY (`id_os`) REFERENCES `tconfig_os`(`id_os`)
+    ON UPDATE CASCADE ON DELETE CASCADE,
+  FOREIGN KEY (`target_agent_version_id`) REFERENCES  `tagent_repository`(`id`)
+    ON UPDATE CASCADE ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+COMMIT;
diff --git a/pandora_console/extras/mr/31.sql b/pandora_console/extras/mr/31.sql
new file mode 100644
index 0000000000..3e527bff53
--- /dev/null
+++ b/pandora_console/extras/mr/31.sql
@@ -0,0 +1,12 @@
+START TRANSACTION;
+
+UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields';
+
+DELETE FROM `talert_commands` WHERE `id` = 11;
+
+DELETE FROM `tconfig` WHERE `token` LIKE 'integria_enabled';
+DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password';
+DELETE FROM `tconfig` WHERE `token` LIKE 'integria_inventory';
+DELETE FROM `tconfig` WHERE `token` LIKE 'integria_url';
+
+COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/mr/32.sql b/pandora_console/extras/mr/32.sql
new file mode 100644
index 0000000000..3100d73092
--- /dev/null
+++ b/pandora_console/extras/mr/32.sql
@@ -0,0 +1,7 @@
+START TRANSACTION;
+
+UPDATE `tlayout_data` SET `height` = 70 , `width` = 70 WHERE `height` = 0 && `width` = 0 && image NOT LIKE '%dot%' && ((`type` IN (0,5)) ||
+(`type` = 10 && `image` IS NOT NULL && `image` != '' && `image` != 'none') ||
+(`type` = 11 && `image` IS NOT NULL && `image` != '' && `image` != 'none' && `show_statistics` = 0));
+
+COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 60e19998e8..704ab61d74 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -724,7 +724,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` (
 	`type` varchar(30) default 'simple_graph',
 	`period` int(11) NOT NULL default 0,
 	`order` int (11) NOT NULL default 0,
-	`description` mediumtext, 
+	`description` mediumtext,
 	`text_agent` text,
 	`text` TEXT,
 	`external_source` Text,
@@ -1225,6 +1225,8 @@ ALTER TABLE `talert_commands` ADD COLUMN `fields_hidden` text;
 
 UPDATE `talert_actions` SET `field4` = 'text/html', `field4_recovery` = 'text/html' WHERE id = 1;
 
+DELETE FROM `talert_commands` WHERE `id` = 11;
+
 -- ---------------------------------------------------------------------
 -- Table `tmap`
 -- ---------------------------------------------------------------------
@@ -1241,7 +1243,7 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned;
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
-INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 30);
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 31);
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
@@ -1249,6 +1251,11 @@ UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.ph
 DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '737');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp');
+UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields';
+DELETE FROM `tconfig` WHERE `token` LIKE 'integria_enabled';
+DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password';
+DELETE FROM `tconfig` WHERE `token` LIKE 'integria_inventory';
+DELETE FROM `tconfig` WHERE `token` LIKE 'integria_url';
 
 -- ---------------------------------------------------------------------
 -- Table `tconfig_os`
@@ -1446,6 +1453,7 @@ ALTER TABLE `treport_content` ADD COLUMN `agent_min_value` TINYINT(1) DEFAULT '1
 ALTER TABLE `treport_content` ADD COLUMN `current_month` TINYINT(1) DEFAULT '1';
 ALTER TABLE `treport_content` ADD COLUMN `failover_mode` tinyint(1) DEFAULT '0';
 ALTER TABLE `treport_content` ADD COLUMN `failover_type` tinyint(1) DEFAULT '0';
+ALTER table `treport_content` MODIFY COLUMN `name` varchar(300) NULL;
 
 -- ---------------------------------------------------------------------
 -- Table `tmodule_relationship`
@@ -2219,3 +2227,44 @@ CREATE TABLE IF NOT EXISTS `tcredential_store` (
 -- Table `treport_content_sla_combined`
 -- ---------------------------------------------------------------------
 ALTER TABLE `treport_content_sla_combined` ADD `id_agent_module_failover` int(10) unsigned NOT NULL;
+
+-- ---------------------------------------------------------------------
+-- Table `tagent_repository`
+-- ---------------------------------------------------------------------
+CREATE TABLE `tagent_repository` (
+  `id` SERIAL,
+  `id_os` INT(10) UNSIGNED DEFAULT 0,
+  `arch` ENUM('x64', 'x86') DEFAULT 'x64',
+  `version` VARCHAR(10) DEFAULT '',
+  `path` text,
+  `uploaded_by` VARCHAR(100) DEFAULT '',
+  `uploaded` bigint(20) NOT NULL DEFAULT 0 COMMENT "When it was uploaded",
+  `last_err` text,
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`id_os`) REFERENCES `tconfig_os`(`id_os`)
+    ON UPDATE CASCADE ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------------------------------------------------
+-- Table `tdeployment_hosts`
+-- ----------------------------------------------------------------------
+CREATE TABLE `tdeployment_hosts` (
+  `id` SERIAL,
+  `id_cs` VARCHAR(100),
+  `ip` VARCHAR(100) NOT NULL UNIQUE,
+  `id_os` INT(10) UNSIGNED DEFAULT 0,
+  `os_version` VARCHAR(100) DEFAULT '' COMMENT "OS version in STR format",
+  `arch` ENUM('x64', 'x86') DEFAULT 'x64',
+  `current_agent_version` VARCHAR(100) DEFAULT '' COMMENT "String latest installed agent",
+  `target_agent_version_id` BIGINT UNSIGNED,
+  `deployed` bigint(20) NOT NULL DEFAULT 0 COMMENT "When it was deployed",
+  `server_ip` varchar(100) default NULL COMMENT "Where to point target agent",
+  `last_err` text,
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`id_cs`) REFERENCES `tcredential_store`(`identifier`)
+    ON UPDATE CASCADE ON DELETE SET NULL,
+  FOREIGN KEY (`id_os`) REFERENCES `tconfig_os`(`id_os`)
+    ON UPDATE CASCADE ON DELETE CASCADE,
+  FOREIGN KEY (`target_agent_version_id`) REFERENCES  `tagent_repository`(`id`)
+    ON UPDATE CASCADE ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index a093596b2b..99bb38cc21 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -670,21 +670,49 @@ if ($config['menu_type'] == 'classic') {
 
         <?php
         if ($_GET['refr'] || $do_refresh === true) {
+            if ($_GET['sec2'] == 'operation/events/events') {
+                $autorefresh_draw = true;
+            }
             ?>
+
+            var autorefresh_draw = '<?php echo $autorefresh_draw; ?>';
             $("#header_autorefresh").css('padding-right', '5px');
-            var refr_time = <?php echo (int) get_parameter('refr', $config['refr']); ?>;
-            var t = new Date();
-            t.setTime (t.getTime () + parseInt(<?php echo ($config['refr'] * 1000); ?>));
-            $("#refrcounter").countdown ({
-                until: t, 
-                layout: '%M%nn%M:%S%nn%S',
-                labels: ['', '', '', '', '', '', ''],
-                onExpiry: function () {
+            if(autorefresh_draw == true) { 
+                var refresh_interval = parseInt('<?php echo ($config['refr'] * 1000); ?>');
+                var until_time='';
+
+                function events_refresh() {
+                    until_time = new Date();
+                    until_time.setTime (until_time.getTime () + parseInt(<?php echo ($config['refr'] * 1000); ?>));
+
+                    $("#refrcounter").countdown ({
+                        until: until_time, 
+                        layout: '%M%nn%M:%S%nn%S',
+                        labels: ['', '', '', '', '', '', ''],
+                        onExpiry: function () {
+                            dt_events.draw(false);
+                        }
+                    });
+                }
+                // Start the countdown when page is loaded (first time).
+                events_refresh();
+                // Repeat countdown according to refresh_interval.
+                setInterval(events_refresh, refresh_interval);
+            } else {
+                var refr_time = <?php echo (int) get_parameter('refr', $config['refr']); ?>;
+                var t = new Date();
+                t.setTime (t.getTime () + parseInt(<?php echo ($config['refr'] * 1000); ?>)); 
+                $("#refrcounter").countdown ({
+                    until: t, 
+                    layout: '%M%nn%M:%S%nn%S',
+                    labels: ['', '', '', '', '', '', ''],
+                    onExpiry: function () {
                         href = $("a.autorefresh").attr ("href");
                         href = href + refr_time;
                         $(document).attr ("location", href);
                     }
                 });
+            }
             <?php
         }
         ?>
@@ -694,8 +722,38 @@ if ($config['menu_type'] == 'classic') {
             $("#combo_refr").toggle ();
             $("select#ref").change (function () {
                 href = $("a.autorefresh").attr ("href");
-                $(document).attr ("location", href + this.value);
-            });
+            
+                if(autorefresh_draw == true){
+                    inputs = $("#events_form :input");
+                    values = {};
+                    inputs.each(function() {
+                        values[this.name] = $(this).val();
+                    })
+
+                    var newValue = btoa(JSON.stringify(values));           
+                    <?php
+                    // Check if the url has the parameter fb64.
+                    if ($_GET['fb64']) {
+                        $fb64 = $_GET['fb64'];
+                        ?>
+                            var fb64 = '<?php echo $fb64; ?>';  
+                            // Check if the filters have changed.
+                            if(fb64 !== newValue){
+                                href = href.replace(fb64, newValue);
+                            } 
+
+                            $(document).attr("location", href+ '&refr=' + this.value);
+                        <?php
+                    } else {
+                        ?>
+                            $(document).attr("location", href+'&fb64=' + newValue + '&refr=' + this.value);
+                        <?php
+                    }
+                    ?>
+                } else {
+                    $(document).attr ("location", href + this.value);
+                }
+        });
             
             return false;
         });
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 4fbdf93140..5aecfcc92c 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -376,6 +376,9 @@ if (isset($correct_reset_pass_process)) {
 }
 
 if (isset($login_failed)) {
+    $nick = get_parameter_post('nick');
+    $fails = db_get_value('failed_attempt', 'tusuario', 'id_user', $nick);
+    $attemps = ($config['number_attempts'] - $fails);
     echo '<div id="login_failed" title="'.__('Login failed').'">';
         echo '<div class="content_alert">';
             echo '<div class="icon_message_alert">';
@@ -386,6 +389,12 @@ if (isset($login_failed)) {
                     echo '<h1>'.__('ERROR').'</h1>';
                     echo '<p>'.$config['auth_error'].'</p>';
                 echo '</div>';
+    if ($config['enable_pass_policy']) {
+        echo '<div class="text_message_alert">';
+            echo '<p><strong>Remaining attempts: '.$attemps.'</strong></p>';
+        echo '</div>';
+    }
+
                 echo '<div class="button_message_alert">';
                     html_print_submit_button('Ok', 'hide-login-error', false);
                 echo '</div>';
@@ -680,5 +689,6 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
             $("#final_process_correct").dialog('close');
         });        
     });
+
     /* ]]> */
 </script>
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index a02f6c11ac..cdbc09c9f9 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -172,6 +172,7 @@ unset($table);
 echo '<div id="right">';
 
 // News.
+require_once 'general/news_dialog.php';
 $options = [];
 $options['id_user'] = $config['id_user'];
 $options['modal'] = false;
@@ -188,6 +189,7 @@ if (!empty($news)) {
         $comparation_suffix = __('ago');
     }
 
+
     $output_news = '<div id="news_board" class="new">';
     foreach ($news as $article) {
         $image = false;
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 3ea3a7f0c2..6ee2343fc0 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -77,6 +77,7 @@ if (is_ajax()) {
     }
 
     $get_modules_json_for_multiple_snmp = (bool) get_parameter('get_modules_json_for_multiple_snmp', 0);
+    $get_common_modules = (bool) get_parameter('get_common_modules', 1);
     if ($get_modules_json_for_multiple_snmp) {
         include_once 'include/graphs/functions_utils.php';
 
@@ -100,7 +101,16 @@ if (is_ajax()) {
             if ($out === false) {
                 $out = $oid_snmp;
             } else {
-                $out = array_intersect($out, $oid_snmp);
+                $commons = array_intersect($out, $oid_snmp);
+                if ($get_common_modules) {
+                    // Common modules is selected (default)
+                    $out = $commons;
+                } else {
+                    // All modules is selected
+                    $array1 = array_diff($out, $oid_snmp);
+                    $array2 = array_diff($oid_snmp, $out);
+                    $out = array_merge($commons, $array1, $array2);
+                }
             }
 
             $oid_snmp = [];
@@ -201,7 +211,7 @@ if (!$new_agent && $alias != '') {
     $table_agent_name .= '<div class="label_select_child_right agent_options_agent_name" style="width: 40%;">';
 
     if ($id_agente) {
-        $table_agent_name .= '<label>'.__('ID').'</label><input style="width: 50%;" type="text" disabled="true" value="'.$id_agente.'" />';
+        $table_agent_name .= '<label>'.__('ID').'</label><input style="width: 50%;" type="text" readonly value="'.$id_agente.'" />';
         $table_agent_name .= '<a href="index.php?sec=gagente&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'">';
         $table_agent_name .= html_print_image(
             'images/zoom.png',
@@ -372,13 +382,13 @@ $table_server = '<div class="label_select"><p class="input_label">'.__('Server')
 $table_server .= '<div class="label_select_parent">';
 if ($new_agent) {
     // Set first server by default.
-    $servers_get_names = servers_get_names();
+    $servers_get_names = $servers;
     $array_keys_servers_get_names = array_keys($servers_get_names);
     $server_name = reset($array_keys_servers_get_names);
 }
 
 $table_server .= html_print_select(
-    servers_get_names(),
+    $servers,
     'server_name',
     $server_name,
     '',
@@ -514,8 +524,10 @@ if (enterprise_installed()) {
         );
         $safe_mode_modules = [];
         $safe_mode_modules[0] = __('Any');
-        foreach ($sql_modules as $m) {
-            $safe_mode_modules[$m['id_module']] = $m['name'];
+        if (is_array($sql_modules)) {
+            foreach ($sql_modules as $m) {
+                $safe_mode_modules[$m['id_module']] = $m['name'];
+            }
         }
 
         $table_adv_safe = '<div class="label_select_simple label_simple_items"><p class="input_label input_label_simple">'.__('Safe operation mode').': '.ui_print_help_tip(
@@ -792,20 +804,20 @@ $table_adv_options .= '
         '.$table_adv_gis.$table_adv_agent_icon.$table_adv_url.$table_adv_quiet.$table_adv_status.$table_adv_remote.$table_adv_safe.'
         </div>';
 
-
-echo '<div class="ui_toggle">';
-ui_toggle(
-    $table_adv_options,
-    __('Advanced options'),
-    '',
-    '',
-    true,
-    false,
-    'white_box white_box_opened',
-    'no-border flex'
-);
-echo '</div>';
-
+if (enterprise_installed()) {
+    echo '<div class="ui_toggle">';
+    ui_toggle(
+        $table_adv_options,
+        __('Advanced options'),
+        '',
+        '',
+        true,
+        false,
+        'white_box white_box_opened',
+        'no-border flex'
+    );
+    echo '</div>';
+}
 
 $table = new stdClass();
 $table->width = '100%';
@@ -813,7 +825,7 @@ $table->class = 'custom_fields_table';
 
 $table->head = [
     0 => __('Click to display').ui_print_help_tip(
-        __('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url]').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url]'),
+        __('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url] or [url]\'url to navigate\'[/url] ').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url] or [url]www.goole.com[/url]'),
         true
     ),
 ];
@@ -919,18 +931,48 @@ foreach ($fields as $field) {
     $i += 2;
 }
 
-if (!empty($fields)) {
+if (enterprise_installed()) {
+    if (!empty($fields)) {
+        echo '<div class="ui_toggle">';
+        ui_toggle(
+            html_print_table($table, true),
+            __('Custom fields'),
+            '',
+            '',
+            true,
+            false,
+            'white_box white_box_opened',
+            'no-border'
+        );
+        echo '</div>';
+    }
+} else {
     echo '<div class="ui_toggle">';
     ui_toggle(
-        html_print_table($table, true),
-        __('Custom fields'),
+        $table_adv_options,
+        __('Advanced options'),
         '',
         '',
         true,
         false,
         'white_box white_box_opened',
-        'no-border'
+        'no-border flex'
     );
+    if (!empty($fields)) {
+        ui_toggle(
+            html_print_table($table, true),
+            __('Custom fields'),
+            '',
+            '',
+            true,
+            false,
+            'white_box white_box_opened',
+            'no-border'
+        );
+    }
+
+    echo '<div class="action-buttons" style="display: flex; justify-content: flex-end; align-items: center; width: '.$table->width.'">';
+
     echo '</div>';
 }
 
@@ -1162,6 +1204,19 @@ ui_require_jquery_file('bgiframe');
     }
 
     $(document).ready (function() {
+
+        var previous_primary_group_select;
+        $("#grupo").on('focus', function () {
+            previous_primary_group_select = this.value;
+        }).change(function() {
+            if ($("#secondary_groups_selected option[value="+$("#grupo").val()+"]").length) {
+                alert("<?php echo __('Secondary group cannot be primary too.'); ?>");
+                $("#grupo").val(previous_primary_group_select);
+            } else {
+                previous_primary_group_select = this.value;
+            }
+        });
+
         $("select#id_os").pandoraSelectOS ();
 
         var checked = $("#checkbox-cascade_protection").is(":checked");
@@ -1210,7 +1265,7 @@ ui_require_jquery_file('bgiframe');
             128,
             128
         );
-        $("#text-agente").prop('disabled', true);
+        $("#text-agente").prop('readonly', true);
 
     });
 </script>
diff --git a/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php b/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
index 2dca9353ac..3eb404340e 100644
--- a/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
+++ b/pandora_console/godmode/agentes/agent_wizard.snmp_interfaces_explorer.php
@@ -1,16 +1,32 @@
 <?php
+/**
+ * Extension to manage a list of gateways and the node address where they should
+ * point to.
+ *
+ * @category   SNMP interfaces.
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2011 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
 global $config;
 require_once $config['homedir'].'/include/functions_agents.php';
 require_once 'include/functions_modules.php';
@@ -36,10 +52,10 @@ $snmp3_privacy_method = get_parameter('snmp3_privacy_method');
 $snmp3_privacy_pass = io_safe_output(get_parameter('snmp3_privacy_pass'));
 $tcp_port = (string) get_parameter('tcp_port');
 
-// See if id_agente is set (either POST or GET, otherwise -1
+// See if id_agente is set (either POST or GET, otherwise -1.
 $id_agent = $idAgent;
 
-// Get passed variables
+// Get passed variables.
 $snmpwalk = (int) get_parameter('snmpwalk', 0);
 $create_modules = (int) get_parameter('create_modules', 0);
 
@@ -47,7 +63,7 @@ $interfaces = [];
 $interfaces_ip = [];
 
 if ($snmpwalk) {
-    // OID Used is for SNMP MIB-2 Interfaces
+    // OID Used is for SNMP MIB-2 Interfaces.
     $snmpis = get_snmpwalk(
         $ip_target,
         $snmp_version,
@@ -63,7 +79,7 @@ if ($snmpwalk) {
         $tcp_port,
         $server_to_exec
     );
-    // ifXTable is also used
+    // IfXTable is also used.
     $ifxitems = get_snmpwalk(
         $ip_target,
         $snmp_version,
@@ -80,7 +96,7 @@ if ($snmpwalk) {
         $server_to_exec
     );
 
-    // Get the interfaces IPV4/IPV6
+    // Get the interfaces IPV4/IPV6.
     $snmp_int_ip = get_snmpwalk(
         $ip_target,
         $snmp_version,
@@ -97,12 +113,12 @@ if ($snmpwalk) {
         $server_to_exec
     );
 
-    // Build a [<interface id>] => [<interface ip>] array
+    // Build a [<interface id>] => [<interface ip>] array.
     if (!empty($snmp_int_ip)) {
         foreach ($snmp_int_ip as $key => $value) {
-            // The key is something like IP-MIB::ipAddressIfIndex.ipv4."<ip>"
-            // or IP-MIB::ipAddressIfIndex.ipv6."<ip>"
-            // The value is something like INTEGER: <interface id>
+            // The key is something like IP-MIB::ipAddressIfIndex.ipv4."<ip>".
+            // or IP-MIB::ipAddressIfIndex.ipv6."<ip>".
+            // The value is something like INTEGER: <interface id>.
             $data = explode(': ', $value);
             $interface_id = !empty($data) && isset($data[1]) ? $data[1] : false;
 
@@ -110,7 +126,7 @@ if ($snmpwalk) {
                 $interface_ip = $matches[1];
             }
 
-            // Get the first ip
+            // Get the first ip.
             if ($interface_id !== false && !empty($interface_ip) && !isset($interfaces_ip[$interface_id])) {
                 $interfaces_ip[$interface_id] = $interface_ip;
             }
@@ -119,17 +135,17 @@ if ($snmpwalk) {
         unset($snmp_int_ip);
     }
 
-    $snmpis = array_merge(($snmpis === false ? [] : $snmpis), ($ifxitems === false ? [] : $ifxitems));
+    $snmpis = array_merge((($snmpis === false) ? [] : $snmpis), (($ifxitems === false) ? [] : $ifxitems));
 
     $interfaces = [];
 
-    // We get here only the interface part of the MIB, not full mib
+    // We get here only the interface part of the MIB, not full mib.
     foreach ($snmpis as $key => $snmp) {
         $data = explode(': ', $snmp, 2);
         $keydata = explode('::', $key);
         $keydata2 = explode('.', $keydata[1]);
 
-        // Avoid results without index and interfaces without name
+        // Avoid results without index and interfaces without name.
         if (!isset($keydata2[1]) || !isset($data[1])) {
             continue;
         }
@@ -239,24 +255,22 @@ if ($create_modules) {
             $oid_array[(count($oid_array) - 1)] = $id;
             $oid = implode('.', $oid_array);
 
-            // Get the name
+            // Get the name.
             $name_array = explode('::', $oid_array[0]);
             $name = $ifname.'_'.$name_array[1];
 
-            // Clean the name
+            // Clean the name.
             $name = str_replace('"', '', $name);
 
-            // Proc moduletypes
+            // Proc moduletypes.
             if (preg_match('/Status/', $name_array[1])) {
                 $module_type = 18;
             } else if (preg_match('/Present/', $name_array[1])) {
                 $module_type = 18;
             } else if (preg_match('/PromiscuousMode/', $name_array[1])) {
                 $module_type = 18;
-            }
-
-            // String moduletypes
-            else if (preg_match('/Alias/', $name_array[1])) {
+            } else if (preg_match('/Alias/', $name_array[1])) {
+                // String moduletypes.
                 $module_type = 17;
             } else if (preg_match('/Address/', $name_array[1])) {
                 $module_type = 17;
@@ -266,15 +280,11 @@ if ($create_modules) {
                 $module_type = 17;
             } else if (preg_match('/Descr/', $name_array[1])) {
                 $module_type = 17;
-            }
-
-            // Specific counters (ends in s)
-            else if (preg_match('/s$/', $name_array[1])) {
+            } else if (preg_match('/s$/', $name_array[1])) {
+                // Specific counters (ends in s).
                 $module_type = 16;
-            }
-
-            // Otherwise, numeric
-            else {
+            } else {
+                // Otherwise, numeric.
                 $module_type = 15;
             }
 
@@ -330,7 +340,7 @@ if ($create_modules) {
 
                     $output_oid = '';
 
-                    exec('ssh pandora_exec_proxy@'.$row['ip_address'].' snmptranslate -On '.$oid, $output_oid, $rc);
+                    exec('snmptranslate -On '.$oid, $output_oid, $rc);
 
                     $conf_oid = $output_oid[0];
                     $oid = $conf_oid;
@@ -397,7 +407,9 @@ if ($create_modules) {
     }
 
     if ($done > 0) {
-        ui_print_success_message(__('Successfully modules created')." ($done)");
+        ui_print_success_message(
+            __('Successfully modules created').' ('.$done.')'
+        );
     }
 
     if (!empty($errors)) {
@@ -407,17 +419,17 @@ if ($create_modules) {
         foreach ($errors as $code => $number) {
             switch ($code) {
                 case ERR_EXIST:
-                    $msg .= '<br>'.__('Another module already exists with the same name')." ($number)";
+                    $msg .= '<br>'.__('Another module already exists with the same name').' ('.$number.')';
                 break;
 
                 case ERR_INCOMPLETE:
-                    $msg .= '<br>'.__('Some required fields are missed').': ('.__('name').') '." ($number)";
+                    $msg .= '<br>'.__('Some required fields are missed').': ('.__('name').') ('.$number.')';
                 break;
 
                 case ERR_DB:
                 case ERR_GENERIC:
                 default:
-                    $msg .= '<br>'.__('Processing error')." ($number)";
+                    $msg .= '<br>'.__('Processing error').' ('.$number.')';
                 break;
             }
         }
@@ -426,10 +438,10 @@ if ($create_modules) {
     }
 }
 
-// Create the interface list for the interface
+// Create the interface list for the interface.
 $interfaces_list = [];
 foreach ($interfaces as $interface) {
-    // Get the interface name, removing " " characters and avoid "blank" interfaces
+    // Get the interface name, removing " " characters and avoid "blank" interfaces.
     if (isset($interface['ifDescr']) && $interface['ifDescr']['value'] != '') {
         $ifname = $interface['ifDescr']['value'];
     } else if (isset($interface['ifName']) && $interface['ifName']['value'] != '') {
@@ -442,7 +454,7 @@ foreach ($interfaces as $interface) {
 }
 
 echo '<span id ="none_text" style="display: none;">'.__('None').'</span>';
-echo "<form method='post' id='walk_form' action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=snmp_interfaces_explorer&id_agente=$id_agent'>";
+echo "<form method='post' id='walk_form' action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=snmp_interfaces_explorer&id_agente=".$id_agent."'>";
 
 $table->width = '100%';
 $table->cellpadding = 0;
@@ -464,12 +476,14 @@ if (enterprise_installed()) {
     enterprise_include_once('include/functions_satellite.php');
 
     $rows = get_proxy_servers();
+
+    // Check if satellite server has remote configuration enabled.
+    $satellite_remote = config_agents_has_remote_configuration($id_agent);
+
     foreach ($rows as $row) {
         if ($row['server_type'] != 13) {
             $s_type = ' (Standard)';
         } else {
-            // Check if satellite server has remote configuration enabled
-            $satellite_remote = config_agents_has_remote_configuration($id_agent);
             $id_satellite = $row['id_server'];
             $s_type = ' (Satellite)';
         }
@@ -484,8 +498,7 @@ $table->data[1][4] = html_print_select(
     $servers_to_exec,
     'server_to_exec',
     $server_to_exec,
-    'satellite_remote_warn('.$id_satellite.','.$satellite_remote.')
-',
+    'satellite_remote_warn('.$id_satellite.','.$satellite_remote.')',
     '',
     '',
     true
@@ -509,7 +522,7 @@ html_print_table($table);
 
 unset($table);
 
-// SNMP3 OPTIONS
+// SNMP3 OPTIONS.
 $table->width = '100%';
 
 $table->data[2][1] = '<b>'.__('Auth user').'</b>';
@@ -564,7 +577,7 @@ echo '</form>';
 
 if (!empty($interfaces_list)) {
     echo '<span id ="none_text" style="display: none;">'.__('None').'</span>';
-    echo "<form method='post' action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=snmp_interfaces_explorer&id_agente=$id_agent'>";
+    echo "<form method='post' action='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=agent_wizard&wizard_section=snmp_interfaces_explorer&id_agente=".$id_agent."'>";
     echo '<span id="form_interfaces">';
 
     $id_snmp_serialize = serialize_in_temp($interfaces, $config['id_user'].'_snmp');
@@ -589,13 +602,30 @@ if (!empty($interfaces_list)) {
 
     $table->width = '100%';
 
-    // Agent selector
+    // Agent selector.
     $table->data[0][0] = '<b>'.__('Interfaces').'</b>';
     $table->data[0][1] = '';
     $table->data[0][2] = '<b>'.__('Modules').'</b>';
 
     $table->data[1][0] = html_print_select($interfaces_list, 'id_snmp[]', 0, false, '', '', true, true, true, '', false, 'width:500px; overflow: auto;');
-    $table->data[1][1] = html_print_image('images/darrowright.png', true);
+
+    $table->data[1][1] = __('When selecting interfaces');
+    $table->data[1][1] .= '<br>';
+    $table->data[1][1] .= html_print_select(
+        [
+            1 => __('Show common modules'),
+            0 => __('Show all modules'),
+        ],
+        'modules_selection_mode',
+        1,
+        false,
+        '',
+        '',
+        true,
+        false,
+        false
+    );
+
     $table->data[1][2] = html_print_select([], 'module[]', 0, false, '', 0, true, true, true, '', false, 'width:200px;');
     $table->data[1][2] .= html_print_input_hidden('agent', $id_agent, true);
 
@@ -619,12 +649,10 @@ ui_require_jquery_file('bgiframe');
 /* <![CDATA[ */
 
 $(document).ready (function () {
-
-
     var inputActive = true;
 
     $('#server_to_exec option').trigger('change');
-    
+
     $(document).data('text_for_module', $("#none_text").html());
 
     $("#id_snmp").change(snmp_changed_by_multiple_snmp);
@@ -645,10 +673,16 @@ $(document).ready (function () {
         $("#form_interfaces").hide ();
     });
 
+    // When select interfaces changes
+    $("#modules_selection_mode").change (function() {
+        $("#id_snmp").trigger('change');
+    });
+
 });
 
 function snmp_changed_by_multiple_snmp (event, id_snmp, selected) {
     var idSNMP = Array();
+    var get_common_modules = $("#modules_selection_mode option:selected").val();
 
     jQuery.each ($("#id_snmp option:selected"), function (i, val) {
         idSNMP.push($(val).val());
@@ -660,6 +694,7 @@ function snmp_changed_by_multiple_snmp (event, id_snmp, selected) {
     jQuery.post ('ajax.php',
         {"page" : "godmode/agentes/agent_manager",
             "get_modules_json_for_multiple_snmp": 1,
+            "get_common_modules" : get_common_modules,
             "id_snmp[]": idSNMP,
             "id_snmp_serialize": $("#hidden-id_snmp_serialize").val()
         },
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 842f6c3d46..e97fa7cf39 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1358,7 +1358,11 @@ if ($update_module || $create_module) {
 
     $parent_module_id = (int) get_parameter('parent_module_id');
     $ip_target = (string) get_parameter('ip_target');
-    if ($ip_target == '') {
+    // No autofill if the module is a webserver module.
+    if ($ip_target == ''
+        && $id_module_type < MODULE_WEBSERVER_CHECK_LATENCY
+        && $id_module_type > MODULE_WEBSERVER_RETRIEVE_STRING_DATA
+    ) {
         $ip_target = 'auto';
     }
 
@@ -1381,11 +1385,7 @@ if ($update_module || $create_module) {
     $ff_type = (int) get_parameter('ff_type');
     $each_ff = (int) get_parameter('each_ff');
     $ff_timeout = (int) get_parameter('ff_timeout');
-    $unit = (string) get_parameter('unit_select');
-    if ($unit == 'none') {
-        $unit = (string) get_parameter('unit_text');
-    }
-
+    $unit = (string) get_parameter('unit');
     $id_tag = (array) get_parameter('id_tag_selected');
     $serialize_ops = (string) get_parameter('serialize_ops');
     $critical_instructions = (string) get_parameter('critical_instructions');
@@ -1559,8 +1559,14 @@ if ($update_module) {
 
         foreach ($plugin_parameter_split as $key => $value) {
             if ($key == 1) {
-                $values['plugin_parameter'] .= 'http_auth_user&#x20;'.$http_user.'&#x0a;';
-                $values['plugin_parameter'] .= 'http_auth_pass&#x20;'.$http_pass.'&#x0a;';
+                if ($http_user) {
+                    $values['plugin_parameter'] .= 'http_auth_user&#x20;'.$http_user.'&#x0a;';
+                }
+
+                if ($http_pass) {
+                    $values['plugin_parameter'] .= 'http_auth_pass&#x20;'.$http_pass.'&#x0a;';
+                }
+
                 $values['plugin_parameter'] .= $value.'&#x0a;';
             } else {
                 $values['plugin_parameter'] .= $value.'&#x0a;';
@@ -1757,8 +1763,14 @@ if ($create_module) {
 
         foreach ($plugin_parameter_split as $key => $value) {
             if ($key == 1) {
-                $values['plugin_parameter'] .= 'http_auth_user&#x20;'.$http_user.'&#x0a;';
-                $values['plugin_parameter'] .= 'http_auth_pass&#x20;'.$http_pass.'&#x0a;';
+                if ($http_user) {
+                    $values['plugin_parameter'] .= 'http_auth_user&#x20;'.$http_user.'&#x0a;';
+                }
+
+                if ($http_pass) {
+                    $values['plugin_parameter'] .= 'http_auth_pass&#x20;'.$http_pass.'&#x0a;';
+                }
+
                 $values['plugin_parameter'] .= $value.'&#x0a;';
             } else {
                 $values['plugin_parameter'] .= $value.'&#x0a;';
@@ -2095,8 +2107,7 @@ if ($delete_module) {
     }
 }
 
-// MODULE DUPLICATION
-// ==================.
+// MODULE DUPLICATION.
 if (!empty($duplicate_module)) {
     // DUPLICATE agent module !
     $id_duplicate_module = $duplicate_module;
@@ -2142,8 +2153,46 @@ if (!empty($duplicate_module)) {
     }
 }
 
-// UPDATE GIS
-// ==========.
+// MODULE ENABLE/DISABLE.
+if ($enable_module) {
+    $result = modules_change_disabled($enable_module, 0);
+    $modulo_nombre = db_get_row_sql('SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = '.$enable_module.'');
+    $modulo_nombre = $modulo_nombre['nombre'];
+
+    if ($result === NOERR) {
+        enterprise_hook('config_agents_enable_module_conf', [$id_agente, $enable_module]);
+        db_pandora_audit('Module management', 'Enable #'.$enable_module.' | '.$modulo_nombre.' | '.$agent['alias']);
+    } else {
+        db_pandora_audit('Module management', 'Fail to enable #'.$enable_module.' | '.$modulo_nombre.' | '.$agent['alias']);
+    }
+
+    ui_print_result_message(
+        $result,
+        __('Successfully enabled'),
+        __('Could not be enabled')
+    );
+}
+
+if ($disable_module) {
+    $result = modules_change_disabled($disable_module, 1);
+    $modulo_nombre = db_get_row_sql('SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = '.$disable_module.'');
+    $modulo_nombre = $modulo_nombre['nombre'];
+
+    if ($result === NOERR) {
+        enterprise_hook('config_agents_disable_module_conf', [$id_agente, $disable_module]);
+        db_pandora_audit('Module management', 'Disable #'.$disable_module.' | '.$modulo_nombre.' | '.$agent['alias']);
+    } else {
+        db_pandora_audit('Module management', 'Fail to disable #'.$disable_module.' | '.$modulo_nombre.' | '.$agent['alias']);
+    }
+
+    ui_print_result_message(
+        $result,
+        __('Successfully disabled'),
+        __('Could not be disabled')
+    );
+}
+
+// UPDATE GIS.
 $updateGIS = get_parameter('update_gis', 0);
 if ($updateGIS) {
     $updateGisData = get_parameter('update_gis_data');
@@ -2231,8 +2280,11 @@ switch ($tab) {
     break;
 
     case 'alert':
-        // Because $id_agente is set, it will show only agent alerts.
-        // This var is for not display create button on alert list.
+        /*
+         * Because $id_agente is set, it will show only agent alerts
+         * This var is for not display create button on alert list
+         */
+
         $dont_display_alert_create_bttn = true;
         include 'godmode/alerts/alert_list.php';
     break;
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index ba5ac4f2be..a383de35c4 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -443,6 +443,14 @@ ui_pagination($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modific
 
 if ($agents !== false) {
     // Urls to sort the table.
+    // Agent name size and description for Chinese and Japanese languages ​​are adjusted
+    $agent_font_size = '7';
+    $description_font_size = '6.5';
+    if ($config['language'] == 'ja' || $config['language'] == 'zh_CN' || $own_info['language'] == 'ja' || $own_info['language'] == 'zh_CN') {
+        $agent_font_size = '15';
+        $description_font_size = '11';
+    }
+
     $url_up_agente = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=up&disabled=$disabled';
     $url_down_agente = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=down&disabled=$disabled';
     $url_up_remote = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=up&disabled=$disabled';
@@ -529,7 +537,7 @@ if ($agents !== false) {
         } else {
             echo '<a alt ='.$agent['nombre']." href='index.php?sec=gagente&
 			sec2=godmode/agentes/configurar_agente&tab=$main_tab&
-			id_agente=".$agent['id_agente']."'>".'<span style="font-size: 7pt" title="'.$agent['nombre'].'">'.$agent['alias'].'</span>'.'</a>';
+			id_agente=".$agent['id_agente']."'>".'<span style="font-size: '.$agent_font_size.'pt" title="'.$agent['nombre'].'">'.$agent['alias'].'</span>'.'</a>';
         }
 
         echo '</strong>';
@@ -629,7 +637,7 @@ if ($agents !== false) {
         // Group icon and name
         echo "<td class='$tdcolor' align='left' valign='middle'>".ui_print_group_icon($agent['id_grupo'], true).'</td>';
         // Description
-        echo "<td class='".$tdcolor."f9'>".ui_print_truncate_text($agent['comentarios'], 'description', true, true, true, '[&hellip;]', 'font-size: 6.5pt;').'</td>';
+        echo "<td class='".$tdcolor."f9'>".ui_print_truncate_text($agent['comentarios'], 'description', true, true, true, '[&hellip;]', 'font-size: '.$description_font_size.'pt;').'</td>';
         // Action
         // When there is only one element in page it's necesary go back page.
         if ((count($agents) == 1) && ($offset >= $config['block_size'])) {
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 476b9a73dd..ac110b0d6f 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -141,7 +141,9 @@ $largeClassDisabledBecauseInPolicy = '';
 
 $page = get_parameter('page', '');
 
-if (strstr($page, 'policy_modules') === false && $id_agent_module) {
+$in_policies_page = strstr($page, 'policy_modules');
+
+if ($in_policies_page === false && $id_agent_module) {
     if ($config['enterprise_installed']) {
         if (policies_is_module_linked($id_agent_module) == 1) {
             $disabledBecauseInPolicy = 1;
@@ -250,6 +252,12 @@ $table_simple->data[0][3] .= html_print_select_from_sql(
     $disabledBecauseInPolicy
 );
 
+if ((isset($id_agent_module) && $id_agent_module) || $id_policy_module != 0) {
+    $edit = false;
+} else {
+    $edit = true;
+}
+
 $in_policy = strstr($page, 'policy_modules');
 if (!$in_policy) {
     // Cannot select the current module to be itself parent
@@ -280,17 +288,6 @@ if (!$in_policy) {
 $table_simple->data[2][0] = __('Type').' '.ui_print_help_icon($help_type, true, '', 'images/help_green.png', '', 'module_type_help');
 $table_simple->data[2][0] .= html_print_input_hidden('id_module_type_hidden', $id_module_type, true);
 
-if (isset($id_agent_module)) {
-    if ($id_agent_module) {
-        $edit = false;
-    } else {
-        $edit = true;
-    }
-} else {
-    // Run into a policy
-    $edit = true;
-}
-
 if (!$edit) {
     $sql = sprintf(
         'SELECT id_tipo, nombre
diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php
index b2b9763d56..e66e1d30b4 100644
--- a/pandora_console/godmode/events/event_edit_filter.php
+++ b/pandora_console/godmode/events/event_edit_filter.php
@@ -232,10 +232,17 @@ $table->data[0][0] = '<b>'.__('Filter name').'</b>';
 $table->data[0][1] = html_print_input_text('id_name', $id_name, false, 20, 80, true);
 
 $table->data[1][0] = '<b>'.__('Save in group').'</b>'.ui_print_help_tip(__('This group will be use to restrict the visibility of this filter with ACLs'), true);
+
+$returnAllGroup = users_can_manage_group_all();
+// If the user can't manage All group but the filter is for All group, the user should see All group in the select.
+if ($returnAllGroup === false && $id_group_filter == 0) {
+    $returnAllGroup = true;
+}
+
 $table->data[1][1] = html_print_select_groups(
     $config['id_user'],
     $access,
-    users_can_manage_group_all(),
+    $returnAllGroup,
     'id_group_filter',
     $id_group_filter,
     '',
diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php
index 60ba973996..c9c3f7f226 100644
--- a/pandora_console/godmode/events/event_filter.php
+++ b/pandora_console/godmode/events/event_filter.php
@@ -93,10 +93,11 @@ if ($strict_acl) {
         users_can_manage_group_all()
     );
 } else {
+    // All users should see the filters with the All group.
     $groups_user = users_get_groups(
         $config['id_user'],
         $access,
-        users_can_manage_group_all(),
+        true,
         true
     );
 }
diff --git a/pandora_console/godmode/events/event_responses.editor.php b/pandora_console/godmode/events/event_responses.editor.php
index 1705605744..c514ded346 100644
--- a/pandora_console/godmode/events/event_responses.editor.php
+++ b/pandora_console/godmode/events/event_responses.editor.php
@@ -143,12 +143,12 @@ $table->data[3] = $data;
 
 $data = [];
 $data[0] = '<span id="command_label" class="labels">'.__('Command').'</span><span id="url_label" style="display:none;" class="labels">'.__('URL').'</span>'.ui_print_help_icon('response_macros', true);
-$data[1] = html_print_input_text(
+$data[1] = html_print_textarea(
     'target',
+    3,
+    1,
     $event_response['target'],
-    '',
-    100,
-    255,
+    'style="min-height:initial;"',
     true
 );
 
diff --git a/pandora_console/godmode/groups/credential_store.php b/pandora_console/godmode/groups/credential_store.php
index 8c9540d581..3273e1c038 100644
--- a/pandora_console/godmode/groups/credential_store.php
+++ b/pandora_console/godmode/groups/credential_store.php
@@ -369,7 +369,7 @@ echo '</div>';
             text = err.message;
             failed = 1;
         }
-        if (!failed && data['error']) {
+        if (!failed && data['error'] != undefined) {
             title =  "<?php echo __('Failed'); ?>";
             text = data['error'];
             failed = 1;
@@ -522,12 +522,10 @@ echo '</div>';
 
     function calculate_inputs() {
         if ($('#product :selected').val() == "CUSTOM") {
-            $('#div-username label').text('<?php echo __('Username'); ?>');
+            $('#div-username label').text('<?php echo __('User'); ?>');
             $('#div-password label').text('<?php echo __('Password'); ?>');
-            $('#div-extra_1 label').text('<?php echo __('Extra'); ?>');
-            $('#div-extra_2 label').text('<?php echo __('Extra (2)'); ?>');
-            $('#div-extra_1').show();
-            $('#div-extra_2').show();
+            $('#div-extra_1').hide();
+            $('#div-extra_2').hide();
         } else if ($('#product :selected').val() == "AWS") {
             $('#div-username label').text('<?php echo __('Access key ID'); ?>');
             $('#div-password label').text('<?php echo __('Secret access key'); ?>');
@@ -557,8 +555,8 @@ echo '</div>';
             success: function(data) {
                 $('#form_new').html(data);
                 $('#id_group').val(0);
-                // By default AWS.
-                $('#product').val('AWS');
+                // By default CUSTOM.
+                $('#product').val('CUSTOM');
                 calculate_inputs();
 
                 $('#product').on('change', function() {
@@ -590,9 +588,6 @@ echo '</div>';
                             text: 'OK',
                             click: function(e) {
                                 var values = {};
-
-                                console.log($('#form_new'));
-
                                 $('#form_new :input').each(function() {
                                     values[this.name] = btoa($(this).val());
                                 });
diff --git a/pandora_console/godmode/massive/massive_copy_modules.php b/pandora_console/godmode/massive/massive_copy_modules.php
index 5ca25ebc11..36ab0c310c 100755
--- a/pandora_console/godmode/massive/massive_copy_modules.php
+++ b/pandora_console/godmode/massive/massive_copy_modules.php
@@ -273,6 +273,9 @@ $table->data[1][1] = html_print_select(
     true
 );
 
+$table->data['form_agents_filter'][0] = __('Filter Agents');
+$table->data['form_agents_filter'][1] = html_print_input_text('filter_agents', '', '', 20, 255, true);
+
 $table->data[2][0] = __('Agent');
 $table->data[2][0] .= '<span id="destiny_agent_loading" class="invisible">';
 $table->data[2][0] .= html_print_image('images/spinner.png', true);
@@ -354,6 +357,11 @@ $(document).ready (function () {
             /* Hide source agent */
             var selected_agent = $("#source_id_agent").val();
             $("#destiny_id_agent option[value='" + selected_agent + "']").remove();
+        },
+        callbackAfter:function() {
+            //Filter agents. Call the function when the select is fully loaded.
+            var textNoData = "<?php echo __('None'); ?>";
+            filterByText($('#destiny_id_agent'), $("#text-filter_agents"), textNoData);
         }
     });
     
@@ -455,13 +463,14 @@ $(document).ready (function () {
                             $("#fieldset_destiny").hide ();
                             
                             $("span.without_modules, span.without_alerts").show ();
-                            $("span.with_modules, span.with_alerts, #target_table-operations").hide ();
+                            $("span.with_modules, span.with_alerts, #target_table-operations, #target_table-form_modules_filter").hide ();
                         }
                         else {
                             if (no_modules) {
                                 $("span.without_modules").show ();
                                 $("span.with_modules").hide ();
                                 $("#checkbox-copy_modules").uncheck ();
+                                $("#target_table-form_modules_filter").hide ();
                             }
                             else {
                                 $("span.without_modules").hide ();
@@ -479,7 +488,7 @@ $(document).ready (function () {
                                 $("span.with_alerts").show ();
                                 $("#checkbox-copy_alerts").check ();
                             }
-                            $("#fieldset_destiny, #target_table-operations").show ();
+                            $("#fieldset_destiny, #target_table-operations, #target_table-form_modules_filter").show ();
                         }
                         $("#fieldset_targets").show ();
                         $("#target_modules, #target_alerts").enable ();
diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php
index c52878c5da..7d8d64141a 100755
--- a/pandora_console/godmode/massive/massive_delete_modules.php
+++ b/pandora_console/godmode/massive/massive_delete_modules.php
@@ -501,6 +501,11 @@ $table->data['form_agents_4'][1] = html_print_select(
     true
 );
 
+$table->rowstyle['form_agents_filter'] = 'vertical-align: top;';
+$table->rowclass['form_agents_filter'] = 'select_agents_row select_agents_row_2';
+$table->data['form_agents_filter'][0] = __('Filter Agents');
+$table->data['form_agents_filter'][1] = html_print_input_text('filter_agents', '', '', 20, 255, true);
+
 $table->rowstyle['form_agents_3'] = 'vertical-align: top;';
 $table->rowclass['form_agents_3'] = 'select_agents_row select_agents_row_2';
 $table->data['form_agents_3'][0] = __('Agents');
@@ -763,6 +768,9 @@ $(document).ready (function () {
                             .html (value["alias"]);
                         $("#id_agents").append (option);
                     });
+                    //Filter agents. Call the function when the select is fully loaded.
+                    var textNoData = "<?php echo __('None'); ?>";
+                    filterByText($('#id_agents'), $("#text-filter_agents"), textNoData);
                 },
                 "json"
             );
diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php
index da1a0887b5..9a43c661ce 100755
--- a/pandora_console/godmode/massive/massive_edit_agents.php
+++ b/pandora_console/godmode/massive/massive_edit_agents.php
@@ -170,6 +170,8 @@ if ($update_agents) {
     $n_edited = 0;
     $result = false;
     foreach ($id_agents as $id_agent) {
+        $old_interval_value = db_get_value_filter('intervalo', 'tagente', ['id_agente' => $id_agent]);
+
         if (!empty($values)) {
             $group_old = false;
             $disabled_old = false;
@@ -196,6 +198,18 @@ if ($update_agents) {
                 $result_metaconsole = agent_update_from_cache($id_agent, $values, $server_name);
             }
 
+            // Update the configuration files.
+            if ($result && ($old_interval_value != $values['intervalo'])) {
+                enterprise_hook(
+                    'config_agents_update_config_token',
+                    [
+                        $id_agent,
+                        'interval',
+                        $values['intervalo'],
+                    ]
+                );
+            }
+
             if ($disabled_old !== false && $disabled_old != $values['disabled']) {
                 enterprise_hook(
                     'config_agents_update_config_token',
@@ -686,7 +700,7 @@ if ($fields === false) {
 foreach ($fields as $field) {
     $data[0] = '<b>'.$field['name'].'</b>';
     $data[0] .= ui_print_help_tip(
-        __('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url]').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url]'),
+        __('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url] or [url]\'url to navigate\'[/url] ').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url] or [url]www.goole.com[/url]'),
         true
     );
     $combo = [];
diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index 1a18b410d5..013aa83498 100755
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -473,6 +473,11 @@ $table->data['form_agents_4'][1] = html_print_select(
     true
 );
 
+$table->rowstyle['form_agents_filter'] = 'vertical-align: top;';
+$table->rowclass['form_agents_filter'] = 'select_agents_row select_agents_row_2';
+$table->data['form_agents_filter'][0] = __('Filter agents');
+$table->data['form_agents_filter'][1] = html_print_input_text('filter_agents', '', '', 20, 255, true);
+
 $table->rowstyle['form_agents_3'] = 'vertical-align: top;';
 $table->rowclass['form_agents_3'] = 'select_agents_row select_agents_row_2';
 $table->data['form_agents_3'][0] = __('Agents');
@@ -1638,6 +1643,9 @@ $(document).ready (function () {
                             .html(value["alias"]);
                         $("#id_agents").append (option);
                     });
+                    //Filter agents. Call the function when the select is fully loaded.
+                    var textNoData = "<?php echo __('None'); ?>";
+                    filterByText($('#id_agents'), $("#text-filter_agents"), textNoData);
                 },
                 "json"
             );
@@ -1922,11 +1930,7 @@ function process_manage_edit($module_name, $agents_select=null, $module_status='
 
             case 'unit_select':
                 if ($value != -1) {
-                    if ($value == 'none') {
-                        $values['unit'] = (string) get_parameter('unit_text');
-                    } else {
-                        $values['unit'] = $value;
-                    }
+                    $values['unit'] = (string) get_parameter('unit');
                 }
             break;
 
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index 09a2aff770..000a105257 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -24,23 +24,24 @@ $menu_godmode['class'] = 'godmode';
 
 if (check_acl($config['id_user'], 0, 'PM')) {
     $sub = [];
-    $sub['godmode/servers/discovery&wiz=main']['text'] = __('Discovery Main');
+    $sub['godmode/servers/discovery&wiz=main']['text'] = __('Main');
     $sub['godmode/servers/discovery&wiz=main']['id'] = 'Discovery';
 
     $sub['godmode/servers/discovery&wiz=tasklist']['text'] = __('Task list');
     $sub['godmode/servers/discovery&wiz=tasklist']['id'] = 'tasklist';
 
-    $sub['godmode/servers/discovery&wiz=app']['text'] = __('Applications');
-    $sub['godmode/servers/discovery&wiz=app']['id'] = 'app';
-
-    $sub['godmode/servers/discovery&wiz=cloud']['text'] = __('Cloud');
-    $sub['godmode/servers/discovery&wiz=cloud']['id'] = 'cloud';
-
-    $sub['godmode/servers/discovery&wiz=ctask']['text'] = __('Console task');
-    $sub['godmode/servers/discovery&wiz=ctask']['id'] = 'ctask';
-
+    $sub2 = [];
+    $sub2['godmode/servers/discovery&wiz=hd&mode=netscan']['text'] = __('Network scan');
+    enterprise_hook('hostdevices_submenu');
+    $sub2['godmode/servers/discovery&wiz=hd&mode=customnetscan']['text'] = __('Custom network scan');
+    $sub2['godmode/servers/discovery&wiz=hd&mode=managenetscanscripts']['text'] = __('Manage scan scripts');
     $sub['godmode/servers/discovery&wiz=hd']['text'] = __('Host & devices');
     $sub['godmode/servers/discovery&wiz=hd']['id'] = 'hd';
+    $sub['godmode/servers/discovery&wiz=hd']['sub2'] = $sub2;
+
+    enterprise_hook('applications_menu');
+    enterprise_hook('cloud_menu');
+    enterprise_hook('console_task_menu');
 
     // Add to menu.
     $menu_godmode['discovery']['text'] = __('Discovery');
@@ -128,6 +129,7 @@ if (check_acl($config['id_user'], 0, 'PM')) {
     $sub['godmode/modules/manage_network_templates']['id'] = 'Module templates';
     enterprise_hook('inventory_submenu');
     enterprise_hook('autoconfiguration_menu');
+    enterprise_hook('agent_repository_menu');
 }
 
 if (check_acl($config['id_user'], 0, 'AW')) {
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 52a4852d2d..3b5481f2fa 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -854,7 +854,10 @@ $class = 'databox filters';
                 }
                 ?>
                 <?php
-                $text = __('This type of report brings a lot of data loading, it is recommended to use it for scheduled reports and not for real-time view.');
+                if (!isset($text)) {
+                    $text = __('This type of report brings a lot of data loading, it is recommended to use it for scheduled reports and not for real-time view.');
+                }
+
                     echo '<a id="log_help_tip" style="visibility: hidden;" href="javascript:" class="tip" >'.html_print_image('images/tip.png', true, ['title' => $text]).'</a>';
                 ?>
             </td>
@@ -866,7 +869,18 @@ $class = 'databox filters';
             </td>
             <td style="">
                 <?php
-                html_print_input_text('name', $name, '', 80, 100);
+                html_print_input_text(
+                    'name',
+                    $name,
+                    '',
+                    80,
+                    100,
+                    false,
+                    false,
+                    false,
+                    '',
+                    'fullwidth'
+                );
                 ?>
             </td>
         </tr>
@@ -924,7 +938,18 @@ $class = 'databox filters';
             </td>
             <td style="">
                 <?php
-                echo html_print_input_text('label', $label, '', 50, 255, true);
+                echo html_print_input_text(
+                    'label',
+                    $label,
+                    '',
+                    50,
+                    255,
+                    true,
+                    false,
+                    false,
+                    '',
+                    'fullwidth'
+                );
                 ?>
             </td>
         </tr>
@@ -1293,7 +1318,7 @@ $class = 'databox filters';
 
                     if (metaconsole_load_external_db($connection) == NOERR) {
                         $agent_name = db_get_value_filter(
-                            'nombre',
+                            'alias',
                             'tagente',
                             ['id_agente' => $idAgent]
                         );
diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php
index b2a206a40a..00c6fa245a 100755
--- a/pandora_console/godmode/reporting/reporting_builder.list_items.php
+++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php
@@ -267,7 +267,7 @@ if ($moduleFilter != 0) {
 
 // Filter report items created from metaconsole in normal console list and the opposite
 if (defined('METACONSOLE') and $config['metaconsole'] == 1) {
-    $where .= ' AND ((server_name IS NOT NULL AND length(server_name) != 0) '.'OR '.$type_escaped.' IN (\'general\', \'SLA\', \'exception\', \'availability\', \'availability_graph\', \'top_n\',\'SLA_monthly\',\'SLA_weekly\',\'SLA_hourly\'))';
+    $where .= ' AND ((server_name IS NOT NULL AND length(server_name) != 0) '.'OR '.$type_escaped.' IN (\'general\', \'SLA\', \'exception\', \'availability\', \'availability_graph\', \'top_n\',\'SLA_monthly\',\'SLA_weekly\',\'SLA_hourly\',\'text\'))';
 } else {
     $where .= ' AND ((server_name IS NULL OR length(server_name) = 0) '.'OR '.$type_escaped.' IN (\'general\', \'SLA\', \'exception\', \'availability\', \'top_n\'))';
 }
@@ -342,7 +342,7 @@ if ($items) {
     $table->size[0] = '5px';
     $table->size[1] = '15%';
     $table->size[4] = '8%';
-    $table->size[6] = '90px';
+    $table->size[6] = '120px';
     $table->size[7] = '30px';
 
     $table->head[0] = '<span title="'.__('Position').'">'.__('P.').'</span>';
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index a9562ba6d2..501d4b9edd 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1,4 +1,22 @@
 <script type="text/javascript">
+
+function dialog_message(message_id) {
+  $(message_id)
+    .css("display", "inline")
+    .dialog({
+      modal: true,
+      show: "blind",
+      hide: "blind",
+      width: "400px",
+      buttons: {
+        Close: function() {
+          $(this).dialog("close");
+        }
+      }
+    });
+}
+
+
     function check_all_checkboxes() {
         if ($("input[name=all_delete]").prop("checked")) {
             $(".check_delete").prop("checked", true);
@@ -578,7 +596,7 @@ switch ($action) {
                 break;
             }
 
-            if (! $delete) {
+            if (! $delete && !empty($type_access_selected)) {
                 db_pandora_audit(
                     'ACL Violation',
                     'Trying to access report builder deletion'
@@ -1344,6 +1362,16 @@ switch ($action) {
                 switch ($action) {
                     case 'update':
                         $values = [];
+                        $server_name = get_parameter('server_id');
+                        if (is_metaconsole() && $server_name != '') {
+                            $id_meta = metaconsole_get_id_server($server_name);
+                            $connection = metaconsole_get_connection_by_id(
+                                $id_meta
+                            );
+                            metaconsole_connect($connection);
+                            $values['server_name'] = $connection['server_name'];
+                        }
+
                         $values['id_report'] = $idReport;
                         $values['description'] = get_parameter('description');
                         $values['type'] = get_parameter('type', null);
@@ -1352,14 +1380,36 @@ switch ($action) {
 
                         $label = get_parameter('label', '');
 
+                        $id_agent = get_parameter('id_agent');
+                        $id_agent_module = get_parameter('id_agent_module');
+
                         // Add macros name.
-                        $items_label = [];
-                        $items_label['type'] = get_parameter('type');
-                        $items_label['id_agent'] = get_parameter('id_agent');
-                        $items_label['id_agent_module'] = get_parameter(
-                            'id_agent_module'
-                        );
                         $name_it = (string) get_parameter('name');
+
+                        $agent_description = agents_get_description($id_agent);
+                        $agent_group = agents_get_agent_group($id_agent);
+                        $agent_address = agents_get_address($id_agent);
+                        $agent_alias = agents_get_alias($id_agent);
+                        $module_name = modules_get_agentmodule_name(
+                            $id_agent_module
+                        );
+
+                        $module_description = modules_get_agentmodule_descripcion(
+                            $id_agent_module
+                        );
+
+                        $items_label = [
+                            'type'               => get_parameter('type'),
+                            'id_agent'           => $id_agent,
+                            'id_agent_module'    => $id_agent_module,
+                            'agent_description'  => $agent_description,
+                            'agent_group'        => $agent_group,
+                            'agent_address'      => $agent_address,
+                            'agent_alias'        => $agent_alias,
+                            'module_name'        => $module_name,
+                            'module_description' => $module_description,
+                        ];
+
                         $values['name'] = reporting_label_macro(
                             $items_label,
                             $name_it
@@ -1715,13 +1765,6 @@ switch ($action) {
                         );
                         $values['id_group'] = get_parameter('combo_group');
                         $values['server_name'] = get_parameter('server_name');
-                        $server_id = (int) get_parameter('server_id');
-                        if ($server_id != 0) {
-                            $connection = metaconsole_get_connection_by_id(
-                                $server_id
-                            );
-                            $values['server_name'] = $connection['server_name'];
-                        }
 
                         if ($values['server_name'] == '') {
                             $values['server_name'] = get_parameter(
@@ -1983,22 +2026,11 @@ switch ($action) {
 
                         $values['style'] = io_safe_input(json_encode($style));
 
+                        if (is_metaconsole()) {
+                            metaconsole_restore_db();
+                        }
+
                         if ($good_format) {
-                            switch ($config['dbtype']) {
-                                case 'oracle':
-                                    if (isset($values['type'])) {
-                                        $values[db_escape_key_identifier(
-                                            'type'
-                                        )] = $values['type'];
-                                        unset($values['type']);
-                                    }
-                                break;
-
-                                default:
-                                    // Default.
-                                break;
-                            }
-
                             $resultOperationDB = db_process_sql_update(
                                 'treport_content',
                                 $values,
@@ -2011,21 +2043,62 @@ switch ($action) {
 
                     case 'save':
                         $values = [];
+
+                        $values['server_name'] = get_parameter('server_name');
+                        $server_id = (int) get_parameter('server_id');
+                        if ($server_id != 0) {
+                            $connection = metaconsole_get_connection_by_id(
+                                $server_id
+                            );
+                            metaconsole_connect($connection);
+                            $values['server_name'] = $connection['server_name'];
+                        }
+
                         $values['id_report'] = $idReport;
                         $values['type'] = get_parameter('type', null);
                         $values['description'] = get_parameter('description');
                         $label = get_parameter('label', '');
 
-                        // Add macros name.
-                        $items_label = [];
-                        $items_label['type'] = get_parameter('type');
-                        $items_label['id_agent'] = get_parameter('id_agent');
-                        $items_label['id_agent_module'] = get_parameter(
-                            'id_agent_module'
-                        );
-                        $name_it = (string) get_parameter('name');
                         $values['recursion'] = get_parameter('recursion', null);
-                        $values['show_extended_events'] = get_parameter('include_extended_events', null);
+                        $values['show_extended_events'] = get_parameter(
+                            'include_extended_events',
+                            null
+                        );
+
+                        $id_agent = get_parameter('id_agent');
+                        $id_agent_module = get_parameter('id_agent_module');
+
+                        // Add macros name.
+                        $name_it = (string) get_parameter('name');
+
+                        $agent_description = agents_get_description($id_agent);
+                        $agent_group = agents_get_agent_group($id_agent);
+                        $agent_address = agents_get_address($id_agent);
+                        $agent_alias = agents_get_alias($id_agent);
+                        $module_name = modules_get_agentmodule_name(
+                            $id_agent_module
+                        );
+
+                        $module_description = modules_get_agentmodule_descripcion(
+                            $id_agent_module
+                        );
+
+                        if (is_metaconsole()) {
+                            metaconsole_restore_db();
+                        }
+
+                        $items_label = [
+                            'type'               => get_parameter('type'),
+                            'id_agent'           => $id_agent,
+                            'id_agent_module'    => $id_agent_module,
+                            'agent_description'  => $agent_description,
+                            'agent_group'        => $agent_group,
+                            'agent_address'      => $agent_address,
+                            'agent_alias'        => $agent_alias,
+                            'module_name'        => $module_name,
+                            'module_description' => $module_description,
+                        ];
+
                         $values['name'] = reporting_label_macro(
                             $items_label,
                             $name_it
@@ -2230,18 +2303,6 @@ switch ($action) {
                             break;
                         }
 
-
-
-                        $values['server_name'] = get_parameter('server_name');
-                        $server_id = (int) get_parameter('server_id');
-                        if ($server_id != 0) {
-                            $connection = metaconsole_get_connection_by_id(
-                                $server_id
-                            );
-
-                            $values['server_name'] = $connection['server_name'];
-                        }
-
                         if ($values['server_name'] == '') {
                             $values['server_name'] = get_parameter(
                                 'combo_server'
diff --git a/pandora_console/godmode/reporting/visual_console_builder.elements.php b/pandora_console/godmode/reporting/visual_console_builder.elements.php
index d2849ce5e0..720bb57a1c 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.elements.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.elements.php
@@ -171,7 +171,7 @@ foreach ($layoutDatas as $layoutData) {
             $table->data[($i + 1)]['icon'] = html_print_image(
                 'images/camera.png',
                 true,
-                ['title' => __('Static Graph')]
+                ['title' => __('Static Image')]
             );
         break;
 
diff --git a/pandora_console/godmode/servers/discovery.php b/pandora_console/godmode/servers/discovery.php
index a2c0abd5d6..3f2166bb39 100755
--- a/pandora_console/godmode/servers/discovery.php
+++ b/pandora_console/godmode/servers/discovery.php
@@ -42,7 +42,19 @@ function get_wiz_class($str)
         return 'ConsoleTasks';
 
         default:
-            // Ignore.
+            // Main, show header.
+            ui_print_page_header(
+                __('Discovery'),
+                '',
+                false,
+                '',
+                true,
+                '',
+                false,
+                '',
+                GENERIC_SIZE_TEXT,
+                ''
+            );
         return null;
     }
 }
@@ -81,7 +93,7 @@ function cl_load_cmp($a, $b)
 $classes = glob($config['homedir'].'/godmode/wizards/*.class.php');
 if (enterprise_installed()) {
     $ent_classes = glob(
-        $config['homedir'].'/enterprise/godmode/wizards/*.class.php'
+        $config['homedir'].'/'.ENTERPRISE_DIR.'/godmode/wizards/*.class.php'
     );
     if ($ent_classes === false) {
         $ent_classes = [];
@@ -130,7 +142,7 @@ if ($classname_selected === null) {
         }
     }
 
-    // Show hints if there is no task
+    // Show hints if there is no task.
     if (get_parameter('discovery_hint', 0)) {
         ui_require_css_file('discovery-hint');
         ui_print_info_message(__('You must create a task first'));
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index a7fc94bcca..3eb385332c 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -70,7 +70,7 @@ if (is_ajax()) {
         $table->head[0] = __('Agent');
         $table->head[1] = __('Module');
         foreach ($modules as $mod) {
-            $agent_name = '<a href="'.$config['homeurl'].'/index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$mod['id_agente'].'">'.modules_get_agentmodule_agent_name(
+            $agent_name = '<a href="'.ui_get_full_url('index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$mod['id_agente']).'">'.modules_get_agentmodule_agent_alias(
                 $mod['id_agente_modulo']
             ).'</a>';
 
@@ -1215,4 +1215,3 @@ ui_require_javascript_file('pandora_modules');
     
     
 </script>
-
diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index aa2f0a0735..f0e2a4ad08 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -152,12 +152,12 @@ foreach ($servers as $server) {
          $data[8] = '';
 
         if ($server['type'] == 'recon') {
-            $data[8] .= '<a href="index.php?sec=gservers&sec2=operation/servers/recon_view">';
+            $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist').'">';
             $data[8] .= html_print_image(
                 'images/firts_task/icono_grande_reconserver.png',
                 true,
                 [
-                    'title' => __('Manage recon tasks'),
+                    'title' => __('Manage Discovery tasks'),
                     'style' => 'width:21px;height:21px;',
                 ]
             );
@@ -165,7 +165,7 @@ foreach ($servers as $server) {
         }
 
         if ($server['type'] == 'data') {
-            $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server['id_server'].'">';
+            $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server['id_server']).'">';
             $data[8] .= html_print_image(
                 'images/target.png',
                 true,
@@ -173,7 +173,7 @@ foreach ($servers as $server) {
             );
             $data[8] .= '</a>';
         } else if ($server['type'] == 'enterprise snmp') {
-            $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server['id_server'].'">';
+            $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server['id_server']).'">';
             $data[8] .= html_print_image(
                 'images/target.png',
                 true,
@@ -182,7 +182,7 @@ foreach ($servers as $server) {
             $data[8] .= '</a>';
         }
 
-        $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server['id_server'].'">';
+        $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server['id_server']).'">';
         $data[8] .= html_print_image(
             'images/config.png',
             true,
@@ -191,7 +191,7 @@ foreach ($servers as $server) {
         $data[8] .= '</a>';
 
         if (($names_servers[$safe_server_name] === true) && ($server['type'] == 'data' || $server['type'] == 'enterprise satellite')) {
-            $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$server['id_server'].'&ext='.$ext.'">';
+            $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$server['id_server'].'&ext='.$ext).'">';
             $data[8] .= html_print_image(
                 'images/remote_configuration.png',
                 true,
@@ -201,7 +201,7 @@ foreach ($servers as $server) {
             $names_servers[$safe_server_name] = false;
         }
 
-        $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server['id_server'].'&amp;delete=1">';
+        $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server['id_server'].'&amp;delete=1').'">';
         $data[8] .= html_print_image(
             'images/cross.png',
             true,
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index f5bfc8c635..c32f128ddd 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -86,7 +86,7 @@ $buttons = [];
 // Draws header.
 $buttons['general'] = [
     'active' => false,
-    'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general">'.html_print_image('images/gm_setup.png', true, ['title' => __('General')]).'</a>',
+    'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general').'">'.html_print_image('images/gm_setup.png', true, ['title' => __('General')]).'</a>',
 ];
 
 if (enterprise_installed()) {
@@ -95,37 +95,37 @@ if (enterprise_installed()) {
 
 $buttons['auth'] = [
     'active' => false,
-    'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=auth">'.html_print_image('images/key.png', true, ['title' => __('Authentication')]).'</a>',
+    'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=auth').'">'.html_print_image('images/key.png', true, ['title' => __('Authentication')]).'</a>',
 ];
 
 $buttons['perf'] = [
     'active' => false,
-    'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=perf">'.html_print_image('images/performance.png', true, ['title' => __('Performance')]).'</a>',
+    'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=perf').'">'.html_print_image('images/performance.png', true, ['title' => __('Performance')]).'</a>',
 ];
 
 $buttons['vis'] = [
     'active' => false,
-    'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=vis">'.html_print_image('images/chart.png', true, ['title' => __('Visual styles')]).'</a>',
+    'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=vis').'">'.html_print_image('images/chart.png', true, ['title' => __('Visual styles')]).'</a>',
 ];
 
 if (check_acl($config['id_user'], 0, 'AW')) {
     if ($config['activate_netflow']) {
         $buttons['net'] = [
             'active' => false,
-            'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=net">'.html_print_image('images/op_netflow.png', true, ['title' => __('Netflow')]).'</a>',
+            'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=net').'">'.html_print_image('images/op_netflow.png', true, ['title' => __('Netflow')]).'</a>',
         ];
     }
 }
 
 $buttons['ehorus'] = [
     'active' => false,
-    'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&section=ehorus">'.html_print_image('images/ehorus/ehorus.png', true, ['title' => __('eHorus')]).'</a>',
+    'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=ehorus').'">'.html_print_image('images/ehorus/ehorus.png', true, ['title' => __('eHorus')]).'</a>',
 ];
 
 // FIXME: Not definitive icon
 $buttons['notifications'] = [
     'active' => false,
-    'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&section=notifications">'.html_print_image('images/alerts_template.png', true, ['title' => __('Notifications')]).'</a>',
+    'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=notifications').'">'.html_print_image('images/alerts_template.png', true, ['title' => __('Notifications')]).'</a>',
 ];
 
 $help_header = '';
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index 8079aee1e8..ab1d1ef269 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -1,5 +1,13 @@
 <?php
 /**
+ * General setup.
+ *
+ * @category   Setup
+ * @package    Pandora FMS
+ * @subpackage Opensource
+ * @version    1.0.0
+ * @license    See below
+ *
  *    ______                 ___                    _______ _______ ________
  *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
  *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
@@ -18,8 +26,36 @@
  * ============================================================================
  */
 
+// File begin.
+
+
+/**
+ * Return sounds path.
+ *
+ * @return string Path.
+ */
+function get_sounds()
+{
+    global $config;
+
+    $return = [];
+
+    $files = scandir($config['homedir'].'/include/sounds');
+
+    foreach ($files as $file) {
+        if (strstr($file, 'wav') !== false) {
+            $return['include/sounds/'.$file] = $file;
+        }
+    }
+
+    return $return;
+}
+
+
+// Begin.
 global $config;
 
+
 check_login();
 
 $table = new StdClass();
@@ -33,35 +69,18 @@ $table->style[0] = 'font-weight:bold';
 $table->size[1] = '70%';
 
 // Current config["language"] could be set by user, not taken from global setup !
-switch ($config['dbtype']) {
-    case 'mysql':
-        $current_system_lang = db_get_sql(
-            'SELECT `value`
-			FROM tconfig WHERE `token` = "language"'
-        );
-    break;
-
-    case 'postgresql':
-        $current_system_lang = db_get_sql(
-            'SELECT "value"
-			FROM tconfig WHERE "token" = \'language\''
-        );
-    break;
-
-    case 'oracle':
-        $current_system_lang = db_get_sql(
-            'SELECT value
-			FROM tconfig WHERE token = \'language\''
-        );
-    break;
-}
+$current_system_lang = db_get_sql(
+    'SELECT `value` FROM tconfig WHERE `token` = "language"'
+);
 
 if ($current_system_lang == '') {
     $current_system_lang = 'en';
 }
 
-$table->data[0][0] = __('Language code');
-$table->data[0][1] = html_print_select_from_sql(
+$i = 0;
+
+$table->data[$i][0] = __('Language code');
+$table->data[$i++][1] = html_print_select_from_sql(
     'SELECT id_language, name FROM tlanguage',
     'language',
     $current_system_lang,
@@ -71,68 +90,67 @@ $table->data[0][1] = html_print_select_from_sql(
     true
 );
 
-$table->data[1][0] = __('Remote config directory').ui_print_help_tip(__('Directory where agent remote configuration is stored.'), true);
+$table->data[$i][0] = __('Remote config directory').ui_print_help_tip(__('Directory where agent remote configuration is stored.'), true);
+$table->data[$i++][1] = html_print_input_text('remote_config', io_safe_output($config['remote_config']), '', 30, 100, true);
 
-$table->data[1][1] = html_print_input_text('remote_config', io_safe_output($config['remote_config']), '', 30, 100, true);
+$table->data[$i][0] = __('Phantomjs bin directory').ui_print_help_tip(__('Directory where phantomjs binary file exists and has execution grants.'), true);
+$table->data[$i++][1] = html_print_input_text('phantomjs_bin', io_safe_output($config['phantomjs_bin']), '', 30, 100, true);
 
-$table->data[2][0] = __('Phantomjs bin directory').ui_print_help_tip(__('Directory where phantomjs binary file exists and has execution grants.'), true);
+$table->data[$i][0] = __('Auto login (hash) password');
+$table->data[$i++][1] = html_print_input_password('loginhash_pwd', io_output_password($config['loginhash_pwd']), '', 15, 15, true);
 
-$table->data[2][1] = html_print_input_text('phantomjs_bin', io_safe_output($config['phantomjs_bin']), '', 30, 100, true);
-
-$table->data[6][0] = __('Auto login (hash) password');
-$table->data[6][1] = html_print_input_password('loginhash_pwd', io_output_password($config['loginhash_pwd']), '', 15, 15, true);
-
-$table->data[9][0] = __('Time source');
+$table->data[$i][0] = __('Time source');
 $sources['system'] = __('System');
 $sources['sql'] = __('Database');
-$table->data[9][1] = html_print_select($sources, 'timesource', $config['timesource'], '', '', '', true);
+$table->data[$i++][1] = html_print_select($sources, 'timesource', $config['timesource'], '', '', '', true);
 
-$table->data[10][0] = __('Automatic check for updates');
-$table->data[10][1] = html_print_checkbox_switch('autoupdate', 1, $config['autoupdate'], true);
+$table->data[$i][0] = __('Automatic check for updates');
+$table->data[$i++][1] = html_print_checkbox_switch('autoupdate', 1, $config['autoupdate'], true);
 
 echo "<div id='dialog' title='".__('Enforce https Information')."' style='display:none;'>";
 echo "<p style='text-align: center;'>".__('If SSL is not properly configured you will lose access to ').get_product_name().__(' Console').'</p>';
 echo '</div>';
 
-$table->data[11][0] = __('Enforce https');
-$table->data[11][1] = html_print_checkbox_switch_extended('https', 1, $config['https'], false, '', '', true);
+$table->data[$i][0] = __('Enforce https');
+$table->data[$i++][1] = html_print_checkbox_switch_extended('https', 1, $config['https'], false, '', '', true);
 
-$table->data[12][0] = __('Use cert of SSL');
-$table->data[12][1] = html_print_checkbox_switch_extended('use_cert', 1, $config['use_cert'], false, '', '', true);
+$table->data[$i][0] = __('Use cert of SSL');
+$table->data[$i++][1] = html_print_checkbox_switch_extended('use_cert', 1, $config['use_cert'], false, '', '', true);
 
-$table->rowstyle[13] = 'display: none;';
-$table->data[13][0] = __('Path of SSL Cert.').ui_print_help_tip(__('Path where you put your cert and name of this cert. Remember your cert only in .pem extension.'), true);
-$table->data[13][1] = html_print_input_text('cert_path', io_safe_output($config['cert_path']), '', 50, 255, true);
+$table->rowstyle[$i] = 'display: none;';
+$table->rowid[$i] = 'ssl-path-tr';
+$table->data[$i][0] = __('Path of SSL Cert.').ui_print_help_tip(__('Path where you put your cert and name of this cert. Remember your cert only in .pem extension.'), true);
+$table->data[$i++][1] = html_print_input_text('cert_path', io_safe_output($config['cert_path']), '', 50, 255, true);
 
-$table->data[14][0] = __('Attachment store').ui_print_help_tip(__('Directory where temporary data is stored.'), true);
-$table->data[14][1] = html_print_input_text('attachment_store', io_safe_output($config['attachment_store']), '', 50, 255, true);
+$table->data[$i][0] = __('Attachment store').ui_print_help_tip(__('Directory where temporary data is stored.'), true);
+$table->data[$i++][1] = html_print_input_text('attachment_store', io_safe_output($config['attachment_store']), '', 50, 255, true);
 
-$table->data[15][0] = __('IP list with API access');
+$table->data[$i][0] = __('IP list with API access');
 if (isset($_POST['list_ACL_IPs_for_API'])) {
     $list_ACL_IPs_for_API = get_parameter_post('list_ACL_IPs_for_API');
 } else {
     $list_ACL_IPs_for_API = get_parameter_get('list_ACL_IPs_for_API', implode("\n", $config['list_ACL_IPs_for_API']));
 }
 
-$table->data[15][1] = html_print_textarea('list_ACL_IPs_for_API', 2, 25, $list_ACL_IPs_for_API, 'style="height: 50px; width: 300px"', true);
+$table->data[$i++][1] = html_print_textarea('list_ACL_IPs_for_API', 2, 25, $list_ACL_IPs_for_API, 'style="height: 50px; width: 300px"', true);
 
-$table->data[16][0] = __('API password').ui_print_help_tip(__('Please be careful if you put a password put https access.'), true);
-$table->data[16][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true);
+$table->data[$i][0] = __('API password').ui_print_help_tip(__('Please be careful if you put a password put https access.'), true);
+$table->data[$i++][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true);
 
-$table->data[17][0] = __('Enable GIS features');
-$table->data[17][1] = html_print_checkbox_switch('activate_gis', 1, $config['activate_gis'], true);
+$table->data[$i][0] = __('Enable GIS features');
+$table->data[$i++][1] = html_print_checkbox_switch('activate_gis', 1, $config['activate_gis'], true);
 
-$table->data[19][0] = __('Enable Netflow');
+$table->data[$i][0] = __('Enable Netflow');
 $rbt_disabled = false;
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
     $rbt_disabled = true;
-    $table->data[19][0] .= ui_print_help_tip(__('Not supported in Windows systems'), true);
+    $table->data[$i][0] .= ui_print_help_tip(__('Not supported in Windows systems'), true);
 }
 
-$table->data[19][1] = html_print_checkbox_switch_extended('activate_netflow', 1, $config['activate_netflow'], $rbt_disabled, '', '', true);
+$table->data[$i++][1] = html_print_checkbox_switch_extended('activate_netflow', 1, $config['activate_netflow'], $rbt_disabled, '', '', true);
 
-$table->data[21][0] = __('Enable Network Traffic Analyzer');
-$table->data[21][1] = html_print_switch(
+$table->data[$i][0] = __('Enable Network Traffic Analyzer');
+$table->data[$i++][1] = html_print_switch(
     [
         'name'  => 'activate_nta',
         'value' => $config['activate_nta'],
@@ -171,11 +189,11 @@ foreach ($timezones as $timezone) {
     }
 }
 
-$table->data[23][0] = __('Timezone setup').' '.ui_print_help_tip(
+$table->data[$i][0] = __('Timezone setup').' '.ui_print_help_tip(
     __('Must have the same time zone as the system or database to avoid mismatches of time.'),
     true
 );
-$table->data[23][1] = html_print_input_text_extended(
+$table->data[$i][1] = html_print_input_text_extended(
     'timezone_text',
     $config['timezone'],
     'text-timezone_text',
@@ -187,47 +205,63 @@ $table->data[23][1] = html_print_input_text_extended(
     'readonly',
     true
 );
-$table->data[23][1] .= '<a id="change_timezone">'.html_print_image('images/pencil.png', true, ['title' => __('Change timezone')]).'</a>';
-$table->data[23][1] .= '&nbsp;&nbsp;'.html_print_select($zone_name, 'zone', $zone_selected, 'show_timezone();', '', '', true);
-$table->data[23][1] .= '&nbsp;&nbsp;'.html_print_select($timezone_n, 'timezone', $config['timezone'], '', '', '', true);
+$table->data[$i][1] .= '<a id="change_timezone">'.html_print_image('images/pencil.png', true, ['title' => __('Change timezone')]).'</a>';
+$table->data[$i][1] .= '&nbsp;&nbsp;'.html_print_select($zone_name, 'zone', $zone_selected, 'show_timezone();', '', '', true);
+$table->data[$i++][1] .= '&nbsp;&nbsp;'.html_print_select($timezone_n, 'timezone', $config['timezone'], '', '', '', true);
 
 $sounds = get_sounds();
-$table->data[24][0] = __('Sound for Alert fired');
-$table->data[24][1] = html_print_select($sounds, 'sound_alert', $config['sound_alert'], 'replaySound(\'alert\');', '', '', true);
-$table->data[24][1] .= ' <a href="javascript: toggleButton(\'alert\');">'.html_print_image('images/control_play_col.png', true, ['id' => 'button_sound_alert', 'style' => 'vertical-align: middle;', 'width' => '16', 'title' => __('Play sound')]).'</a>';
-$table->data[24][1] .= '<div id="layer_sound_alert"></div>';
+$table->data[$i][0] = __('Sound for Alert fired');
+$table->data[$i][1] = html_print_select($sounds, 'sound_alert', $config['sound_alert'], 'replaySound(\'alert\');', '', '', true);
+$table->data[$i][1] .= ' <a href="javascript: toggleButton(\'alert\');">'.html_print_image('images/control_play_col.png', true, ['id' => 'button_sound_alert', 'style' => 'vertical-align: middle;', 'width' => '16', 'title' => __('Play sound')]).'</a>';
+$table->data[$i++][1] .= '<div id="layer_sound_alert"></div>';
 
-$table->data[25][0] = __('Sound for Monitor critical');
-$table->data[25][1] = html_print_select($sounds, 'sound_critical', $config['sound_critical'], 'replaySound(\'critical\');', '', '', true);
-$table->data[25][1] .= ' <a href="javascript: toggleButton(\'critical\');">'.html_print_image('images/control_play_col.png', true, ['id' => 'button_sound_critical', 'style' => 'vertical-align: middle;', 'width' => '16', 'title' => __('Play sound')]).'</a>';
-$table->data[25][1] .= '<div id="layer_sound_critical"></div>';
+$table->data[$i][0] = __('Sound for Monitor critical');
+$table->data[$i][1] = html_print_select($sounds, 'sound_critical', $config['sound_critical'], 'replaySound(\'critical\');', '', '', true);
+$table->data[$i][1] .= ' <a href="javascript: toggleButton(\'critical\');">'.html_print_image('images/control_play_col.png', true, ['id' => 'button_sound_critical', 'style' => 'vertical-align: middle;', 'width' => '16', 'title' => __('Play sound')]).'</a>';
+$table->data[$i++][1] .= '<div id="layer_sound_critical"></div>';
 
-$table->data[26][0] = __('Sound for Monitor warning');
-$table->data[26][1] = html_print_select($sounds, 'sound_warning', $config['sound_warning'], 'replaySound(\'warning\');', '', '', true);
-$table->data[26][1] .= ' <a href="javascript: toggleButton(\'warning\');">'.html_print_image('images/control_play_col.png', true, ['id' => 'button_sound_warning', 'style' => 'vertical-align: middle;', 'width' => '16', 'title' => __('Play sound')]).'</a>';
-$table->data[26][1] .= '<div id="layer_sound_warning"></div>';
+$table->data[$i][0] = __('Sound for Monitor warning');
+$table->data[$i][1] = html_print_select($sounds, 'sound_warning', $config['sound_warning'], 'replaySound(\'warning\');', '', '', true);
+$table->data[$i][1] .= ' <a href="javascript: toggleButton(\'warning\');">'.html_print_image('images/control_play_col.png', true, ['id' => 'button_sound_warning', 'style' => 'vertical-align: middle;', 'width' => '16', 'title' => __('Play sound')]).'</a>';
+$table->data[$i++][1] .= '<div id="layer_sound_warning"></div>';
 
-$table->data[28][0] = __('Public URL');
-$table->data[28][0] .= ui_print_help_tip(
+$table->data[$i][0] = __('Public URL');
+$table->data[$i][0] .= ui_print_help_tip(
     __('Set this value when your %s across inverse proxy or for example with mod_proxy of Apache.', get_product_name()).' '.__('Without the index.php such as http://domain/console_url/'),
     true
 );
-$table->data[28][1] = html_print_input_text('public_url', $config['public_url'], '', 40, 255, true);
+$table->data[$i++][1] = html_print_input_text('public_url', $config['public_url'], '', 40, 255, true);
 
-$table->data[29][0] = __('Referer security');
-$table->data[29][0] .= ui_print_help_tip(__("If enabled, actively checks if the user comes from %s's URL", get_product_name()), true);
-$table->data[29][1] = html_print_checkbox_switch('referer_security', 1, $config['referer_security'], true);
+$table->data[$i][0] = __('Force use Public URL');
+$table->data[$i][0] .= ui_print_help_tip(__('Force using defined public URL).', get_product_name()), true);
+$table->data[$i++][1] = html_print_switch(
+    [
+        'name'  => 'force_public_url',
+        'value' => $config['force_public_url'],
+    ]
+);
 
-$table->data[30][0] = __('Event storm protection');
-$table->data[30][0] .= ui_print_help_tip(__('If set to yes no events or alerts will be generated, but agents will continue receiving data.'), true);
-$table->data[30][1] = html_print_checkbox_switch('event_storm_protection', 1, $config['event_storm_protection'], true);
+echo "<div id='force_public_url_dialog' title='".__('Enforce public URL usage information')."' style='display:none;'>";
+echo "<p style='text-align: center;'>".__('If public URL is not properly configured you will lose access to ').get_product_name().__(' Console').'</p>';
+echo '</div>';
+
+$table->data[$i][0] = __('Public URL host exclusions');
+$table->data[$i++][1] = html_print_textarea('public_url_exclusions', 2, 25, $config['public_url_exclusions'], 'style="height: 50px; width: 300px"', true);
+
+$table->data[$i][0] = __('Referer security');
+$table->data[$i][0] .= ui_print_help_tip(__("If enabled, actively checks if the user comes from %s's URL", get_product_name()), true);
+$table->data[$i++][1] = html_print_checkbox_switch('referer_security', 1, $config['referer_security'], true);
+
+$table->data[$i][0] = __('Event storm protection');
+$table->data[$i][0] .= ui_print_help_tip(__('If set to yes no events or alerts will be generated, but agents will continue receiving data.'), true);
+$table->data[$i++][1] = html_print_checkbox_switch('event_storm_protection', 1, $config['event_storm_protection'], true);
 
 
-$table->data[31][0] = __('Command Snapshot').ui_print_help_tip(__('The string modules with several lines show as command output'), true);
-$table->data[31][1] = html_print_checkbox_switch('command_snapshot', 1, $config['command_snapshot'], true);
+$table->data[$i][0] = __('Command Snapshot').ui_print_help_tip(__('The string modules with several lines show as command output'), true);
+$table->data[$i++][1] = html_print_checkbox_switch('command_snapshot', 1, $config['command_snapshot'], true);
 
-$table->data[32][0] = __('Server logs directory').ui_print_help_tip(__('Directory where the server logs are stored.'), true);
-$table->data[32][1] = html_print_input_text(
+$table->data[$i][0] = __('Server logs directory').ui_print_help_tip(__('Directory where the server logs are stored.'), true);
+$table->data[$i++][1] = html_print_input_text(
     'server_log_dir',
     $config['server_log_dir'],
     '',
@@ -236,8 +270,8 @@ $table->data[32][1] = html_print_input_text(
     true
 );
 
-$table->data[33][0] = __('Log size limit in system logs viewer extension').ui_print_help_tip(__('Max size (in bytes) for the logs to be shown.'), true);
-$table->data[33][1] = html_print_input_text(
+$table->data[$i][0] = __('Log size limit in system logs viewer extension').ui_print_help_tip(__('Max size (in bytes) for the logs to be shown.'), true);
+$table->data[$i++][1] = html_print_input_text(
     'max_log_size',
     $config['max_log_size'],
     '',
@@ -251,8 +285,8 @@ $modes_tutorial = [
     'on_demand' => __('On demand'),
     'expert'    => __('Expert'),
 ];
-$table->data['tutorial_mode'][0] = __('Tutorial mode').ui_print_help_tip(__("Configuration of our clippy, 'full mode' show the icon in the header and the contextual helps and it is noise, 'on demand' it is equal to full but it is not noise and 'expert' the icons in the header and the context is not."), true);
-$table->data['tutorial_mode'][1] = html_print_select(
+$table->data[$i][0] = __('Tutorial mode').ui_print_help_tip(__("Configuration of our clippy, 'full mode' show the icon in the header and the contextual helps and it is noise, 'on demand' it is equal to full but it is not noise and 'expert' the icons in the header and the context is not."), true);
+$table->data[$i++][1] = html_print_select(
     $modes_tutorial,
     'tutorial_mode',
     $config['tutorial_mode'],
@@ -263,11 +297,11 @@ $table->data['tutorial_mode'][1] = html_print_select(
 );
 
 $config['past_planned_downtimes'] = isset($config['past_planned_downtimes']) ? $config['past_planned_downtimes'] : 1;
-$table->data[34][0] = __('Allow create planned downtimes in the past').ui_print_help_tip(__('The planned downtimes created in the past will affect the SLA reports'), true);
-$table->data[34][1] = html_print_checkbox_switch('past_planned_downtimes', 1, $config['past_planned_downtimes'], true);
+$table->data[$i][0] = __('Allow create planned downtimes in the past').ui_print_help_tip(__('The planned downtimes created in the past will affect the SLA reports'), true);
+$table->data[$i++][1] = html_print_checkbox_switch('past_planned_downtimes', 1, $config['past_planned_downtimes'], true);
 
-$table->data[35][0] = __('Limit for bulk operations').ui_print_help_tip(__('Your PHP environment is set to 1000 max_input_vars. This parameter should have the same value or lower.', ini_get('max_input_vars')), true);
-$table->data[35][1] = html_print_input_text(
+$table->data[$i][0] = __('Limit for bulk operations').ui_print_help_tip(__('Your PHP environment is set to 1000 max_input_vars. This parameter should have the same value or lower.', ini_get('max_input_vars')), true);
+$table->data[$i++][1] = html_print_input_text(
     'limit_parameters_massive',
     $config['limit_parameters_massive'],
     '',
@@ -276,17 +310,17 @@ $table->data[35][1] = html_print_input_text(
     true
 );
 
-$table->data[36][0] = __('Include agents manually disabled');
-$table->data[36][1] = html_print_checkbox_switch('include_agents', 1, $config['include_agents'], true);
+$table->data[$i][0] = __('Include agents manually disabled');
+$table->data[$i++][1] = html_print_checkbox_switch('include_agents', 1, $config['include_agents'], true);
 
-$table->data[37][0] = __('Audit log directory').ui_print_help_tip(__('Directory where audit log is stored.'), true);
-$table->data[37][1] = html_print_input_text('auditdir', io_safe_output($config['auditdir']), '', 30, 100, true);
+$table->data[$i][0] = __('Audit log directory').ui_print_help_tip(__('Directory where audit log is stored.'), true);
+$table->data[$i++][1] = html_print_input_text('auditdir', io_safe_output($config['auditdir']), '', 30, 100, true);
 
-$table->data[38][0] = __('Set alias as name by default in agent creation');
-$table->data[38][1] = html_print_checkbox_switch('alias_as_name', 1, $config['alias_as_name'], true);
+$table->data[$i][0] = __('Set alias as name by default in agent creation');
+$table->data[$i++][1] = html_print_checkbox_switch('alias_as_name', 1, $config['alias_as_name'], true);
 
-$table->data[39][0] = __('Unique IP').ui_print_help_tip(__('Set the primary IP address as the unique IP, preventing the same primary IP address from being used in more than one agent'), true);
-$table->data[39][1] = html_print_checkbox_switch('unique_ip', 1, $config['unique_ip'], true);
+$table->data[$i][0] = __('Unique IP').ui_print_help_tip(__('Set the primary IP address as the unique IP, preventing the same primary IP address from being used in more than one agent'), true);
+$table->data[$i++][1] = html_print_checkbox_switch('unique_ip', 1, $config['unique_ip'], true);
 
 echo '<form id="form_setup" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general&amp;pure='.$config['pure'].'">';
 
@@ -352,44 +386,50 @@ $(document).ready (function () {
     });
 
     if ($("input[name=use_cert]").is(':checked')) {
-        $('#setup_general-13').show();
+        $('#ssl-path-tr').show();
     }
 
     $("input[name=use_cert]").change(function () {
         if( $(this).is(":checked") )
-                $('#setup_general-13').show();
+                $('#ssl-path-tr').show();
             else
-                $('#setup_general-13').hide();
+                $('#ssl-path-tr').hide();
         
     });
     $("input[name=https]").change(function (){
         if($("input[name=https]").prop('checked')) {
-            $("#dialog").css({'display': 'inline', 'font-weight': 'bold'}).dialog({
+            $("#dialog").dialog({
             modal: true,
-            buttons:{
-                "<?php echo __('Close'); ?>": function(){
-                    $(this).dialog("close");
+            width: 500,
+            buttons:[
+                {
+                    class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-next',
+                    text: "<?php echo __('OK'); ?>",
+                    click: function(){
+                        $(this).dialog("close");
+                    }
                 }
-            }
+            ]
+        });
+        }
+    })
+
+    $("input[name=force_public_url]").change(function (){
+        if($("input[name=force_public_url]").prop('checked')) {
+            $("#force_public_url_dialog").dialog({
+            modal: true,
+            width: 500,
+            buttons: [
+                {
+                    class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-next',
+                    text: "<?php echo __('OK'); ?>",
+                    click: function(){
+                        $(this).dialog("close");
+                    }
+                }
+            ]
         });
         }
     })
 });
 </script>
-<?php
-function get_sounds()
-{
-    global $config;
-
-    $return = [];
-
-    $files = scandir($config['homedir'].'/include/sounds');
-
-    foreach ($files as $file) {
-        if (strstr($file, 'wav') !== false) {
-            $return['include/sounds/'.$file] = $file;
-        }
-    }
-
-    return $return;
-}
diff --git a/pandora_console/godmode/snmpconsole/snmp_filters.php b/pandora_console/godmode/snmpconsole/snmp_filters.php
index 0d8e1e9480..252373b15a 100644
--- a/pandora_console/godmode/snmpconsole/snmp_filters.php
+++ b/pandora_console/godmode/snmpconsole/snmp_filters.php
@@ -100,7 +100,15 @@ if ($update_filter > -2) {
                 'filter'             => $filter,
                 'unified_filters_id' => $new_unified_id,
             ];
+            if ($values['description'] == '') {
+                $result = false;
+                $msg = __('Description is empty');
+            } else if ($values['filter'] == '') {
+                $result = false;
+                $msg = __('Filter is empty');
+            } else {
                 $result = db_process_sql_insert('tsnmp_filter', $values);
+            }
         } else {
             for ($i = 0; $i < $index_post; $i++) {
                 $filter = get_parameter('filter_'.$i);
@@ -109,12 +117,28 @@ if ($update_filter > -2) {
                     'filter'             => $filter,
                     'unified_filters_id' => $new_unified_id,
                 ];
-                $result = db_process_sql_insert('tsnmp_filter', $values);
+                if ($values['filter'] != '' && $values['description'] != '') {
+                    $result = db_process_sql_insert('tsnmp_filter', $values);
+                }
+            }
+
+            if ($result === null) {
+                if ($values['description'] != '') {
+                    $result = false;
+                    $msg = __('Filters are empty');
+                } else {
+                    $result = false;
+                    $msg = __('Description is empty');
+                }
             }
         }
 
         if ($result === false) {
-            ui_print_error_message(__('There was a problem creating the filter'));
+            if (!isset($msg)) {
+                $msg = __('There was a problem creating the filter');
+            }
+
+            ui_print_error_message($msg);
         } else {
             ui_print_success_message(__('Successfully created'));
         }
@@ -215,8 +239,10 @@ if ($edit_filter > -2) {
     $result_unified = db_get_all_rows_sql('SELECT DISTINCT(unified_filters_id) FROM tsnmp_filter ORDER BY unified_filters_id ASC');
 
     $aglomerate_result = [];
-    foreach ($result_unified as $res) {
-        $aglomerate_result[$res['unified_filters_id']] = db_get_all_rows_sql('SELECT * FROM tsnmp_filter WHERE unified_filters_id = '.$res['unified_filters_id'].' ORDER BY id_snmp_filter ASC');
+    if (is_array($result_unified) === true) {
+        foreach ($result_unified as $res) {
+            $aglomerate_result[$res['unified_filters_id']] = db_get_all_rows_sql('SELECT * FROM tsnmp_filter WHERE unified_filters_id = '.$res['unified_filters_id'].' ORDER BY id_snmp_filter ASC');
+        }
     }
 
     $table = new stdClass();
@@ -282,7 +308,8 @@ if ($edit_filter > -2) {
 ?>
 
 <script type="text/javascript">
-    var id = "<?php echo $index; ?>";
+    // +1 because there is already a defined 'filter' field.
+    var id = parseInt("<?php echo $index; ?>")+1; 
     var homeurl = "<?php echo $config['homeurl']; ?>";
 
     $(document).ready (function () {
diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php
index 8a8ddc8887..680d0b7a45 100644
--- a/pandora_console/godmode/tag/tag.php
+++ b/pandora_console/godmode/tag/tag.php
@@ -31,6 +31,10 @@ $delete = (int) get_parameter('delete_tag', 0);
 $tag_name = (string) get_parameter('tag_name', '');
 $tab = (string) get_parameter('tab', 'list');
 
+if ($delete != 0 && is_metaconsole()) {
+    open_meta_frame();
+}
+
 // Metaconsole nodes
 $servers = false;
 if (is_metaconsole()) {
@@ -316,6 +320,9 @@ echo '<table border=0 cellpadding=0 cellspacing=0 width=100%>';
     echo '</tr>';
 echo '</table>';
 
+if ($delete != 0 && is_metaconsole()) {
+    close_meta_frame();
+}
 
 // ~ enterprise_hook('close_meta_frame');
 ?>
diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php
index 24da1a341f..8eff08d996 100644
--- a/pandora_console/godmode/update_manager/update_manager.offline.php
+++ b/pandora_console/godmode/update_manager/update_manager.offline.php
@@ -31,6 +31,11 @@ global $config;
 
 check_login();
 
+if (!enterprise_installed()) {
+    include 'general/noaccess.php';
+    exit;
+}
+
 if (! check_acl($config['id_user'], 0, 'PM')
     && ! is_user_admin($config['id_user'])
 ) {
diff --git a/pandora_console/godmode/update_manager/update_manager.php b/pandora_console/godmode/update_manager/update_manager.php
index 7954fd0ada..6b5d6f3cdd 100644
--- a/pandora_console/godmode/update_manager/update_manager.php
+++ b/pandora_console/godmode/update_manager/update_manager.php
@@ -30,19 +30,21 @@ if ($php_version_array[0] < 7) {
 
 $tab = get_parameter('tab', 'online');
 
-$buttons = [
-    'setup'   => [
-        'active' => ($tab == 'setup') ? true : false,
-        'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=setup">'.html_print_image('images/gm_setup.png', true, ['title' => __('Options')]).'</a>',
-    ],
-    'offline' => [
+$buttons['setup'] = [
+    'active' => ($tab == 'setup') ? true : false,
+    'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=setup">'.html_print_image('images/gm_setup.png', true, ['title' => __('Options')]).'</a>',
+];
+
+if (enterprise_installed()) {
+    $buttons['offline'] = [
         'active' => ($tab == 'offline') ? true : false,
         'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=offline">'.html_print_image('images/box.png', true, ['title' => __('Offline update manager')]).'</a>',
-    ],
-    'online'  => [
-        'active' => ($tab == 'online') ? true : false,
-        'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online">'.html_print_image('images/op_gis.png', true, ['title' => __('Online update manager')]).'</a>',
-    ],
+    ];
+}
+
+$buttons['online'] = [
+    'active' => ($tab == 'online') ? true : false,
+    'text'   => '<a href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online">'.html_print_image('images/op_gis.png', true, ['title' => __('Online update manager')]).'</a>',
 ];
 
 
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index 662df7ecee..07e9942880 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -256,6 +256,52 @@ if ($create_user) {
         $password_confirm = '';
         $new_user = true;
     } else {
+        $have_number = false;
+        $have_simbols = false;
+        if ($config['enable_pass_policy']) {
+            if ($config['pass_needs_numbers']) {
+                $nums = preg_match('/([[:alpha:]])*(\d)+(\w)*/', $password_confirm);
+                if ($nums == 0) {
+                    ui_print_error_message(__('Password must contain numbers'));
+                    $user_info = $values;
+                    $password_new = '';
+                    $password_confirm = '';
+                    $new_user = true;
+                } else {
+                    $have_number = true;
+                }
+            }
+
+            if ($config['pass_needs_symbols']) {
+                $symbols = preg_match('/(\w)*(\W)+(\w)*/', $password_confirm);
+                if ($symbols == 0) {
+                    ui_print_error_message(__('Password must contain symbols'));
+                    $user_info = $values;
+                    $password_new = '';
+                    $password_confirm = '';
+                    $new_user = true;
+                } else {
+                    $have_simbols = true;
+                }
+            }
+
+            if ($config['pass_needs_symbols'] && $config['pass_needs_numbers']) {
+                if ($have_number && $have_simbols) {
+                    $result = create_user($id, $password_new, $values);
+                }
+            } else if ($config['pass_needs_symbols'] && !$config['pass_needs_numbers']) {
+                if ($have_simbols) {
+                    $result = create_user($id, $password_new, $values);
+                }
+            } else if (!$config['pass_needs_symbols'] && $config['pass_needs_numbers']) {
+                if ($have_number) {
+                    $result = create_user($id, $password_new, $values);
+                }
+            }
+        } else {
+            $result = create_user($id, $password_new, $values);
+        }
+
         $info = '{"Id_user":"'.$values['id_user'].'","FullName":"'.$values['fullname'].'","Firstname":"'.$values['firstname'].'","Lastname":"'.$values['lastname'].'","Email":"'.$values['email'].'","Phone":"'.$values['phone'].'","Comments":"'.$values['comments'].'","Is_admin":"'.$values['is_admin'].'","Language":"'.$values['language'].'","Timezone":"'.$values['timezone'].'","Block size":"'.$values['block_size'].'"';
 
         if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
@@ -264,7 +310,10 @@ if ($create_user) {
             $info .= '}';
         }
 
-        $result = create_user($id, $password_new, $values);
+        $can_create = false;
+
+
+
         if ($result) {
             $res = save_pass_history($id, $password_new);
         }
@@ -575,6 +624,10 @@ if ($delete_profile) {
     );
 }
 
+if ($values) {
+    $user_info = $values;
+}
+
 $table = new stdClass();
 $table->id = 'user_configuration_table';
 $table->width = '100%';
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 586f24335b..ed7e1f3b10 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -418,6 +418,7 @@ class DiscoveryTaskList extends Wizard
             $table->align[9] = 'left';
 
             foreach ($recon_tasks as $task) {
+                $no_operations = false;
                 $data = [];
                 $server_name = servers_get_name($task['id_recon_server']);
 
@@ -552,6 +553,17 @@ class DiscoveryTaskList extends Wizard
                         $data[6] .= __('Discovery.App.Oracle');
                     break;
 
+                    case DISCOVERY_DEPLOY_AGENTS:
+                        // Internal deployment task.
+                        $no_operations = true;
+                        $data[6] = html_print_image(
+                            'images/deploy.png',
+                            true,
+                            ['title' => __('Agent deployment')]
+                        ).'&nbsp;&nbsp;';
+                        $data[6] .= __('Discovery.Agent.Deployment');
+                    break;
+
                     case DISCOVERY_HOSTDEVICES:
                     default:
                         if ($task['id_recon_script'] == 0) {
@@ -595,71 +607,75 @@ class DiscoveryTaskList extends Wizard
                     $data[8] = __('Not executed yet');
                 }
 
-                if ($task['disabled'] != 2) {
-                    $data[9] = '<a href="#" onclick="progress_task_list('.$task['id_rt'].',\''.$task['name'].'\')">';
-                    $data[9] .= html_print_image(
-                        'images/eye.png',
-                        true
-                    );
-                    $data[9] .= '</a>';
-                }
-
-                if ($task['disabled'] != 2 && $task['utimestamp'] > 0
-                    && $task['type'] != DISCOVERY_APP_MYSQL
-                    && $task['type'] != DISCOVERY_APP_ORACLE
-                    && $task['type'] != DISCOVERY_CLOUD_AWS_RDS
-                ) {
-                    $data[9] .= '<a href="#" onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">';
-                    $data[9] .= html_print_image(
-                        'images/dynamic_network_icon.png',
-                        true
-                    );
-                    $data[9] .= '</a>';
-                }
-
-                if (check_acl(
-                    $config['id_user'],
-                    $task['id_group'],
-                    'PM'
-                )
-                ) {
-                    if ($ipam === true) {
-                        $data[9] .= '<a href="'.ui_get_full_url(
-                            sprintf(
-                                'index.php?sec=godmode/extensions&sec2=enterprise/extensions/ipam&action=edit&id=%d',
-                                $tipam_task_id
-                            )
-                        ).'">'.html_print_image(
-                            'images/config.png',
+                if (!$no_operations) {
+                    if ($task['disabled'] != 2) {
+                        $data[9] = '<a href="#" onclick="progress_task_list('.$task['id_rt'].',\''.$task['name'].'\')">';
+                        $data[9] .= html_print_image(
+                            'images/eye.png',
                             true
-                        ).'</a>';
-                        $data[9] .= '<a href="'.ui_get_full_url(
-                            'index.php?sec=godmode/extensions&sec2=enterprise/extensions/ipam&action=delete&id='.$tipam_task_id
-                        ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                            'images/cross.png',
+                        );
+                        $data[9] .= '</a>';
+                    }
+
+                    if ($task['disabled'] != 2 && $task['utimestamp'] > 0
+                        && $task['type'] != DISCOVERY_APP_MYSQL
+                        && $task['type'] != DISCOVERY_APP_ORACLE
+                        && $task['type'] != DISCOVERY_CLOUD_AWS_RDS
+                    ) {
+                        $data[9] .= '<a href="#" onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">';
+                        $data[9] .= html_print_image(
+                            'images/dynamic_network_icon.png',
                             true
-                        ).'</a>';
+                        );
+                        $data[9] .= '</a>';
+                    }
+
+                    if (check_acl(
+                        $config['id_user'],
+                        $task['id_group'],
+                        'PM'
+                    )
+                    ) {
+                        if ($ipam === true) {
+                            $data[9] .= '<a href="'.ui_get_full_url(
+                                sprintf(
+                                    'index.php?sec=godmode/extensions&sec2=enterprise/extensions/ipam&action=edit&id=%d',
+                                    $tipam_task_id
+                                )
+                            ).'">'.html_print_image(
+                                'images/config.png',
+                                true
+                            ).'</a>';
+                            $data[9] .= '<a href="'.ui_get_full_url(
+                                'index.php?sec=godmode/extensions&sec2=enterprise/extensions/ipam&action=delete&id='.$tipam_task_id
+                            ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
+                                'images/cross.png',
+                                true
+                            ).'</a>';
+                        } else {
+                            // Check if is a H&D, Cloud or Application or IPAM.
+                            $data[9] .= '<a href="'.ui_get_full_url(
+                                sprintf(
+                                    'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&task=%d',
+                                    $this->getTargetWiz($task, $recon_script_data),
+                                    $task['id_rt']
+                                )
+                            ).'">'.html_print_image(
+                                'images/config.png',
+                                true
+                            ).'</a>';
+                            $data[9] .= '<a href="'.ui_get_full_url(
+                                'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&delete=1&task='.$task['id_rt']
+                            ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
+                                'images/cross.png',
+                                true
+                            ).'</a>';
+                        }
                     } else {
-                        // Check if is a H&D, Cloud or Application or IPAM.
-                        $data[9] .= '<a href="'.ui_get_full_url(
-                            sprintf(
-                                'index.php?sec=gservers&sec2=godmode/servers/discovery&%s&task=%d',
-                                $this->getTargetWiz($task, $recon_script_data),
-                                $task['id_rt']
-                            )
-                        ).'">'.html_print_image(
-                            'images/config.png',
-                            true
-                        ).'</a>';
-                        $data[9] .= '<a href="'.ui_get_full_url(
-                            'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist&delete=1&task='.$task['id_rt']
-                        ).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
-                            'images/cross.png',
-                            true
-                        ).'</a>';
+                        $data[9] = '';
                     }
                 } else {
-                    $data[9] = '';
+                    $data[9] = '-';
                 }
 
                 $table->cellclass[][9] = 'action_buttons';
diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php
index 3cc2e3f71d..fb9fba2cdd 100755
--- a/pandora_console/godmode/wizards/HostDevices.class.php
+++ b/pandora_console/godmode/wizards/HostDevices.class.php
@@ -32,6 +32,7 @@ require_once $config['homedir'].'/include/class/CustomNetScan.class.php';
 require_once $config['homedir'].'/include/class/ManageNetScanScripts.class.php';
 
 enterprise_include_once('include/class/CSVImportAgents.class.php');
+enterprise_include_once('include/class/DeploymentCenter.class.php');
 enterprise_include_once('include/functions_hostdevices.php');
 
 /**
@@ -127,6 +128,12 @@ class HostDevices extends Wizard
                     'icon'  => ENTERPRISE_DIR.'/images/wizard/csv.png',
                     'label' => __('Import CSV'),
                 ];
+
+                $buttons[] = [
+                    'url'   => $this->url.'&mode=deploy',
+                    'icon'  => ENTERPRISE_DIR.'/images/wizard/deployment.png',
+                    'label' => __('Agent deployment'),
+                ];
             }
 
             $buttons[] = [
@@ -149,11 +156,30 @@ class HostDevices extends Wizard
                         ),
                         'label' => __('Discovery'),
                     ],
+                    [
+                        'link'     => ui_get_full_url(
+                            'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=hd'
+                        ),
+                        'label'    => __('Host & Devices'),
+                        'selected' => true,
+                    ],
                 ],
                 true
             );
 
-            ui_print_page_header(__('Host & devices'), '', false, '', true, '', false, '', GENERIC_SIZE_TEXT, '', $this->printHeader(true));
+            ui_print_page_header(
+                __('Host & devices'),
+                '',
+                false,
+                '',
+                true,
+                '',
+                false,
+                '',
+                GENERIC_SIZE_TEXT,
+                '',
+                $this->printHeader(true)
+            );
 
             $this->printBigButtonsList($buttons);
             return;
@@ -167,6 +193,14 @@ class HostDevices extends Wizard
                 );
                 return $csv_importer->runCSV();
             }
+
+            if ($mode === 'deploy') {
+                $deployObject = new DeploymentCenter(
+                    $this->page,
+                    $this->breadcrum
+                );
+                return $deployObject->run();
+            }
         }
 
         if ($mode === 'customnetscan') {
@@ -785,6 +819,7 @@ class HostDevices extends Wizard
                     }).change();';
 
                 $this->printFormAsGrid($form);
+                $this->printGoBackButton($this->url.'&page='.($this->page - 1));
             }
         }
 
@@ -877,6 +912,7 @@ class HostDevices extends Wizard
             ];
 
             $this->printFormAsList($form);
+            $this->printGoBackButton($this->url.'&mode=netscan&task='.$this->task['id_rt'].'&page='.($this->page - 1));
         }
 
         if ($this->page == 2) {
diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php
index 2524f6d93c..3a65560285 100644
--- a/pandora_console/godmode/wizards/Wizard.main.php
+++ b/pandora_console/godmode/wizards/Wizard.main.php
@@ -296,241 +296,20 @@ class Wizard
      */
     public function printInput($data)
     {
+        global $config;
+
+        include_once $config['homedir'].'/include/functions_html.php';
+
         if (is_array($data) === false) {
             return '';
         }
 
-        switch ($data['type']) {
-            case 'text':
-            return html_print_input_text(
-                $data['name'],
-                $data['value'],
-                ((isset($data['alt']) === true) ? $data['alt'] : ''),
-                ((isset($data['size']) === true) ? $data['size'] : 50),
-                ((isset($data['maxlength']) === true) ? $data['maxlength'] : 255),
-                ((isset($data['return']) === true) ? $data['return'] : true),
-                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
-                ((isset($data['required']) === true) ? $data['required'] : false),
-                ((isset($data['function']) === true) ? $data['function'] : ''),
-                ((isset($data['class']) === true) ? $data['class'] : ''),
-                ((isset($data['onChange']) === true) ? $data['onChange'] : ''),
-                ((isset($data['autocomplete']) === true) ? $data['autocomplete'] : '')
-            );
-
-            case 'image':
-            return html_print_input_image(
-                $data['name'],
-                $data['src'],
-                $data['value'],
-                ((isset($data['style']) === true) ? $data['style'] : ''),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['options']) === true) ? $data['options'] : false)
-            );
-
-            case 'text_extended':
-            return html_print_input_text_extended(
-                $data['name'],
-                $data['value'],
-                $data['id'],
-                $data['alt'],
-                $data['size'],
-                $data['maxlength'],
-                $data['disabled'],
-                $data['script'],
-                $data['attributes'],
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['password']) === true) ? $data['password'] : false),
-                ((isset($data['function']) === true) ? $data['function'] : '')
-            );
-
-            case 'password':
-            return html_print_input_password(
-                $data['name'],
-                $data['value'],
-                ((isset($data['alt']) === true) ? $data['alt'] : ''),
-                ((isset($data['size']) === true) ? $data['size'] : 50),
-                ((isset($data['maxlength']) === true) ? $data['maxlength'] : 255),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
-                ((isset($data['required']) === true) ? $data['required'] : false),
-                ((isset($data['class']) === true) ? $data['class'] : '')
-            );
-
-            case 'text':
-            return html_print_input_text(
-                $data['name'],
-                $data['value'],
-                ((isset($data['alt']) === true) ? $data['alt'] : ''),
-                ((isset($data['size']) === true) ? $data['size'] : 50),
-                ((isset($data['maxlength']) === true) ? $data['maxlength'] : 255),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
-                ((isset($data['required']) === true) ? $data['required'] : false),
-                ((isset($data['function']) === true) ? $data['function'] : ''),
-                ((isset($data['class']) === true) ? $data['class'] : ''),
-                ((isset($data['onChange']) === true) ? $data['onChange'] : ''),
-                ((isset($data['autocomplete']) === true) ? $data['autocomplete'] : '')
-            );
-
-            case 'image':
-            return html_print_input_image(
-                $data['name'],
-                $data['src'],
-                $data['value'],
-                ((isset($data['style']) === true) ? $data['style'] : ''),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['options']) === true) ? $data['options'] : false)
-            );
-
-            case 'hidden':
-            return html_print_input_hidden(
-                $data['name'],
-                $data['value'],
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['class']) === true) ? $data['class'] : false)
-            );
-
-            case 'hidden_extended':
-            return html_print_input_hidden_extended(
-                $data['name'],
-                $data['value'],
-                $data['id'],
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['class']) === true) ? $data['class'] : false)
-            );
-
-            case 'color':
-            return html_print_input_color(
-                $data['name'],
-                $data['value'],
-                ((isset($data['class']) === true) ? $data['class'] : false),
-                ((isset($data['return']) === true) ? $data['return'] : false)
-            );
-
-            case 'file':
-            return html_print_input_file(
-                $data['name'],
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['options']) === true) ? $data['options'] : false)
-            );
-
-            case 'select':
-            return html_print_select(
-                $data['fields'],
-                $data['name'],
-                ((isset($data['selected']) === true) ? $data['selected'] : ''),
-                ((isset($data['script']) === true) ? $data['script'] : ''),
-                ((isset($data['nothing']) === true) ? $data['nothing'] : ''),
-                ((isset($data['nothing_value']) === true) ? $data['nothing_value'] : 0),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['multiple']) === true) ? $data['multiple'] : false),
-                ((isset($data['sort']) === true) ? $data['sort'] : true),
-                ((isset($data['class']) === true) ? $data['class'] : ''),
-                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
-                ((isset($data['style']) === true) ? $data['style'] : false),
-                ((isset($data['option_style']) === true) ? $data['option_style'] : false),
-                ((isset($data['size']) === true) ? $data['size'] : false),
-                ((isset($data['modal']) === true) ? $data['modal'] : false),
-                ((isset($data['message']) === true) ? $data['message'] : ''),
-                ((isset($data['select_all']) === true) ? $data['select_all'] : false)
-            );
-
-            case 'select_from_sql':
-            return html_print_select_from_sql(
-                $data['sql'],
-                $data['name'],
-                ((isset($data['selected']) === true) ? $data['selected'] : ''),
-                ((isset($data['script']) === true) ? $data['script'] : ''),
-                ((isset($data['nothing']) === true) ? $data['nothing'] : ''),
-                ((isset($data['nothing_value']) === true) ? $data['nothing_value'] : '0'),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['multiple']) === true) ? $data['multiple'] : false),
-                ((isset($data['sort']) === true) ? $data['sort'] : true),
-                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
-                ((isset($data['style']) === true) ? $data['style'] : false),
-                ((isset($data['size']) === true) ? $data['size'] : false),
-                ((isset($data['trucate_size']) === true) ? $data['trucate_size'] : GENERIC_SIZE_TEXT)
-            );
-
-            case 'select_groups':
-            return html_print_select_groups(
-                ((isset($data['id_user']) === true) ? $data['id_user'] : false),
-                ((isset($data['privilege']) === true) ? $data['privilege'] : 'AR'),
-                ((isset($data['returnAllGroup']) === true) ? $data['returnAllGroup'] : true),
-                $data['name'],
-                ((isset($data['selected']) === true) ? $data['selected'] : ''),
-                ((isset($data['script']) === true) ? $data['script'] : ''),
-                ((isset($data['nothing']) === true) ? $data['nothing'] : ''),
-                ((isset($data['nothing_value']) === true) ? $data['nothing_value'] : 0),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['multiple']) === true) ? $data['multiple'] : false),
-                ((isset($data['sort']) === true) ? $data['sort'] : true),
-                ((isset($data['class']) === true) ? $data['class'] : ''),
-                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
-                ((isset($data['style']) === true) ? $data['style'] : false),
-                ((isset($data['option_style']) === true) ? $data['option_style'] : false),
-                ((isset($data['id_group']) === true) ? $data['id_group'] : false),
-                ((isset($data['keys_field']) === true) ? $data['keys_field'] : 'id_grupo'),
-                ((isset($data['strict_user']) === true) ? $data['strict_user'] : false),
-                ((isset($data['delete_groups']) === true) ? $data['delete_groups'] : false),
-                ((isset($data['include_groups']) === true) ? $data['include_groups'] : false),
-                ((isset($data['size']) === true) ? $data['size'] : false),
-                ((isset($data['simple_multiple_options']) === true) ? $data['simple_multiple_options'] : false)
-            );
-
-            case 'submit':
-            return '<div class="action-buttons" style="width: 100%">'.html_print_submit_button(
-                ((isset($data['label']) === true) ? $data['label'] : 'OK'),
-                ((isset($data['name']) === true) ? $data['name'] : ''),
-                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
-                ((isset($data['attributes']) === true) ? $data['attributes'] : ''),
-                ((isset($data['return']) === true) ? $data['return'] : false)
-            ).'</div>';
-
-            case 'checkbox':
-            return html_print_checkbox(
-                $data['name'],
-                $data['value'],
-                ((isset($data['checked']) === true) ? $data['checked'] : false),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
-                ((isset($data['script']) === true) ? $data['script'] : ''),
-                ((isset($data['disabled_hidden']) === true) ? $data['disabled_hidden'] : false)
-            );
-
-            case 'switch':
-            return html_print_switch($data);
-
-            case 'interval':
-            return html_print_extended_select_for_time(
-                $data['name'],
-                $data['value'],
-                ((isset($data['script']) === true) ? $data['script'] : ''),
-                ((isset($data['nothing']) === true) ? $data['nothing'] : ''),
-                ((isset($data['nothing_value']) === true) ? $data['nothing_value'] : 0),
-                ((isset($data['size']) === true) ? $data['size'] : false),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['style']) === true) ? $data['selected'] : false),
-                ((isset($data['unique']) === true) ? $data['unique'] : false)
-            );
-
-            case 'textarea':
-            return html_print_textarea(
-                $data['name'],
-                $data['rows'],
-                $data['columns'],
-                ((isset($data['value']) === true) ? $data['value'] : ''),
-                ((isset($data['attributes']) === true) ? $data['attributes'] : ''),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['class']) === true) ? $data['class'] : '')
-            );
-
-            default:
-                // Ignore.
-            break;
+        $input = html_print_input(($data + ['return' => true]), 'div', true);
+        if ($input === false) {
+            return '';
         }
 
-        return '';
+        return $input;
     }
 
 
@@ -556,6 +335,7 @@ class Wizard
             ],
             'inputs' => [
                 [
+                    'class'     => 'w100p',
                     'arguments' => [
                         'name'       => 'submit',
                         'label'      => __('Go back'),
@@ -594,13 +374,24 @@ class Wizard
 
         if (is_array($input['block_content']) === true) {
             // Print independent block of inputs.
-            $output .= '<li id="'.$input['block_id'].'" class="'.$class.'">';
-            $output .= '<ul class="wizard">';
+            if ($input['wrapper']) {
+                $output .= '<li id="li-'.$input['block_id'].'" class="'.$class.'">';
+                $output .= '<'.$input['wrapper'].' id="'.$input['block_id'].'" class="'.$class.'">';
+            } else {
+                $output .= '<li id="'.$input['block_id'].'" class="'.$class.'">';
+            }
+
+            $output .= '<ul class="wizard '.$input['block_class'].'">';
             foreach ($input['block_content'] as $input) {
                 $output .= $this->printBlock($input, $return);
             }
 
-            $output .= '</ul></li>';
+            // Close block.
+            if ($input['wrapper']) {
+                $output .= '</ul></'.$input['wrapper'].'>';
+            } else {
+                $output .= '</ul></li>';
+            }
         } else {
             if ($input['arguments']['type'] != 'hidden') {
                 $output .= '<li id="'.$input['id'].'" class="'.$class.'">';
@@ -648,7 +439,7 @@ class Wizard
         if (is_array($input['block_content']) === true) {
             // Print independent block of inputs.
             $output .= '<li id="'.$input['block_id'].'" class="'.$class.'">';
-            $output .= '<ul class="wizard">';
+            $output .= '<ul class="wizard '.$input['block_class'].'">';
             foreach ($input['block_content'] as $input) {
                 $output .= $this->printBlockAsGrid($input, $return);
             }
@@ -751,7 +542,7 @@ class Wizard
         if (is_array($input['block_content']) === true) {
             // Print independent block of inputs.
             $output .= '<li id="'.$input['block_id'].'" class="'.$class.'">';
-            $output .= '<ul class="wizard">';
+            $output .= '<ul class="wizard '.$input['block_class'].'">';
             foreach ($input['block_content'] as $input) {
                 $output .= $this->printBlockAsList($input, $return);
             }
@@ -797,10 +588,11 @@ class Wizard
         $form = $data['form'];
         $inputs = $data['inputs'];
         $js = $data['js'];
+        $rawjs = $data['js_block'];
         $cb_function = $data['cb_function'];
         $cb_args = $data['cb_args'];
 
-        $output_head = '<form class="discovery" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
+        $output_head = '<form id="'.$form['id'].'" class="discovery '.$form['class'].'" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
         $output_head .= '" '.$form['extra'].'>';
 
         if ($return === false) {
@@ -844,6 +636,9 @@ class Wizard
         $output .= '<ul class="wizard">'.$output_submit.'</ul>';
         $output .= '</form>';
         $output .= '<script>'.$js.'</script>';
+        if ($rawjs) {
+            $output .= $rawjs;
+        }
 
         if ($return === false) {
             echo $output;
@@ -869,10 +664,11 @@ class Wizard
         $rows = $data['rows'];
 
         $js = $data['js'];
+        $rawjs = $data['js_block'];
         $cb_function = $data['cb_function'];
         $cb_args = $data['cb_args'];
 
-        $output_head = '<form class="discovery" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
+        $output_head = '<form class="discovery" onsubmit="'.$form['onsubmit'].'"  enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
         $output_head .= '" '.$form['extra'].'>';
 
         if ($return === false) {
@@ -895,45 +691,47 @@ class Wizard
 
         $first_block_printed = false;
 
-        foreach ($rows as $row) {
-            if ($row['new_form_block'] == true) {
-                if ($first_block_printed === true) {
-                    // If first form block has been placed, then close it before starting a new one.
-                    $output .= '</div>';
-                    $output .= '<div class="white_box" style="margin-top: 30px;">';
-                } else {
-                    $output .= '<div class="white_box">';
+        if (is_array($rows)) {
+            foreach ($rows as $row) {
+                if ($row['new_form_block'] == true) {
+                    if ($first_block_printed === true) {
+                        // If first form block has been placed, then close it before starting a new one.
+                        $output .= '</div>';
+                        $output .= '<div class="white_box" style="margin-top: 30px;">';
+                    } else {
+                        $output .= '<div class="white_box">';
+                    }
+
+                    $first_block_printed = true;
                 }
 
-                $first_block_printed = true;
-            }
+                $output .= '<div class="edit_discovery_info" style="'.$row['style'].'">';
 
-            $output .= '<div class="edit_discovery_info" style="'.$row['style'].'">';
+                foreach ($row['columns'] as $column) {
+                    $width = isset($column['width']) ? 'width: '.$column['width'].';' : 'width: 100%;';
+                    $padding_left = isset($column['padding-left']) ? 'padding-left: '.$column['padding-left'].';' : 'padding-left: 0;';
+                    $padding_right = isset($column['padding-right']) ? 'padding-right: '.$column['padding-right'].';' : 'padding-right: 0;';
+                    $extra_styles = isset($column['style']) ? $column['style'] : '';
 
-            foreach ($row['columns'] as $column) {
-                $width = isset($column['width']) ? 'width: '.$column['width'].';' : 'width: 100%;';
-                $padding_left = isset($column['padding-left']) ? 'padding-left: '.$column['padding-left'].';' : 'padding-left: 0;';
-                $padding_right = isset($column['padding-right']) ? 'padding-right: '.$column['padding-right'].';' : 'padding-right: 0;';
-                $extra_styles = isset($column['style']) ? $column['style'] : '';
+                    $output .= '<div style="'.$width.$padding_left.$padding_right.$extra_styles.'">';
 
-                $output .= '<div style="'.$width.$padding_left.$padding_right.$extra_styles.'">';
-
-                foreach ($column['inputs'] as $input) {
-                    if (is_array($input)) {
-                        if ($input['arguments']['type'] != 'submit') {
-                            $output .= $this->printBlockAsGrid($input, true);
+                    foreach ($column['inputs'] as $input) {
+                        if (is_array($input)) {
+                            if ($input['arguments']['type'] != 'submit') {
+                                $output .= $this->printBlockAsGrid($input, true);
+                            } else {
+                                $output_submit .= $this->printBlockAsGrid($input, true);
+                            }
                         } else {
-                            $output_submit .= $this->printBlockAsGrid($input, true);
+                            $output .= $input;
                         }
-                    } else {
-                        $output .= $input;
                     }
+
+                    $output .= '</div>';
                 }
 
                 $output .= '</div>';
             }
-
-            $output .= '</div>';
         }
 
         $output .= '</div>';
@@ -941,6 +739,9 @@ class Wizard
         $output .= '<ul class="wizard">'.$output_submit.'</ul>';
         $output .= '</form>';
         $output .= '<script>'.$js.'</script>';
+        if ($rawjs) {
+            $output .= $rawjs;
+        }
 
         if ($return === false) {
             echo $output;
@@ -964,10 +765,11 @@ class Wizard
         $form = $data['form'];
         $inputs = $data['inputs'];
         $js = $data['js'];
+        $rawjs = $data['js_block'];
         $cb_function = $data['cb_function'];
         $cb_args = $data['cb_args'];
 
-        $output_head = '<form class="discovery" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
+        $output_head = '<form class="discovery" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
         $output_head .= '" '.$form['extra'].'>';
 
         if ($return === false) {
@@ -1001,6 +803,9 @@ class Wizard
         $output .= '<ul class="wizard">'.$output_submit.'</ul>';
         $output .= '</form>';
         $output .= '<script>'.$js.'</script>';
+        if ($rawjs) {
+            $output .= $rawjs;
+        }
 
         if ($return === false) {
             echo $output;
diff --git a/pandora_console/images/console/background/fondo.jpg b/pandora_console/images/console/background/fondo.jpg
new file mode 100644
index 0000000000..817ab9d050
Binary files /dev/null and b/pandora_console/images/console/background/fondo.jpg differ
diff --git a/pandora_console/images/console/icons/rack_double_server.png b/pandora_console/images/console/icons/rack_double_server.png
new file mode 100644
index 0000000000..7ce45ab718
Binary files /dev/null and b/pandora_console/images/console/icons/rack_double_server.png differ
diff --git a/pandora_console/images/console/icons/rack_double_server_bad.png b/pandora_console/images/console/icons/rack_double_server_bad.png
new file mode 100644
index 0000000000..94ada7ad16
Binary files /dev/null and b/pandora_console/images/console/icons/rack_double_server_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_double_server_ok.png b/pandora_console/images/console/icons/rack_double_server_ok.png
new file mode 100644
index 0000000000..8a06465a3c
Binary files /dev/null and b/pandora_console/images/console/icons/rack_double_server_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_double_server_warning.png b/pandora_console/images/console/icons/rack_double_server_warning.png
new file mode 100644
index 0000000000..2639b16afd
Binary files /dev/null and b/pandora_console/images/console/icons/rack_double_server_warning.png differ
diff --git a/pandora_console/images/console/icons/rack_firewall.png b/pandora_console/images/console/icons/rack_firewall.png
new file mode 100644
index 0000000000..7635fd6d57
Binary files /dev/null and b/pandora_console/images/console/icons/rack_firewall.png differ
diff --git a/pandora_console/images/console/icons/rack_firewall_bad.png b/pandora_console/images/console/icons/rack_firewall_bad.png
new file mode 100644
index 0000000000..5c6ea2e2b0
Binary files /dev/null and b/pandora_console/images/console/icons/rack_firewall_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_firewall_ok.png b/pandora_console/images/console/icons/rack_firewall_ok.png
new file mode 100644
index 0000000000..bb245983a1
Binary files /dev/null and b/pandora_console/images/console/icons/rack_firewall_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_firewall_warning.png b/pandora_console/images/console/icons/rack_firewall_warning.png
new file mode 100644
index 0000000000..0b2a3150fa
Binary files /dev/null and b/pandora_console/images/console/icons/rack_firewall_warning.png differ
diff --git a/pandora_console/images/console/icons/rack_frame.png b/pandora_console/images/console/icons/rack_frame.png
new file mode 100644
index 0000000000..91baaa7c8a
Binary files /dev/null and b/pandora_console/images/console/icons/rack_frame.png differ
diff --git a/pandora_console/images/console/icons/rack_frame_bad.png b/pandora_console/images/console/icons/rack_frame_bad.png
new file mode 100644
index 0000000000..c6ed4cff03
Binary files /dev/null and b/pandora_console/images/console/icons/rack_frame_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_frame_ok.png b/pandora_console/images/console/icons/rack_frame_ok.png
new file mode 100644
index 0000000000..4743ff5d88
Binary files /dev/null and b/pandora_console/images/console/icons/rack_frame_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_frame_warning.png b/pandora_console/images/console/icons/rack_frame_warning.png
new file mode 100644
index 0000000000..a30b937218
Binary files /dev/null and b/pandora_console/images/console/icons/rack_frame_warning.png differ
diff --git a/pandora_console/images/console/icons/rack_hard_disk.png b/pandora_console/images/console/icons/rack_hard_disk.png
new file mode 100644
index 0000000000..f445bd2d62
Binary files /dev/null and b/pandora_console/images/console/icons/rack_hard_disk.png differ
diff --git a/pandora_console/images/console/icons/rack_hard_disk_2.png b/pandora_console/images/console/icons/rack_hard_disk_2.png
new file mode 100644
index 0000000000..26f646b2bb
Binary files /dev/null and b/pandora_console/images/console/icons/rack_hard_disk_2.png differ
diff --git a/pandora_console/images/console/icons/rack_hard_disk_2_bad.png b/pandora_console/images/console/icons/rack_hard_disk_2_bad.png
new file mode 100644
index 0000000000..f41143f2bd
Binary files /dev/null and b/pandora_console/images/console/icons/rack_hard_disk_2_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_hard_disk_2_ok.png b/pandora_console/images/console/icons/rack_hard_disk_2_ok.png
new file mode 100644
index 0000000000..2db4df0236
Binary files /dev/null and b/pandora_console/images/console/icons/rack_hard_disk_2_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_hard_disk_2_warning.png b/pandora_console/images/console/icons/rack_hard_disk_2_warning.png
new file mode 100644
index 0000000000..f0d3c4d28d
Binary files /dev/null and b/pandora_console/images/console/icons/rack_hard_disk_2_warning.png differ
diff --git a/pandora_console/images/console/icons/rack_hard_disk_bad.png b/pandora_console/images/console/icons/rack_hard_disk_bad.png
new file mode 100644
index 0000000000..d1a9d1ac3f
Binary files /dev/null and b/pandora_console/images/console/icons/rack_hard_disk_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_hard_disk_ok.png b/pandora_console/images/console/icons/rack_hard_disk_ok.png
new file mode 100644
index 0000000000..49b7f42aec
Binary files /dev/null and b/pandora_console/images/console/icons/rack_hard_disk_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_hard_disk_warning.png b/pandora_console/images/console/icons/rack_hard_disk_warning.png
new file mode 100644
index 0000000000..4be91d1054
Binary files /dev/null and b/pandora_console/images/console/icons/rack_hard_disk_warning.png differ
diff --git a/pandora_console/images/console/icons/rack_pdu.png b/pandora_console/images/console/icons/rack_pdu.png
new file mode 100644
index 0000000000..4cdefdaae9
Binary files /dev/null and b/pandora_console/images/console/icons/rack_pdu.png differ
diff --git a/pandora_console/images/console/icons/rack_pdu_bad.png b/pandora_console/images/console/icons/rack_pdu_bad.png
new file mode 100644
index 0000000000..7017cd43ec
Binary files /dev/null and b/pandora_console/images/console/icons/rack_pdu_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_pdu_ok.png b/pandora_console/images/console/icons/rack_pdu_ok.png
new file mode 100644
index 0000000000..2490ad2bc5
Binary files /dev/null and b/pandora_console/images/console/icons/rack_pdu_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_pdu_warning.png b/pandora_console/images/console/icons/rack_pdu_warning.png
new file mode 100644
index 0000000000..a825c8adfc
Binary files /dev/null and b/pandora_console/images/console/icons/rack_pdu_warning.png differ
diff --git a/pandora_console/images/console/icons/rack_psa.png b/pandora_console/images/console/icons/rack_psa.png
new file mode 100644
index 0000000000..28681104e4
Binary files /dev/null and b/pandora_console/images/console/icons/rack_psa.png differ
diff --git a/pandora_console/images/console/icons/rack_psa_bad.png b/pandora_console/images/console/icons/rack_psa_bad.png
new file mode 100644
index 0000000000..c777b83b73
Binary files /dev/null and b/pandora_console/images/console/icons/rack_psa_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_psa_ok.png b/pandora_console/images/console/icons/rack_psa_ok.png
new file mode 100644
index 0000000000..3b66174ab8
Binary files /dev/null and b/pandora_console/images/console/icons/rack_psa_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_psa_warning.png b/pandora_console/images/console/icons/rack_psa_warning.png
new file mode 100644
index 0000000000..ed4fa00355
Binary files /dev/null and b/pandora_console/images/console/icons/rack_psa_warning.png differ
diff --git a/pandora_console/images/console/icons/rack_router.png b/pandora_console/images/console/icons/rack_router.png
new file mode 100644
index 0000000000..905d4cf5b3
Binary files /dev/null and b/pandora_console/images/console/icons/rack_router.png differ
diff --git a/pandora_console/images/console/icons/rack_router_bad.png b/pandora_console/images/console/icons/rack_router_bad.png
new file mode 100644
index 0000000000..2d44cc62af
Binary files /dev/null and b/pandora_console/images/console/icons/rack_router_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_router_ok.png b/pandora_console/images/console/icons/rack_router_ok.png
new file mode 100644
index 0000000000..404ba7d854
Binary files /dev/null and b/pandora_console/images/console/icons/rack_router_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_router_warning.png b/pandora_console/images/console/icons/rack_router_warning.png
new file mode 100644
index 0000000000..11fe7ebcc8
Binary files /dev/null and b/pandora_console/images/console/icons/rack_router_warning.png differ
diff --git a/pandora_console/images/console/icons/rack_server.png b/pandora_console/images/console/icons/rack_server.png
new file mode 100644
index 0000000000..007a801146
Binary files /dev/null and b/pandora_console/images/console/icons/rack_server.png differ
diff --git a/pandora_console/images/console/icons/rack_server_bad.png b/pandora_console/images/console/icons/rack_server_bad.png
new file mode 100644
index 0000000000..afd8e3ba93
Binary files /dev/null and b/pandora_console/images/console/icons/rack_server_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_server_ok.png b/pandora_console/images/console/icons/rack_server_ok.png
new file mode 100644
index 0000000000..1ef4b9e1c2
Binary files /dev/null and b/pandora_console/images/console/icons/rack_server_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_server_rack.png b/pandora_console/images/console/icons/rack_server_rack.png
new file mode 100644
index 0000000000..884b42e668
Binary files /dev/null and b/pandora_console/images/console/icons/rack_server_rack.png differ
diff --git a/pandora_console/images/console/icons/rack_server_rack_bad.png b/pandora_console/images/console/icons/rack_server_rack_bad.png
new file mode 100644
index 0000000000..29e5e4b4ef
Binary files /dev/null and b/pandora_console/images/console/icons/rack_server_rack_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_server_rack_ok.png b/pandora_console/images/console/icons/rack_server_rack_ok.png
new file mode 100644
index 0000000000..2f346bb2d1
Binary files /dev/null and b/pandora_console/images/console/icons/rack_server_rack_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_server_rack_warning.png b/pandora_console/images/console/icons/rack_server_rack_warning.png
new file mode 100644
index 0000000000..a30d308a52
Binary files /dev/null and b/pandora_console/images/console/icons/rack_server_rack_warning.png differ
diff --git a/pandora_console/images/console/icons/rack_server_warning.png b/pandora_console/images/console/icons/rack_server_warning.png
new file mode 100644
index 0000000000..08faef378b
Binary files /dev/null and b/pandora_console/images/console/icons/rack_server_warning.png differ
diff --git a/pandora_console/images/console/icons/rack_switch.png b/pandora_console/images/console/icons/rack_switch.png
new file mode 100644
index 0000000000..9ac9e73b63
Binary files /dev/null and b/pandora_console/images/console/icons/rack_switch.png differ
diff --git a/pandora_console/images/console/icons/rack_switch_bad.png b/pandora_console/images/console/icons/rack_switch_bad.png
new file mode 100644
index 0000000000..73c5da7956
Binary files /dev/null and b/pandora_console/images/console/icons/rack_switch_bad.png differ
diff --git a/pandora_console/images/console/icons/rack_switch_ok.png b/pandora_console/images/console/icons/rack_switch_ok.png
new file mode 100644
index 0000000000..c5177785a4
Binary files /dev/null and b/pandora_console/images/console/icons/rack_switch_ok.png differ
diff --git a/pandora_console/images/console/icons/rack_switch_warning.png b/pandora_console/images/console/icons/rack_switch_warning.png
new file mode 100644
index 0000000000..188a82ca88
Binary files /dev/null and b/pandora_console/images/console/icons/rack_switch_warning.png differ
diff --git a/pandora_console/images/deploy.png b/pandora_console/images/deploy.png
new file mode 100644
index 0000000000..1cb28a44fb
Binary files /dev/null and b/pandora_console/images/deploy.png differ
diff --git a/pandora_console/images/input_deploy.png b/pandora_console/images/input_deploy.png
new file mode 100644
index 0000000000..c66f4ddd56
Binary files /dev/null and b/pandora_console/images/input_deploy.png differ
diff --git a/pandora_console/images/user_email.png b/pandora_console/images/user_email.png
index 095b012a5c..446c90f760 100644
Binary files a/pandora_console/images/user_email.png and b/pandora_console/images/user_email.png differ
diff --git a/pandora_console/images/wizard/customnetscan.png b/pandora_console/images/wizard/customnetscan.png
index edc036fa39..5ef82eb7d5 100644
Binary files a/pandora_console/images/wizard/customnetscan.png and b/pandora_console/images/wizard/customnetscan.png differ
diff --git a/pandora_console/images/wizard/netscan.png b/pandora_console/images/wizard/netscan.png
index c90f4ddc5d..66894fb446 100644
Binary files a/pandora_console/images/wizard/netscan.png and b/pandora_console/images/wizard/netscan.png differ
diff --git a/pandora_console/images/wizard/tasklist.png b/pandora_console/images/wizard/tasklist.png
index 3250311b69..0875145b8a 100644
Binary files a/pandora_console/images/wizard/tasklist.png and b/pandora_console/images/wizard/tasklist.png differ
diff --git a/pandora_console/include/ajax/agent.php b/pandora_console/include/ajax/agent.php
index 50fe7dc992..698ab7df9b 100644
--- a/pandora_console/include/ajax/agent.php
+++ b/pandora_console/include/ajax/agent.php
@@ -63,6 +63,7 @@ if ($get_agents_group) {
 if ($search_agents && (!is_metaconsole() || $force_local)) {
     $id_agent = (int) get_parameter('id_agent');
     $string = (string) get_parameter('q');
+    $string = strtoupper($string);
     // q is what autocomplete plugin gives
     $id_group = (int) get_parameter('id_group', -1);
     $addedItems = html_entity_decode((string) get_parameter('add'));
@@ -98,11 +99,11 @@ if ($search_agents && (!is_metaconsole() || $force_local)) {
     $filter_alias = $filter;
     switch ($config['dbtype']) {
         case 'mysql':
-            $filter_alias[] = '(alias LIKE "%'.$string.'%")';
+            $filter_alias[] = '(UPPER(alias) LIKE "%'.$string.'%")';
         break;
 
         case 'postgresql':
-            $filter_alias[] = '(alias LIKE \'%'.$string.'%\')';
+            $filter_alias[] = '(UPPER(alias) LIKE \'%'.$string.'%\')';
         break;
 
         case 'oracle':
@@ -127,11 +128,11 @@ if ($search_agents && (!is_metaconsole() || $force_local)) {
     $filter_agents = $filter;
     switch ($config['dbtype']) {
         case 'mysql':
-            $filter_agents[] = '(alias NOT LIKE "%'.$string.'%" AND nombre COLLATE utf8_general_ci LIKE "%'.$string.'%")';
+            $filter_agents[] = '(UPPER(alias) NOT LIKE "%'.$string.'%" AND UPPER(nombre) COLLATE utf8_general_ci LIKE "%'.$string.'%")';
         break;
 
         case 'postgresql':
-            $filter_agents[] = '(alias NOT LIKE \'%'.$string.'%\' AND nombre LIKE \'%'.$string.'%\')';
+            $filter_agents[] = '(UPPER(alias) NOT LIKE \'%'.$string.'%\' AND UPPER(nombre) LIKE \'%'.$string.'%\')';
         break;
 
         case 'oracle':
@@ -156,11 +157,11 @@ if ($search_agents && (!is_metaconsole() || $force_local)) {
     $filter_address = $filter;
     switch ($config['dbtype']) {
         case 'mysql':
-            $filter_address[] = '(alias NOT LIKE "%'.$string.'%" AND nombre COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND direccion LIKE "%'.$string.'%")';
+            $filter_address[] = '(UPPER(alias) NOT LIKE "%'.$string.'%" AND UPPER(nombre) COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND UPPER(direccion) LIKE "%'.$string.'%")';
         break;
 
         case 'postgresql':
-            $filter_address[] = '(alias NOT LIKE \'%'.$string.'%\' AND nombre NOT LIKE \'%'.$string.'%\' AND direccion LIKE \'%'.$string.'%\')';
+            $filter_address[] = '(UPPER(alias) NOT LIKE \'%'.$string.'%\' AND UPPER(nombre) NOT LIKE \'%'.$string.'%\' AND UPPER(direccion) LIKE \'%'.$string.'%\')';
         break;
 
         case 'oracle':
@@ -185,11 +186,11 @@ if ($search_agents && (!is_metaconsole() || $force_local)) {
     $filter_description = $filter;
     switch ($config['dbtype']) {
         case 'mysql':
-            $filter_description[] = '(alias NOT LIKE "%'.$string.'%" AND nombre COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND direccion NOT LIKE "%'.$string.'%" AND comentarios LIKE "%'.$string.'%")';
+            $filter_description[] = '(UPPER(alias) NOT LIKE "%'.$string.'%" AND UPPER(nombre) COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND UPPER(direccion) NOT LIKE "%'.$string.'%" AND UPPER(comentarios) LIKE "%'.$string.'%")';
         break;
 
         case 'postgresql':
-            $filter_description[] = '(alias NOT LIKE \'%'.$string.'%\' AND nombre NOT LIKE \'%'.$string.'%\' AND direccion NOT LIKE \'%'.$string.'%\' AND comentarios LIKE \'%'.$string.'%\')';
+            $filter_description[] = '(UPPER(alias) NOT LIKE \'%'.$string.'%\' AND UPPER(nombre) NOT LIKE \'%'.$string.'%\' AND UPPER(direccion) NOT LIKE \'%'.$string.'%\' AND UPPER(comentarios) LIKE \'%'.$string.'%\')';
         break;
 
         case 'oracle':
diff --git a/pandora_console/include/ajax/alert_list.ajax.php b/pandora_console/include/ajax/alert_list.ajax.php
index b8c3705046..3f724b4e58 100644
--- a/pandora_console/include/ajax/alert_list.ajax.php
+++ b/pandora_console/include/ajax/alert_list.ajax.php
@@ -159,10 +159,10 @@ if ($show_update_action_menu) {
     $id_action = (int) get_parameter('id_action');
 
     $actions = alerts_get_alert_agent_module_actions($id_alert);
-    $action_opction = db_get_row(
+    $action_option = db_get_row(
         'talert_template_module_actions',
-        'id_alert_template_module',
-        $id_alert
+        'id',
+        $id_action
     );
 
     $data .= '<form id="update_action-'.$alert['id'].'" method="post">';
@@ -242,7 +242,7 @@ if ($show_update_action_menu) {
             $data .= '<td class="datos">';
                 $data .= html_print_input_text(
                     'fires_min_ajax',
-                    $action_opction['fires_min'],
+                    $action_option['fires_min'],
                     '',
                     4,
                     10,
@@ -251,7 +251,7 @@ if ($show_update_action_menu) {
                 $data .= ' '.__('to').' ';
                 $data .= html_print_input_text(
                     'fires_max_ajax',
-                    $action_opction['fires_max'],
+                    $action_option['fires_max'],
                     '',
                     4,
                     10,
@@ -266,7 +266,7 @@ if ($show_update_action_menu) {
             $data .= '<td class="datos2">';
                 $data .= html_print_input_text(
                     'module_action_threshold_ajax',
-                    $action_opction['module_action_threshold'],
+                    $action_option['module_action_threshold'],
                     '',
                     4,
                     10,
diff --git a/pandora_console/include/ajax/custom_fields.php b/pandora_console/include/ajax/custom_fields.php
index 21d3d11085..85066675a1 100644
--- a/pandora_console/include/ajax/custom_fields.php
+++ b/pandora_console/include/ajax/custom_fields.php
@@ -279,7 +279,7 @@ if (check_login()) {
                 'agent_small',
                 false,
                 true,
-                false,
+                true,
                 '[&hellip;]',
                 'font-size:7.5pt;'
             );
@@ -292,7 +292,7 @@ if (check_login()) {
 
             $data[] = [
                 'ref'               => $referencia,
-                'data_custom_field' => $values['name_custom_fields'],
+                'data_custom_field' => ui_bbcode_to_html($values['name_custom_fields']),
                 'server'            => $values['server_name'],
                 'agent'             => $agent,
                 'IP'                => $values['direccion'],
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 22eb1d7836..ad9d59a748 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -83,6 +83,7 @@ $validate_event = get_parameter('validate_event', 0);
 $delete_event = get_parameter('delete_event', 0);
 $get_event_filters = get_parameter('get_event_filters', 0);
 $get_comments = get_parameter('get_comments', 0);
+$get_events_fired = (bool) get_parameter('get_events_fired');
 
 if ($get_comments) {
     $event = get_parameter('event', false);
@@ -1289,12 +1290,14 @@ if ($get_extended_event) {
 
     $details = events_page_details($event, $server);
 
+    if ($meta) {
+        metaconsole_restore_db();
+    }
+
     if (events_has_extended_info($event['id_evento']) === true) {
         $related = events_page_related($event, $server);
     }
 
-    // Juanma (09/05/2014) Fix: Needs to reconnect to node, in previous funct
-    // node connection was lost.
     if ($meta) {
         $server = metaconsole_get_connection_by_id($server_id);
             metaconsole_connect($server);
@@ -1573,7 +1576,6 @@ if ($get_list_events_agents) {
     $date_from = get_parameter('date_from');
     $date_to = get_parameter('date_to');
     $id_user = $config['id_user'];
-    $server_id = get_parameter('server_id');
 
     $returned_sql = events_sql_events_grouped_agents(
         $id_agent,
@@ -1695,3 +1697,117 @@ if ($get_table_response_command) {
 
     return;
 }
+
+if ($get_events_fired) {
+    $id = get_parameter('id_row');
+    $idGroup = get_parameter('id_group');
+    $agents = get_parameter('agents', null);
+
+    $query = ' AND id_evento > '.$id;
+
+    $type = [];
+    $alert = get_parameter('alert_fired');
+    if ($alert == 'true') {
+        $resultAlert = alerts_get_event_status_group(
+            $idGroup,
+            [
+                'alert_fired',
+                'alert_ceased',
+            ],
+            $query,
+            $agents
+        );
+    }
+
+    $critical = get_parameter('critical');
+    if ($critical == 'true') {
+        $resultCritical = alerts_get_event_status_group(
+            $idGroup,
+            'going_up_critical',
+            $query,
+            $agents
+        );
+    }
+
+    $warning = get_parameter('warning');
+    if ($warning == 'true') {
+        $resultWarning = alerts_get_event_status_group(
+            $idGroup,
+            'going_up_warning',
+            $query,
+            $agents
+        );
+    }
+
+    $unknown = get_parameter('unknown');
+    if ($unknown == 'true') {
+        $resultUnknown = alerts_get_event_status_group(
+            $idGroup,
+            'going_unknown',
+            $query,
+            $agents
+        );
+    }
+
+    if ($resultAlert) {
+        $return = [
+            'fired' => $resultAlert,
+            'sound' => $config['sound_alert'],
+        ];
+        $event = events_get_event($resultAlert);
+
+        $module_name = modules_get_agentmodule_name($event['id_agentmodule']);
+        $agent_name = agents_get_alias($event['id_agente']);
+
+        $return['message'] = io_safe_output($agent_name).' - ';
+        $return['message'] .= __('Alert fired in module ');
+        $return['message'] .= io_safe_output($module_name).' - ';
+        $return['message'] .= $event['timestamp'];
+    } else if ($resultCritical) {
+        $return = [
+            'fired' => $resultCritical,
+            'sound' => $config['sound_critical'],
+        ];
+        $event = events_get_event($resultCritical);
+
+        $module_name = modules_get_agentmodule_name($event['id_agentmodule']);
+        $agent_name = agents_get_alias($event['id_agente']);
+
+        $return['message'] = io_safe_output($agent_name).' - ';
+        $return['message'] .= __('Module ').io_safe_output($module_name);
+        $return['message'] .= __(' is going to critical').' - ';
+        $return['message'] .= $event['timestamp'];
+    } else if ($resultWarning) {
+        $return = [
+            'fired' => $resultWarning,
+            'sound' => $config['sound_warning'],
+        ];
+        $event = events_get_event($resultWarning);
+
+        $module_name = modules_get_agentmodule_name($event['id_agentmodule']);
+        $agent_name = agents_get_alias($event['id_agente']);
+
+        $return['message'] = io_safe_output($agent_name).' - ';
+        $return['message'] .= __('Module ').io_safe_output($module_name);
+        $return['message'] .= __(' is going to warning').' - ';
+        $return['message'] .= $event['timestamp'];
+    } else if ($resultUnknown) {
+        $return = [
+            'fired' => $resultUnknown,
+            'sound' => $config['sound_alert'],
+        ];
+        $event = events_get_event($resultUnknown);
+
+        $module_name = modules_get_agentmodule_name($event['id_agentmodule']);
+        $agent_name = agents_get_alias($event['id_agente']);
+
+        $return['message'] = io_safe_output($agent_name).' - ';
+        $return['message'] .= __('Module ').io_safe_output($module_name);
+        $return['message'] .= __(' is going to unknown').' - ';
+        $return['message'] .= $event['timestamp'];
+    } else {
+        $return = ['fired' => 0];
+    }
+
+    echo io_json_mb_encode($return);
+}
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 730c82c2cb..e34d287da5 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1151,7 +1151,12 @@ if (check_login()) {
                 }
 
                 $server_name = '';
-                $data[8] .= "<a href='javascript: ".'show_module_detail_dialog('.$module['id_agente_modulo'].', '.$id_agente.', "'.$server_name.'", '.(0).', '.SECONDS_1DAY.', " '.modules_get_agentmodule_name($module['id_agente_modulo'])."\")'>".html_print_image('images/binary.png', true, ['border' => '0', 'alt' => '']).'</a>';
+
+                $modules_get_agentmodule_name = modules_get_agentmodule_name($module['id_agente_modulo']);
+                // Escape the double quotes that may have the name of the module.
+                $modules_get_agentmodule_name = str_replace('&quot;', '\"', $modules_get_agentmodule_name);
+
+                $data[8] .= "<a href='javascript: ".'show_module_detail_dialog('.$module['id_agente_modulo'].', '.$id_agente.', "'.$server_name.'", '.(0).', '.SECONDS_1DAY.', " '.$modules_get_agentmodule_name."\")'>".html_print_image('images/binary.png', true, ['border' => '0', 'alt' => '']).'</a>';
             }
 
             if ($module['estado'] == 3) {
diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index d03b360c16..87a6f2dca0 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -727,7 +727,7 @@ class ConsoleSupervisor
                     'type'    => 'NOTIF.LICENSE.LIMITED',
                     'title'   => __('Limited mode.'),
                     'message' => io_safe_output($config['limited_mode']),
-                    'url'     => 'index.php?sec=gsetup&sec2=godmode/setup/license',
+                    'url'     => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/license'),
                 ]
             );
         } else {
@@ -745,7 +745,7 @@ class ConsoleSupervisor
                         'Your license will expire in %d days. Please, contact our sales department.',
                         $days_to_expiry
                     ),
-                    'url'     => 'index.php?sec=gsetup&sec2=godmode/setup/license',
+                    'url'     => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/license'),
                 ]
             );
         } else if ($days_to_expiry < 0) {
@@ -755,7 +755,7 @@ class ConsoleSupervisor
                     'type'    => 'NOTIF.LICENSE.EXPIRATION',
                     'title'   => __('Expired license'),
                     'message' => __('Your license has expired. Please, contact our sales department.'),
-                    'url'     => 'index.php?sec=gsetup&sec2=godmode/setup/license',
+                    'url'     => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/license'),
                 ]
             );
             return false;
@@ -832,7 +832,7 @@ class ConsoleSupervisor
                         'Directory %s is not writable. Please, configure corresponding permissions.',
                         $config['attachment_store']
                     ),
-                    'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=general',
+                    'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=general'),
                 ]
             );
             return;
@@ -854,7 +854,7 @@ class ConsoleSupervisor
                         'There are more than %d files in attachment, consider cleaning up attachment directory manually.',
                         $config['num_files_attachment']
                     ),
-                    'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=perf',
+                    'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=perf'),
                 ]
             );
         } else {
@@ -886,7 +886,7 @@ class ConsoleSupervisor
                             'Remote configuration directory %s is not readable. Please, adjust configuration.',
                             $config['remote_config']
                         ),
-                        'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=general',
+                        'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=general'),
                     ]
                 );
                 return;
@@ -905,7 +905,7 @@ class ConsoleSupervisor
                             'Remote configuration directory %s is not writable. Please, adjust configuration.',
                             $config['remote_config'].'/conf'
                         ),
-                        'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=general',
+                        'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=general'),
                     ]
                 );
             } else {
@@ -923,7 +923,7 @@ class ConsoleSupervisor
                             'Collections directory %s is not writable. Please, adjust configuration.',
                             $config['remote_config'].'/collections'
                         ),
-                        'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=general',
+                        'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=general'),
                     ]
                 );
             } else {
@@ -941,7 +941,7 @@ class ConsoleSupervisor
                             'MD5 directory %s is not writable. Please, adjust configuration.',
                             $config['remote_config'].'/md5'
                         ),
-                        'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=general',
+                        'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=general'),
                     ]
                 );
             } else {
@@ -972,7 +972,7 @@ class ConsoleSupervisor
                         $MAX_FILES_DATA_IN,
                         $config['remote_config']
                     ),
-                    'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=perf',
+                    'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=perf'),
                 ]
             );
         } else {
@@ -995,7 +995,7 @@ class ConsoleSupervisor
                         $MAX_BADXML_FILES_DATA_IN,
                         $config['remote_config']
                     ),
-                    'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=perf',
+                    'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=perf'),
                 ]
             );
         } else {
@@ -1081,7 +1081,7 @@ class ConsoleSupervisor
                                 $modules_queued,
                                 $queue['queued_modules']
                             ),
-                            'url'     => 'index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60',
+                            'url'     => ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60'),
                         ]
                     );
                 } else {
@@ -1191,7 +1191,7 @@ class ConsoleSupervisor
                     'type'    => 'NOTIF.SERVER.STATUS.'.$server['id_server'],
                     'title'   => $msg,
                     'message' => $description,
-                    'url'     => 'index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60',
+                    'url'     => ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=60'),
                 ]
             );
         }
@@ -1263,6 +1263,7 @@ class ConsoleSupervisor
         $PHPdisable_functions = ini_get('disable_functions');
         $PHPupload_max_filesize_min = config_return_in_bytes('800M');
         $PHPmemory_limit_min = config_return_in_bytes('500M');
+        $PHPSerialize_precision = ini_get('serialize_precision');
 
         // PhantomJS status.
         $result_ejecution = exec($config['phantomjs_bin'].'/phantomjs --version');
@@ -1438,6 +1439,30 @@ class ConsoleSupervisor
         } else {
             $this->cleanNotifications('NOTIF.PHP.VERSION');
         }
+
+        if ($PHPSerialize_precision != -1) {
+            $url = 'https://www.php.net/manual/en/ini.core.php#ini.serialize-precision';
+            if ($config['language'] == 'es') {
+                $url = 'https://www.php.net/manual/es/ini.core.php#ini.serialize-precision';
+            }
+
+            $this->notify(
+                [
+                    'type'    => 'NOTIF.PHP.SERIALIZE_PRECISION',
+                    'title'   => sprintf(
+                        __("Not recommended '%s' value in PHP configuration"),
+                        'serialze_precision'
+                    ),                    'message' => sprintf(
+                        __('Recommended value is: %s'),
+                        sprintf('-1')
+                    ).'<br><br>'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator'),
+                    'url'     => $url,
+                ]
+            );
+        } else {
+            $this->cleanNotifications('NOTIF.PHP.SERIALIZE_PRECISION');
+        }
+
     }
 
 
@@ -1474,7 +1499,7 @@ class ConsoleSupervisor
                         'type'    => 'NOTIF.HISTORYDB',
                         'title'   => __('Historical database not available'),
                         'message' => __('Historical database is enabled, though not accessible with the current configuration.'),
-                        'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=hist_db',
+                        'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=hist_db'),
                     ]
                 );
             } else {
@@ -1521,7 +1546,7 @@ class ConsoleSupervisor
                         'Your database hasn\'t been through maintenance for 48hrs. Please, check documentation on how to perform this maintenance process on %s and enable it as soon as possible.',
                         io_safe_output(get_product_name())
                     ),
-                    'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=perf',
+                    'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=perf'),
                 ]
             );
         } else {
@@ -1581,7 +1606,7 @@ class ConsoleSupervisor
                             'Historical database maintenance problem.'
                         ),
                         'message' => __('Your historical database hasn\'t been through maintenance for 48hrs. Please, check documentation on how to perform this maintenance process on %s and enable it as soon as possible.', get_product_name()),
-                        'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=perf',
+                        'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=perf'),
                     ]
                 );
             } else {
@@ -1620,7 +1645,7 @@ class ConsoleSupervisor
                         'type'    => 'NOTIF.HISTORYDB.MR',
                         'title'   => __('Historical database MR mismatch'),
                         'message' => __('Your historical database is not using the same schema as the main DB. This could produce anomalies while storing historical data.'),
-                        'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=hist_db',
+                        'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=hist_db'),
                     ]
                 );
             } else {
@@ -1662,7 +1687,7 @@ class ConsoleSupervisor
                         'type'    => 'NOTIF.EXT.ELASTICSEARCH',
                         'title'   => __('Log collector cannot connect to ElasticSearch'),
                         'message' => __('ElasticSearch is not available using current configuration.'),
-                        'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=log',
+                        'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=log'),
                     ]
                 );
             } else {
@@ -1732,7 +1757,7 @@ class ConsoleSupervisor
                     'type'    => 'NOTIF.METACONSOLE.DB_CONNECTION',
                     'title'   => __('Metaconsole DB is not available.'),
                     'message' => __('Cannot connect with Metaconsole DB using current configuration.'),
-                    'url'     => 'index.php?sec=general&sec2=godmode/setup/setup&section=enterprise',
+                    'url'     => ui_get_full_url('index.php?sec=general&sec2=godmode/setup/setup&section=enterprise'),
                 ]
             );
         }
@@ -1761,7 +1786,7 @@ class ConsoleSupervisor
                     'type'    => 'NOTIF.DOWNTIME',
                     'title'   => __('Scheduled downtime running.'),
                     'message' => __('A scheduled downtime is running. Some monitoring data won\'t be available while downtime is taking place.'),
-                    'url'     => 'index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list',
+                    'url'     => ui_get_full_url('index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list'),
                 ]
             );
             return;
@@ -1922,7 +1947,7 @@ class ConsoleSupervisor
                             date('M j, G:i:s ', $next_downtime_begin),
                             date('M j, G:i:s ', $next_downtime_end)
                         ),
-                        'url'     => 'index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list',
+                        'url'     => ui_get_full_url('index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list'),
                     ]
                 );
                 return;
@@ -2018,7 +2043,7 @@ class ConsoleSupervisor
                     'type'    => 'NOTIF.SECURITY.DEFAULT_PASSWORD',
                     'title'   => __('Default password for "Admin" user has not been changed'),
                     'message' => __('Please, change the default password since it is a commonly reported vulnerability.'),
-                    'url'     => 'index.php?sec=gusuarios&sec2=godmode/users/user_list',
+                    'url'     => ui_get_full_url('index.php?sec=gusuarios&sec2=godmode/users/user_list'),
                 ]
             );
         } else {
@@ -2044,7 +2069,7 @@ class ConsoleSupervisor
                     'type'    => 'NOTIF.MISC.FONTPATH',
                     'title'   => __('Default font doesn\'t exist'),
                     'message' => __('Your defined font doesn\'t exist or is not defined. Please, check font parameters in your config'),
-                    'url'     => 'index.php?sec=gsetup&sec2=godmode/setup/setup&section=vis',
+                    'url'     => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=vis'),
                 ]
             );
         } else {
@@ -2071,7 +2096,7 @@ class ConsoleSupervisor
                         'Your %s has the "develop_bypass" mode enabled. This is a developer mode and should be disabled in a production environment. This value is located in the main index.php file',
                         get_product_name()
                     ),
-                    'url'     => 'index.php',
+                    'url'     => ui_get_full_url('index.php'),
                 ]
             );
         } else {
@@ -2094,7 +2119,7 @@ class ConsoleSupervisor
                     'type'    => 'NOTIF.MISC.EVENTSTORMPROTECTION',
                     'title'   => __('Event storm protection is enabled.'),
                     'message' => __('Some events may get lost while this mode is enabled. The server must be restarted after altering this setting.'),
-                    'url'     => 'index.php?sec=gsetup&sec2=godmode/setup/setup&section=general',
+                    'url'     => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=general'),
                 ]
             );
         } else {
@@ -2121,7 +2146,7 @@ class ConsoleSupervisor
                                 'type'    => 'NOTIF.UPDATEMANAGER.OPENSETUP',
                                 'title'   => __('Failed to retrieve updates, please configure utility'),
                                 'message' => $message,
-                                'url'     => 'index.php?sec=gsetup&sec2=godmode/setup/setup&section=general',
+                                'url'     => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=general'),
                             ]
                         );
                     }
@@ -2140,8 +2165,8 @@ class ConsoleSupervisor
                             'New %s Console update',
                             get_product_name()
                         ),
-                        'message' => __('There is a new update available. Please<a style="font-weight:bold;" href="index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online"> go to Administration:Setup:Update Manager</a> for more details.'),
-                        'url'     => 'index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online',
+                        'message' => __('There is a new update available. Please<a style="font-weight:bold;" href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online').'"> go to Administration:Setup:Update Manager</a> for more details.'),
+                        'url'     => ui_get_full_url('index.php?sec=gsetup&sec2=godmode/update_manager/update_manager&tab=online'),
                     ]
                 );
             } else {
@@ -2179,7 +2204,7 @@ class ConsoleSupervisor
                         'There is one or more minor releases available. <a style="font-size:8pt;font-style:italic;" target="blank" href="%s">.About minor release update</a>.',
                         $url
                     ),
-                    'url'     => 'index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online',
+                    'url'     => ui_get_full_url('index.php?sec=messages&sec2=godmode/update_manager/update_manager&tab=online'),
                 ]
             );
         } else {
@@ -2228,7 +2253,7 @@ class ConsoleSupervisor
                     'type'    => 'NOTIF.CRON.CONFIGURED',
                     'title'   => __('DiscoveryConsoleTasks is not configured.'),
                     'message' => __($message_conf_cron),
-                    'url'     => 'index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist',
+                    'url'     => ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist'),
                 ]
             );
         } else {
diff --git a/pandora_console/include/class/TreeService.class.php b/pandora_console/include/class/TreeService.class.php
index 2316714031..251fde0d73 100644
--- a/pandora_console/include/class/TreeService.class.php
+++ b/pandora_console/include/class/TreeService.class.php
@@ -214,26 +214,37 @@ class TreeService extends Tree
             foreach ($data_modules as $key => $module) {
                 switch ($module['estado']) {
                     case '0':
-                        $data_modules[$key]['statusImageHTML'] = '<img src="images/status_sets/default/agent_ok_ball.png" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="NORMAL status." />';
+                        $module_status = 'ok';
+                        $module_title = 'NORMAL';
                     break;
 
                     case '1':
-                        $data_modules[$key]['statusImageHTML'] = '<img src="images/status_sets/default/agent_critical_ball.png" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="CRITICAL status." />';
+                        $module_status = 'critical';
+                        $module_title = 'CRITICAL';
                     break;
 
                     case '2':
-                        $data_modules[$key]['statusImageHTML'] = '<img src="images/status_sets/default/agent_warning_ball.png" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="WARNING status." />';
+                        $module_status = 'warning';
+                        $module_title = 'WARNING';
+                    break;
+
+                    case '3':
+                        $module_status = 'down';
+                        $module_title = 'UNKNOWN';
                     break;
 
                     case '4':
-                        $data_modules[$key]['statusImageHTML'] = '<img src="images/status_sets/default/agent_no_data_ball.png" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="UNKNOWN status." />';
+                        $module_status = 'no_data';
+                        $module_title = 'NOT INITIALIZED';
                     break;
 
                     default:
-                        // code...
+                        $module_status = 'down';
+                        $module_title = 'UNKNOWN';
                     break;
                 }
 
+                $data_modules[$key]['statusImageHTML'] = '<img src="images/status_sets/default/agent_'.$module_status.'_ball.png" data-title="'.$module_title.' status." data-use_title_for_force_title="1" class="forced_title" alt="'.$module_title.' status." />';
                 $data_modules[$key]['showEventsBtn'] = 1;
                 $data_modules[$key]['eventModule'] = $module['id_agente_modulo'];
             }
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index ab7acc743d..fde2c962c9 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,8 +20,8 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC190712';
-$pandora_version = 'v7.0NG.736';
+$build_version = 'PC190916';
+$pandora_version = 'v7.0NG.738';
 
 // Do not overwrite default timezone set if defined.
 $script_tz = @date_default_timezone_get();
diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index c0a03ea34d..c512c33c8f 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -355,6 +355,12 @@ define('MODULE_PREDICTION_CLUSTER', 5);
 define('MODULE_PREDICTION_CLUSTER_AA', 6);
 define('MODULE_PREDICTION_CLUSTER_AP', 7);
 
+// Type of Webserver Modules.
+define('MODULE_WEBSERVER_CHECK_LATENCY', 30);
+define('MODULE_WEBSERVER_CHECK_SERVER_RESPONSE', 31);
+define('MODULE_WEBSERVER_RETRIEVE_NUMERIC_DATA', 32);
+define('MODULE_WEBSERVER_RETRIEVE_STRING_DATA', 33);
+
 // SNMP CONSTANTS.
 define('SNMP_DIR_MIBS', 'attachment/mibs');
 
@@ -583,6 +589,7 @@ define('DISCOVERY_APP_ORACLE', 5);
 define('DISCOVERY_CLOUD_AWS_EC2', 6);
 define('DISCOVERY_CLOUD_AWS_RDS', 7);
 define('DISCOVERY_CLOUD_AZURE_COMPUTE', 8);
+define('DISCOVERY_DEPLOY_AGENTS', 9);
 
 
 // Discovery types matching definition.
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 9232854317..b1027bc4af 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2684,7 +2684,7 @@ function can_user_access_node()
 
     $userinfo = get_user_info($config['id_user']);
 
-    if (defined('METACONSOLE')) {
+    if (is_metaconsole()) {
         return $userinfo['is_admin'] == 1 ? 1 : $userinfo['metaconsole_access_node'];
     } else {
         return 1;
@@ -2852,6 +2852,8 @@ function print_audit_csv($data)
     global $config;
     global $graphic_type;
 
+    $divider = html_entity_decode($config['csv_divider']);
+
     if (!$data) {
         echo __('No data found to export');
         return 0;
@@ -2869,9 +2871,9 @@ function print_audit_csv($data)
     // BOM
     print pack('C*', 0xEF, 0xBB, 0xBF);
 
-    echo __('User').';'.__('Action').';'.__('Date').';'.__('Source IP').';'.__('Comments')."\n";
+    echo __('User').$divider.__('Action').$divider.__('Date').$divider.__('Source IP').$divider.__('Comments')."\n";
     foreach ($data as $line) {
-        echo io_safe_output($line['id_usuario']).';'.io_safe_output($line['accion']).';'.date($config['date_format'], $line['utimestamp']).';'.$line['ip_origen'].';'.io_safe_output($line['descripcion'])."\n";
+        echo io_safe_output($line['id_usuario']).$divider.io_safe_output($line['accion']).$divider.io_safe_output(date($config['date_format'], $line['utimestamp'])).$divider.$line['ip_origen'].$divider.io_safe_output($line['descripcion'])."\n";
     }
 
     exit;
@@ -5413,3 +5415,27 @@ function get_help_info($section_name)
     // hd($result);
     return $result;
 }
+
+
+if (!function_exists('getallheaders')) {
+
+
+    /**
+     * Fix for php-fpm
+     *
+     * @return array
+     */
+    function getallheaders()
+    {
+        $headers = [];
+        foreach ($_SERVER as $name => $value) {
+            if (substr($name, 0, 5) == 'HTTP_') {
+                $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
+            }
+        }
+
+        return $headers;
+    }
+
+
+}
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index a07af2ff1e..fdcce4457a 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -1513,29 +1513,30 @@ function agents_get_name($id_agent, $case='none')
  * Get alias of an agent (cached function).
  *
  * @param integer $id_agent Agent id.
- * @param string  $case     Case (upper, lower, none)
+ * @param string  $case     Case (upper, lower, none).
  *
  * @return string Alias of the given agent.
  */
 function agents_get_alias($id_agent, $case='none')
 {
     global $config;
-    // Prepare cache
+    // Prepare cache.
     static $cache = [];
     if (empty($case)) {
         $case = 'none';
     }
 
-    // Check cache
+    // Check cache.
     if (isset($cache[$case][$id_agent])) {
         return $cache[$case][$id_agent];
     }
 
-    if (is_metaconsole()) {
-        $alias = (string) db_get_value('alias', 'tmetaconsole_agent', 'id_tagente', (int) $id_agent);
-    } else {
-        $alias = (string) db_get_value('alias', 'tagente', 'id_agente', (int) $id_agent);
-    }
+    $alias = (string) db_get_value(
+        'alias',
+        'tagente',
+        'id_agente',
+        (int) $id_agent
+    );
 
     switch ($case) {
         case 'upper':
@@ -1545,6 +1546,10 @@ function agents_get_alias($id_agent, $case='none')
         case 'lower':
             $alias = mb_strtolower($alias, 'UTF-8');
         break;
+
+        default:
+            // Not posible.
+        break;
     }
 
     $cache[$case][$id_agent] = $alias;
diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index a6acdd03fe..cc449b3445 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -2492,7 +2492,7 @@ function alerts_get_action_escalation($action)
         $escalation[$action['fires_max']] = 1;
     } else if ($action['fires_min'] < $action['fires_max']) {
         for ($i = 1; $i <= $action['fires_max']; $i++) {
-            if ($i <= $action['fires_min']) {
+            if ($i < $action['fires_min']) {
                 $escalation[$i] = 0;
             } else {
                 $escalation[$i] = 1;
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 558260f7a8..f59061a03c 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -266,6 +266,14 @@ function config_update_config()
                         $error_update[] = __('Public URL');
                     }
 
+                    if (!config_update_value('force_public_url', get_parameter_switch('force_public_url'))) {
+                        $error_update[] = __('Force use Public URL');
+                    }
+
+                    if (!config_update_value('public_url_exclusions', get_parameter('public_url_exclusions'))) {
+                        $error_update[] = __('Public URL host exclusions');
+                    }
+
                     if (!config_update_value('referer_security', get_parameter('referer_security'))) {
                         $error_update[] = __('Referer security');
                     }
diff --git a/pandora_console/include/functions_credential_store.php b/pandora_console/include/functions_credential_store.php
index eaf756f7b1..1b64bba116 100644
--- a/pandora_console/include/functions_credential_store.php
+++ b/pandora_console/include/functions_credential_store.php
@@ -56,8 +56,6 @@ function credentials_get_all(
 
     global $config;
 
-    $user_is_admin = users_is_admin();
-
     if (!is_array($filter)) {
         error_log('[credential_get_all] Filter must be an array.');
         throw new Exception('[credential_get_all] Filter must be an array.');
@@ -295,9 +293,9 @@ function print_inputs($values=null)
             'type'        => 'select',
             'script'      => 'calculate_inputs()',
             'fields'      => [
-                // 'CUSTOM' => __('Custom'),
-                'AWS'   => __('Aws'),
-                'AZURE' => __('Azure'),
+                'CUSTOM' => __('Custom'),
+                'AWS'    => __('Aws'),
+                'AZURE'  => __('Azure'),
                 // 'GOOGLE' => __('Google'),
             ],
             'selected'    => $values['product'],
@@ -331,6 +329,10 @@ function print_inputs($values=null)
         case 'GOOGLE':
             // Need further investigation.
         case 'CUSTOM':
+            $user_label = __('Account ID');
+            $pass_label = __('Password');
+            $extra1 = false;
+            $extra2 = false;
         default:
             // Use defaults.
         break;
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 7a4dc7a11b..ffb36aa3ae 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -25,13 +25,17 @@
  * GNU General Public License for more details.
  * ============================================================================
  */
+global $config;
 
 require_once $config['homedir'].'/include/functions_ui.php';
 require_once $config['homedir'].'/include/functions_tags.php';
 require_once $config['homedir'].'/include/functions.php';
+require_once $config['homedir'].'/include/functions_reporting.php';
+enterprise_include_once('include/functions_metaconsole.php');
 enterprise_include_once('meta/include/functions_events_meta.php');
 enterprise_include_once('meta/include/functions_agents_meta.php');
 enterprise_include_once('meta/include/functions_modules_meta.php');
+enterprise_include_once('meta/include/functions_events_meta.php');
 
 
 /**
@@ -213,7 +217,7 @@ function events_get_all_fields()
  *
  * @return string Traduction.
  */
-function events_get_column_name($field)
+function events_get_column_name($field, $table_alias=false)
 {
     switch ($field) {
         case 'id_evento':
@@ -289,7 +293,11 @@ function events_get_column_name($field)
         return __('Options');
 
         case 'mini_severity':
-        return 'S';
+            if ($table_alias === true) {
+                return 'S';
+            } else {
+                return __('Severity mini');
+            }
 
         default:
         return __($field);
@@ -304,7 +312,7 @@ function events_get_column_name($field)
  *
  * @return array Names array.
  */
-function events_get_column_names($fields)
+function events_get_column_names($fields, $table_alias=false)
 {
     if (!isset($fields) || !is_array($fields)) {
         return [];
@@ -314,14 +322,14 @@ function events_get_column_names($fields)
     foreach ($fields as $f) {
         if (is_array($f)) {
             $name = [];
-            $name['text'] = events_get_column_name($f['text']);
+            $name['text'] = events_get_column_name($f['text'], $table_alias);
             $name['class'] = $f['class'];
             $name['style'] = $f['style'];
             $name['extra'] = $f['extra'];
             $name['id'] = $f['id'];
             $names[] = $name;
         } else {
-            $names[] = events_get_column_name($f);
+            $names[] = events_get_column_name($f, $table_alias);
         }
     }
 
@@ -870,9 +878,11 @@ function events_get_all(
     $agent_join_filters = [];
     $tagente_table = 'tagente';
     $tagente_field = 'id_agente';
+    $conditionMetaconsole = '';
     if (is_metaconsole()) {
         $tagente_table = 'tmetaconsole_agent';
         $tagente_field = 'id_tagente';
+        $conditionMetaconsole = ' AND ta.id_tmetaconsole_setup = te.server_id ';
     }
 
     // Agent alias.
@@ -1210,7 +1220,7 @@ function events_get_all(
             ON ts.id = te.server_id';
         if (!empty($filter['server_id'])) {
             $server_join = sprintf(
-                ' LEFT JOIN tmetaconsole_setup ts
+                ' INNER JOIN tmetaconsole_setup ts
                   ON ts.id = te.server_id AND ts.id= %d',
                 $filter['server_id']
             );
@@ -1246,6 +1256,7 @@ function events_get_all(
          %s JOIN %s ta
            ON ta.%s = te.id_agente
            %s
+           %s
          %s JOIN tgrupo tg
            ON te.id_grupo = tg.id_grupo
            %s
@@ -1265,6 +1276,7 @@ function events_get_all(
         $tagente_join,
         $tagente_table,
         $tagente_field,
+        $conditionMetaconsole,
         join(' ', $agent_join_filters),
         $tgrupo_join,
         join(' ', $tgrupo_join_filters),
@@ -3157,7 +3169,7 @@ function events_get_event_filter_select($manage=true)
     } else {
         $user_groups = users_get_groups(
             $config['id_user'],
-            'EW',
+            'ER',
             users_can_manage_group_all(),
             true
         );
@@ -3875,7 +3887,7 @@ function events_page_details($event, $server='')
     global $config;
 
     // If server is provided, get the hash parameters.
-    if (!empty($server) && defined('METACONSOLE')) {
+    if (!empty($server) && is_metaconsole()) {
         $hashdata = metaconsole_get_server_hashdata($server);
         $hashstring = '&amp;loginhash=auto&loginhash_data='.$hashdata.'&loginhash_user='.str_rot13($config['id_user']);
         $serverstring = $server['server_url'].'/';
@@ -4152,7 +4164,7 @@ function events_page_details($event, $server='')
 
     $data = [];
     $data[0] = __('Instructions');
-    $data[1] = events_display_instructions($event['event_type'], $event, true);
+    $data[1] = html_entity_decode(events_display_instructions($event['event_type'], $event, true));
     $table_details->data[] = $data;
 
     $data = [];
@@ -4177,10 +4189,6 @@ function events_page_details($event, $server='')
 
     $details = '<div id="extended_event_details_page" class="extended_event_pages">'.html_print_table($table_details, true).'</div>';
 
-    if (!empty($server) && defined('METACONSOLE')) {
-        metaconsole_restore_db();
-    }
-
     return $details;
 }
 
@@ -4852,10 +4860,6 @@ function events_get_count_events_by_agent(
 
     $tagente = 'tagente';
     $tevento = 'tevento';
-    if ($dbmeta) {
-        $tagente = 'tmetaconsole_agent';
-        $tevento = 'tmetaconsole_event';
-    }
 
     $sql = sprintf(
         'SELECT id_agente,
@@ -4865,7 +4869,7 @@ function events_get_count_events_by_agent(
 		COUNT(*) AS count
 		FROM %s t3
 		WHERE utimestamp > %d AND utimestamp <= %d
-			AND id_grupo IN (%s) %s 
+			AND id_grupo IN (%s) 
 		GROUP BY id_agente',
         $tagente,
         $tevento,
@@ -5032,9 +5036,6 @@ function events_get_count_events_validated_by_user(
     }
 
     $tevento = 'tevento';
-    if ($dbmeta) {
-        $tevento = 'tmetaconsole_event';
-    }
 
     $sql = sprintf(
         'SELECT id_usuario,
@@ -5210,9 +5211,6 @@ function events_get_count_events_by_criticity(
     }
 
     $tevento = 'tevento';
-    if ($dbmeta) {
-        $tevento = 'tmetaconsole_event';
-    }
 
     $sql = sprintf(
         'SELECT criticity,
@@ -5418,9 +5416,6 @@ function events_get_count_events_validated(
     }
 
     $tevento = 'tevento';
-    if ($dbmeta) {
-        $tevento = 'tmetaconsole_event';
-    }
 
     $sql = sprintf('SELECT estado, COUNT(*) AS count FROM %s WHERE %s %s GROUP BY estado', $tevento, $sql_filter, $sql_where);
 
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index b1e70b5c1a..d0e844c3bf 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1277,12 +1277,34 @@ function graphic_combined_module(
                 array_push($modules, $source['id_agent_module']);
                 array_push($weights, $source['weight']);
                 if ($source['label'] != '' || $params_combined['labels']) {
-                    $item['type'] = 'custom_graph';
-                    $item['id_agent'] = agents_get_module_id(
+                    $id_agent = agents_get_module_id(
                         $source['id_agent_module']
                     );
-                    $item['id_agent_module'] = $source['id_agent_module'];
-                    $labels[$source['id_agent_module']] = ($source['label'] != '') ? reporting_label_macro($item, $source['label']) : reporting_label_macro($item, $params_combined['labels']);
+                    $agent_description = agents_get_description($id_agent);
+                    $agent_group = agents_get_agent_group($id_agent);
+                    $agent_address = agents_get_address($id_agent);
+                    $agent_alias = agents_get_alias($id_agent);
+                    $module_name = modules_get_agentmodule_name(
+                        $source['id_agent_module']
+                    );
+
+                    $module_description = modules_get_agentmodule_descripcion(
+                        $source['id_agent_module']
+                    );
+
+                    $items_label = [
+                        'type'               => 'custom_graph',
+                        'id_agent'           => $id_agent,
+                        'id_agent_module'    => $source['id_agent_module'],
+                        'agent_description'  => $agent_description,
+                        'agent_group'        => $agent_group,
+                        'agent_address'      => $agent_address,
+                        'agent_alias'        => $agent_alias,
+                        'module_name'        => $module_name,
+                        'module_description' => $module_description,
+                    ];
+
+                    $labels[$source['id_agent_module']] = ($source['label'] != '') ? reporting_label_macro($items_label, $source['label']) : reporting_label_macro($item, $params_combined['labels']);
                 }
             }
         }
@@ -2161,7 +2183,7 @@ function graphic_combined_module(
             $graph_values = $temp;
 
             if (!$params['vconsole']) {
-                $width  = 1024;
+                $width  = $width;
                 $height = 500;
             }
 
@@ -3230,7 +3252,7 @@ function graph_events_validated($width=300, $height=200, $extra_filters=[], $met
         $config['fontpath'],
         $config['font_size'],
         1,
-        false,
+        'bottom',
         $colors
     );
 }
@@ -3531,7 +3553,9 @@ function grafico_eventos_usuario($width, $height)
         '',
         $water_mark,
         $config['fontpath'],
-        $config['font_size']
+        $config['font_size'],
+        1,
+        'bottom'
     );
 }
 
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 533822f069..08d60dbb6e 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -77,8 +77,7 @@ function html_debug_print($var, $file='', $oneline=false)
         fprintf($f, '%s', $output);
         fclose($f);
     } else {
-        echo '<pre>'.date('Y/m/d H:i:s').' ('.gettype($var).') '.$more_info.'</pre>';
-        echo '<pre>';
+        echo '<pre style="z-index: 10000; background: #fff; padding: 1em;">'.date('Y/m/d H:i:s').' ('.gettype($var).') '.$more_info."\n";
         print_r($var);
         echo '</pre>';
     }
@@ -2472,7 +2471,7 @@ function html_print_image(
 
                 if (!is_readable($working_dir.'/enterprise/meta'.$src)) {
                     if ($isExternalLink) {
-                        $src = ui_get_full_url($src);
+                        $src = ui_get_full_url($src, false, false, false);
                     } else {
                         $src = ui_get_full_url('../..'.$src);
                     }
@@ -3071,11 +3070,13 @@ function html_print_link_with_params($text, $params=[], $type='text', $style='')
 /**
  * Print input using functions html lib.
  *
- * @param array $data Input definition.
+ * @param array   $data       Input definition.
+ * @param string  $wrapper    Wrapper 'div' or 'li'.
+ * @param boolean $input_only Return or print only input or also label.
  *
  * @return string HTML code for desired input.
  */
-function html_print_input($data)
+function html_print_input($data, $wrapper='div', $input_only=false)
 {
     if (is_array($data) === false) {
         return '';
@@ -3083,8 +3084,8 @@ function html_print_input($data)
 
     $output = '';
 
-    if ($data['label']) {
-        $output = '<div id="div-'.$data['name'].'" ';
+    if ($data['label'] && $input_only === false) {
+        $output = '<'.$wrapper.' id="'.$wrapper.'-'.$data['name'].'" ';
         $output .= ' class="'.$data['input_class'].'">';
         $output .= '<label class="'.$data['label_class'].'">';
         $output .= $data['label'];
@@ -3172,17 +3173,6 @@ function html_print_input($data)
             );
         break;
 
-        case 'image':
-            $output .= html_print_input_image(
-                $data['name'],
-                $data['src'],
-                $data['value'],
-                ((isset($data['style']) === true) ? $data['style'] : ''),
-                ((isset($data['return']) === true) ? $data['return'] : false),
-                ((isset($data['options']) === true) ? $data['options'] : false)
-            );
-        break;
-
         case 'hidden':
             $output .= html_print_input_hidden(
                 $data['name'],
@@ -3287,13 +3277,13 @@ function html_print_input($data)
         break;
 
         case 'submit':
-            $output .= '<div class="action-buttons" style="width: 100%">'.html_print_submit_button(
+            $output .= '<'.$wrapper.' class="action-buttons" style="width: 100%">'.html_print_submit_button(
                 ((isset($data['label']) === true) ? $data['label'] : 'OK'),
                 ((isset($data['name']) === true) ? $data['name'] : ''),
                 ((isset($data['disabled']) === true) ? $data['disabled'] : false),
                 ((isset($data['attributes']) === true) ? $data['attributes'] : ''),
                 ((isset($data['return']) === true) ? $data['return'] : false)
-            ).'</div>';
+            ).'</'.$wrapper.'>';
         break;
 
         case 'checkbox':
@@ -3336,20 +3326,33 @@ function html_print_input($data)
                 ((isset($data['return']) === true) ? $data['return'] : false),
                 ((isset($data['class']) === true) ? $data['class'] : '')
             );
+        break;
+
+        case 'button':
+            $output .= html_print_button(
+                ((isset($data['label']) === true) ? $data['label'] : 'OK'),
+                ((isset($data['name']) === true) ? $data['name'] : ''),
+                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
+                ((isset($data['script']) === true) ? $data['script'] : ''),
+                ((isset($data['attributes']) === true) ? $data['attributes'] : ''),
+                ((isset($data['return']) === true) ? $data['return'] : false),
+                ((isset($data['imageButton']) === true) ? $data['imageButton'] : false),
+                ((isset($data['modal']) === true) ? $data['modal'] : false),
+                ((isset($data['message']) === true) ? $data['message'] : '')
+            );
+        break;
 
         default:
             // Ignore.
         break;
     }
 
-    if ($data['label']) {
-        $output .= '</div>';
+    if ($data['label'] && $input_only === false) {
+        $output .= '</'.$wrapper.'>';
         if (!$data['return']) {
-            echo '</div>';
+            echo '</'.$wrapper.'>';
         }
     }
 
     return $output;
 }
-
-
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 5d43c8fd19..fbee2a5331 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -566,11 +566,11 @@ function modules_update_agent_module(
 /**
  * Creates a module in an agent.
  *
- * @param int Agent id.
- * @param int Module name id.
- * @param array Extra values for the module.
- * @param bool Disable the ACL checking, for default false.
- * @param mixed Array with tag's ids or false.
+ * @param integer $id_agent   Agent id.
+ * @param integer $name       Module name id.
+ * @param array   $values     Extra values for the module.
+ * @param boolean $disableACL Disable the ACL checking, for default false.
+ * @param mixed   $tags       Array with tag's ids or false.
  *
  * @return New module id if the module was created. False if not.
  */
@@ -584,7 +584,9 @@ function modules_create_agent_module(
     global $config;
 
     if (!$disableACL) {
-        if (!users_is_admin() && (empty($id_agent) || ! users_access_to_agent($id_agent, 'AW'))) {
+        if (!users_is_admin() && (empty($id_agent)
+            || !users_access_to_agent($id_agent, 'AW'))
+        ) {
             return false;
         }
     }
@@ -593,7 +595,7 @@ function modules_create_agent_module(
         return ERR_INCOMPLETE;
     }
 
-    // Check for non valid characters in module name
+    // Check for non valid characters in module name.
     if (mb_ereg_match('[\xc2\xa1\xc2\xbf\xc3\xb7\xc2\xba\xc2\xaa]', io_safe_output($name)) !== false) {
         return ERR_GENERIC;
     }
@@ -605,23 +607,33 @@ function modules_create_agent_module(
     $values['nombre'] = $name;
     $values['id_agente'] = (int) $id_agent;
 
-    $exists = (bool) db_get_value_filter('id_agente_modulo', 'tagente_modulo', ['nombre' => $name, 'id_agente' => (int) $id_agent]);
+    $exists = (bool) db_get_value_filter(
+        'id_agente_modulo',
+        'tagente_modulo',
+        [
+            'nombre'    => $name,
+            'id_agente' => (int) $id_agent,
+        ]
+    );
 
     if ($exists) {
         return ERR_EXIST;
     }
 
-    // Encrypt passwords
+    // Encrypt passwords.
     if (isset($values['plugin_pass'])) {
         $values['plugin_pass'] = io_input_password($values['plugin_pass']);
     }
 
-    // Encrypt SNMPv3 passwords
-    if (isset($values['id_tipo_modulo']) && ($values['id_tipo_modulo'] >= 15 && $values['id_tipo_modulo'] <= 18)
+    // Encrypt SNMPv3 passwords.
+    if (isset($values['id_tipo_modulo']) && ($values['id_tipo_modulo'] >= 15
+        && $values['id_tipo_modulo'] <= 18)
         && isset($values['tcp_send']) && ($values['tcp_send'] == 3)
         && isset($values['custom_string_2'])
     ) {
-        $values['custom_string_2'] = io_input_password($values['custom_string_2']);
+        $values['custom_string_2'] = io_input_password(
+            $values['custom_string_2']
+        );
     }
 
     $id_agent_module = db_process_sql_insert('tagente_modulo', $values);
@@ -645,25 +657,33 @@ function modules_create_agent_module(
     }
 
     if (isset($values['id_tipo_modulo'])
-        && ($values['id_tipo_modulo'] == 21 || $values['id_tipo_modulo'] == 22 || $values['id_tipo_modulo'] == 23)
+        && ($values['id_tipo_modulo'] == 21
+        || $values['id_tipo_modulo'] == 22
+        || $values['id_tipo_modulo'] == 23)
     ) {
-        // Async modules start in normal status
+        // Async modules start in normal status.
         $status = AGENT_MODULE_STATUS_NORMAL;
     } else {
-        // Sync modules start in unknown status
+        // Sync modules start in unknown status.
         $status = AGENT_MODULE_STATUS_NO_DATA;
     }
 
+    // Condition for cron modules. Don't touch.
+    $time = 0;
+    if (empty($values['interval']) === false) {
+        $time = (time() - (int) $values['interval']);
+    }
+
     $result = db_process_sql_insert(
         'tagente_estado',
         [
             'id_agente_modulo'  => $id_agent_module,
-            'datos'             => 0,
+            'datos'             => '',
             'timestamp'         => '01-01-1970 00:00:00',
             'estado'            => $status,
             'known_status'      => $status,
             'id_agente'         => (int) $id_agent,
-            'utimestamp'        => (time() - (int) $values['interval']),
+            'utimestamp'        => $time,
             'status_changes'    => 0,
             'last_status'       => $status,
             'last_known_status' => $status,
@@ -680,12 +700,20 @@ function modules_create_agent_module(
         return ERR_DB;
     }
 
-    // Update module status count if the module is not created disabled
+    // Update module status count if the module is not created disabled.
     if (!isset($values['disabled']) || $values['disabled'] == 0) {
         if ($status == 0) {
-            db_process_sql('UPDATE tagente SET total_count=total_count+1, normal_count=normal_count+1 WHERE id_agente='.(int) $id_agent);
+            db_process_sql(
+                'UPDATE tagente
+                SET total_count=total_count+1, normal_count=normal_count+1
+                WHERE id_agente='.(int) $id_agent
+            );
         } else {
-            db_process_sql('UPDATE tagente SET total_count=total_count+1, notinit_count=notinit_count+1 WHERE id_agente='.(int) $id_agent);
+            db_process_sql(
+                'UPDATE tagente
+                SET total_count=total_count+1, notinit_count=notinit_count+1
+                WHERE id_agente='.(int) $id_agent
+            );
         }
     }
 
diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index 69aa0a1608..f1febb5c41 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -35,8 +35,8 @@ define('NETFLOW_RES_LOWD', 6);
 define('NETFLOW_RES_MEDD', 12);
 define('NETFLOW_RES_HID', 24);
 define('NETFLOW_RES_ULTRAD', 30);
-define('NETFLOW_RES_HOURLY', 'hourly');
-define('NETFLOW_RES_DAILY', 'daily');
+define('NETFLOW_RES_HOURLY', -1);
+define('NETFLOW_RES_DAILY', -2);
 
 define('NETFLOW_MAX_DATA_CIRCULAR_MESH', 10000);
 
@@ -473,7 +473,7 @@ function netflow_get_data(
 
     // Put all points into an array.
     $intervals = [($start_date - $multiplier_time)];
-    while ((end($intervals) < $end_date) === true) {
+    while (($next = (end($intervals) + $multiplier_time) < $end_date) === true) {
         $intervals[] = (end($intervals) + $multiplier_time);
     }
 
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 9382cfb938..b27a2ff9f4 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -251,12 +251,16 @@ function reporting_make_reporting_data(
                     if ($metaconsole_on && $server_name != '') {
                         $connection = metaconsole_get_connection($server_name);
                         if (!metaconsole_load_external_db($connection)) {
-                            // ui_print_error_message ("Error connecting to ".$server_name);
                             continue;
                         }
                     }
 
-                    array_push($agents_to_macro, modules_get_agentmodule_agent($graph_item['id_agent_module']));
+                    array_push(
+                        $agents_to_macro,
+                        modules_get_agentmodule_agent(
+                            $graph_item['id_agent_module']
+                        )
+                    );
                     if ($metaconsole_on) {
                         // Restore db connection.
                         metaconsole_restore_db();
@@ -296,33 +300,54 @@ function reporting_make_reporting_data(
                 if (!metaconsole_load_external_db($connection)) {
                     continue;
                 }
+            }
 
-                $items_label['agent_description'] = agents_get_description($content['id_agent']);
-                $items_label['agent_group'] = agents_get_agent_group($content['id_agent']);
-                $items_label['agent_address'] = agents_get_address($content['id_agent']);
+            $items_label['agent_description'] = agents_get_description(
+                $content['id_agent']
+            );
+            $items_label['agent_group'] = agents_get_agent_group(
+                $content['id_agent']
+            );
+            $items_label['agent_address'] = agents_get_address(
+                $content['id_agent']
+            );
+            $items_label['agent_alias'] = agents_get_alias(
+                $content['id_agent']
+            );
 
-                $modules = agents_get_modules(
-                    $agent_value,
-                    [
-                        'id_agente_modulo',
-                        'nombre',
-                        'descripcion',
-                    ],
-                    [
-                        'id_agente_modulo' => $content['id_agent_module'],
-                    ]
+            $modules = agents_get_modules(
+                $agent_value,
+                [
+                    'id_agente_modulo',
+                    'nombre',
+                    'descripcion',
+                ],
+                [
+                    'id_agente_modulo' => $content['id_agent_module'],
+                ]
+            );
+
+            $items_label['module_name'] = $modules[$content['id_agent_module']]['nombre'];
+            $items_label['module_description'] = $modules[$content['id_agent_module']]['descripcion'];
+
+            if (is_array($content['id_agent'])
+                && count($content['id_agent']) != 1
+            ) {
+                $content['style']['name_label'] = str_replace(
+                    '_agent_',
+                    count($content['id_agent']).__(' agents'),
+                    $content['style']['name_label']
                 );
-
-                $items_label['module_name'] = $modules[$content['id_agent_module']]['nombre'];
-                $items_label['module_description'] = $modules[$content['id_agent_module']]['descripcion'];
             }
 
-            if (is_array($content['id_agent']) && count($content['id_agent']) != 1) {
-                $content['style']['name_label'] = str_replace('_agent_', count($content['id_agent']).__(' agents'), $content['style']['name_label']);
-            }
-
-            if (is_array($content['id_agent_module']) && count($content['id_agent_module']) != 1) {
-                $content['style']['name_label'] = str_replace('_module_', count($content['id_agent_module']).__(' modules'), $content['style']['name_label']);
+            if (is_array($content['id_agent_module'])
+                && count($content['id_agent_module']) != 1
+            ) {
+                $content['style']['name_label'] = str_replace(
+                    '_module_',
+                    count($content['id_agent_module']).__(' modules'),
+                    $content['style']['name_label']
+                );
             }
 
             if ($metaconsole_on) {
@@ -330,7 +355,10 @@ function reporting_make_reporting_data(
                 metaconsole_restore_db();
             }
 
-            $content['name'] = reporting_label_macro($items_label, $content['style']['name_label']);
+            $content['name'] = reporting_label_macro(
+                $items_label,
+                $content['style']['name_label']
+            );
         }
 
         switch (reporting_get_type($content)) {
@@ -1926,6 +1954,18 @@ function reporting_event_report_group(
 }
 
 
+/**
+ * Events for module reports.
+ *
+ * @param array   $report             Report info.
+ * @param array   $content            Content info.
+ * @param string  $type               Type retun report.
+ * @param integer $force_width_chart  Width chart.
+ * @param integer $force_height_chart Height chart.
+ * @param integer $pdf                If pdf report.
+ *
+ * @return array
+ */
 function reporting_event_report_module(
     $report,
     $content,
@@ -1954,12 +1994,42 @@ function reporting_event_report_module(
         metaconsole_connect(null, $id_server);
     }
 
-    $return['title'] = $content['name'];
-    $return['subtitle'] = agents_get_alias($content['id_agent']).' - '.io_safe_output(modules_get_agentmodule_name($content['id_agent_module']));
+    $id_agent = agents_get_module_id(
+        $content['id_agent_module']
+    );
+    $id_agent_module = $content['id_agent_module'];
+    $agent_description = agents_get_description($id_agent);
+    $agent_group = agents_get_agent_group($id_agent);
+    $agent_address = agents_get_address($id_agent);
+    $agent_alias = agents_get_alias($id_agent);
+    $module_name = modules_get_agentmodule_name(
+        $id_agent_module
+    );
+    $module_description = modules_get_agentmodule_descripcion(
+        $id_agent_module
+    );
 
+    $items_label = [
+        'type'               => $content['type'],
+        'id_agent'           => $id_agent,
+        'id_agent_module'    => $id_agent_module,
+        'agent_description'  => $agent_description,
+        'agent_group'        => $agent_group,
+        'agent_address'      => $agent_address,
+        'agent_alias'        => $agent_alias,
+        'module_name'        => $module_name,
+        'module_description' => $module_description,
+    ];
+
+    $return['title'] = $content['name'];
+    $return['subtitle'] = $agent_alias.' - '.io_safe_output($module_name);
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+
     if ($return['label'] != '') {
-        $return['label'] = reporting_label_macro($content, $return['label']);
+        $return['label'] = reporting_label_macro(
+            $items_label,
+            $return['label']
+        );
     }
 
     if (is_metaconsole()) {
@@ -1973,15 +2043,24 @@ function reporting_event_report_module(
     $event_filter = $content['style'];
     $return['show_summary_group'] = $event_filter['show_summary_group'];
     // Filter.
-    $show_summary_group         = $event_filter['show_summary_group'];
-    $filter_event_severity      = json_decode($event_filter['filter_event_severity'], true);
-    $filter_event_type          = json_decode($event_filter['filter_event_type'], true);
-    $filter_event_status        = json_decode($event_filter['filter_event_status'], true);
+    $show_summary_group = $event_filter['show_summary_group'];
+    $filter_event_severity = json_decode(
+        $event_filter['filter_event_severity'],
+        true
+    );
+    $filter_event_type = json_decode(
+        $event_filter['filter_event_type'],
+        true
+    );
+    $filter_event_status = json_decode(
+        $event_filter['filter_event_status'],
+        true
+    );
     $filter_event_filter_search = $event_filter['event_filter_search'];
 
     // Graphs.
-    $event_graph_by_user_validator        = $event_filter['event_graph_by_user_validator'];
-    $event_graph_by_criticity             = $event_filter['event_graph_by_criticity'];
+    $event_graph_by_user_validator = $event_filter['event_graph_by_user_validator'];
+    $event_graph_by_criticity = $event_filter['event_graph_by_criticity'];
     $event_graph_validated_vs_unvalidated = $event_filter['event_graph_validated_vs_unvalidated'];
 
     $server_name = $content['server_name'];
@@ -2819,8 +2898,42 @@ function reporting_event_report_agent(
         $history = true;
     }
 
+    $id_server = false;
+    if (is_metaconsole()) {
+        $id_server = metaconsole_get_id_server($content['server_name']);
+        metaconsole_connect(null, $id_server);
+    }
+
+    $id_agent = $content['id_agent'];
+    $agent_description = agents_get_description($id_agent);
+    $agent_group = agents_get_agent_group($id_agent);
+    $agent_address = agents_get_address($id_agent);
+    $agent_alias = agents_get_alias($id_agent);
+
+    $items_label = [
+        'type'              => $return['type'],
+        'id_agent'          => $id_agent,
+        'agent_description' => $agent_description,
+        'agent_group'       => $agent_group,
+        'agent_address'     => $agent_address,
+        'agent_alias'       => $agent_alias,
+    ];
+
+    if ($config['metaconsole']) {
+        metaconsole_restore_db();
+    }
+
+    $label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    if ($label != '') {
+        $label = reporting_label_macro(
+            $items_label,
+            $label
+        );
+    }
+
+    $return['label'] = $label;
     $return['title'] = $content['name'];
-    $return['subtitle'] = io_safe_output(agents_get_alias($content['id_agent']));
+    $return['subtitle'] = io_safe_output($agent_alias);
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
 
@@ -2883,13 +2996,6 @@ function reporting_event_report_agent(
         $metaconsole_dbtable = false;
     }
 
-    $label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
-    if ($label != '') {
-        $label = reporting_label_macro($content, $label);
-    }
-
-    $return['label'] = $label;
-
     if ($event_graph_by_user_validator) {
         $data_graph = events_get_count_events_validated_by_user(
             ['id_agent' => $content['id_agent']],
@@ -2969,10 +3075,6 @@ function reporting_event_report_agent(
         );
     }
 
-    if ($config['metaconsole']) {
-        metaconsole_restore_db();
-    }
-
     // Total events.
     if ($return['data'] != '') {
         $return['total_events'] = count($return['data']);
@@ -2984,32 +3086,65 @@ function reporting_event_report_agent(
 }
 
 
+/**
+ * Show historical data.
+ *
+ * @param array $report  Data report.
+ * @param array $content Content report.
+ *
+ * @return array
+ */
 function reporting_historical_data($report, $content)
 {
     global $config;
 
     $return['type'] = 'historical_data';
     $period = $content['period'];
-    $date_limit = (time() - $period);
+    $date_limit = ($report['datetime'] - $period);
     if (empty($content['name'])) {
         $content['name'] = __('Historical data');
     }
 
-    $module_name = io_safe_output(
-        modules_get_agentmodule_name($content['id_agent_module'])
+    $id_agent = agents_get_module_id(
+        $content['id_agent_module']
     );
-    $agent_name = io_safe_output(
-        modules_get_agentmodule_agent_alias($content['id_agent_module'])
+    $id_agent_module = $content['id_agent_module'];
+    $agent_description = agents_get_description($id_agent);
+    $agent_group = agents_get_agent_group($id_agent);
+    $agent_address = agents_get_address($id_agent);
+    $agent_alias = io_safe_output(agents_get_alias($id_agent));
+    $module_name = io_safe_output(
+        modules_get_agentmodule_name(
+            $id_agent_module
+        )
+    );
+    $module_description = modules_get_agentmodule_descripcion(
+        $id_agent_module
     );
 
+    $items_label = [
+        'type'               => $return['type'],
+        'id_agent'           => $id_agent,
+        'id_agent_module'    => $id_agent_module,
+        'agent_description'  => $agent_description,
+        'agent_group'        => $agent_group,
+        'agent_address'      => $agent_address,
+        'agent_alias'        => $agent_alias,
+        'module_name'        => $module_name,
+        'module_description' => $module_description,
+    ];
+
     $return['title'] = $content['name'];
-    $return['subtitle'] = $agent_name.' - '.$module_name;
+    $return['subtitle'] = $agent_alias.' - '.$module_name;
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
 
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
     if ($return['label'] != '') {
-        $return['label'] = reporting_label_macro($content, $return['label']);
+        $return['label'] = reporting_label_macro(
+            $items_label,
+            $return['label']
+        );
     }
 
     $return['keys'] = [
@@ -3034,7 +3169,7 @@ function reporting_historical_data($report, $content)
                 FROM tagente_datos_string
                 WHERE id_agente_modulo ='.$content['id_agent_module'].'
                     AND utimestamp >'.$date_limit.'
-                    AND utimestamp <='.time(),
+                    AND utimestamp <='.$report['datetime'],
                 true
             );
         break;
@@ -3045,7 +3180,7 @@ function reporting_historical_data($report, $content)
                 FROM tagente_datos
                 WHERE id_agente_modulo ='.$content['id_agent_module'].'
                     AND utimestamp >'.$date_limit.'
-                    AND utimestamp <='.time(),
+                    AND utimestamp <='.$report['datetime'],
                 true
             );
         break;
@@ -3065,6 +3200,14 @@ function reporting_historical_data($report, $content)
 }
 
 
+/**
+ * Show data serialized.
+ *
+ * @param array $report  Data report.
+ * @param array $content Content report.
+ *
+ * @return array
+ */
 function reporting_database_serialized($report, $content)
 {
     global $config;
@@ -3075,15 +3218,43 @@ function reporting_database_serialized($report, $content)
         $content['name'] = __('Database Serialized');
     }
 
-    $module_name = io_safe_output(
-        modules_get_agentmodule_name($content['id_agent_module'])
-    );
-    $agent_name = io_safe_output(
-        modules_get_agentmodule_agent_alias($content['id_agent_module'])
+    if (is_metaconsole()) {
+        $id_meta = metaconsole_get_id_server($content['server_name']);
+        $server = metaconsole_get_connection_by_id($id_meta);
+        metaconsole_connect($server);
+    }
+
+    $id_agent = agents_get_module_id(
+        $content['id_agent_module']
     );
 
+    $id_agent_module = $content['id_agent_module'];
+    $agent_description = agents_get_description($id_agent);
+    $agent_group = agents_get_agent_group($id_agent);
+    $agent_address = agents_get_address($id_agent);
+    $agent_alias = agents_get_alias($id_agent);
+    $module_name = modules_get_agentmodule_name(
+        $id_agent_module
+    );
+
+    $module_description = modules_get_agentmodule_descripcion(
+        $id_agent_module
+    );
+
+    $items_label = [
+        'type'               => $return['type'],
+        'id_agent'           => $id_agent,
+        'id_agent_module'    => $id_agent_module,
+        'agent_description'  => $agent_description,
+        'agent_group'        => $agent_group,
+        'agent_address'      => $agent_address,
+        'agent_alias'        => $agent_alias,
+        'module_name'        => $module_name,
+        'module_description' => $module_description,
+    ];
+
     $return['title'] = $content['name'];
-    $return['subtitle'] = $agent_name.' - '.$module_name;
+    $return['subtitle'] = $agent_alias.' - '.$module_name;
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
 
@@ -3093,33 +3264,21 @@ function reporting_database_serialized($report, $content)
     }
 
     $return['keys'] = $keys;
-
-    $module_name = io_safe_output(
-        modules_get_agentmodule_name($content['id_agent_module'])
-    );
-    $agent_name = io_safe_output(
-        modules_get_agentmodule_agent_name($content['id_agent_module'])
-    );
-
-    $return['agent_name'] = $agent_name;
+    $return['agent_name'] = $agent_alias;
     $return['module_name'] = $module_name;
 
-    if ($config['metaconsole']) {
-        $id_meta = metaconsole_get_id_server($content['server_name']);
-
-        $server = metaconsole_get_connection_by_id($id_meta);
-        metaconsole_connect($server);
-    }
-
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
     if ($return['label'] != '') {
-        $return['label'] = reporting_label_macro($content, $return['label']);
+        $return['label'] = reporting_label_macro(
+            $items_label,
+            $return['label']
+        );
     }
 
     $datelimit = ($report['datetime'] - $content['period']);
     $search_in_history_db = db_search_in_history_db($datelimit);
 
-    // This query gets information from the default and the historic database
+    // This query gets information from the default and the historic database.
     $result = db_get_all_rows_sql(
         'SELECT *
         FROM tagente_datos
@@ -3129,9 +3288,9 @@ function reporting_database_serialized($report, $content)
         $search_in_history_db
     );
 
-    // Adds string data if there is no numeric data
-    if ((count($result) < 0) or (!$result)) {
-        // This query gets information from the default and the historic database
+    // Adds string data if there is no numeric data.
+    if ((count($result) < 0) || (!$result)) {
+        // This query gets information from the default and the historic database.
         $result = db_get_all_rows_sql(
             'SELECT *
             FROM tagente_datos_string
@@ -3151,13 +3310,16 @@ function reporting_database_serialized($report, $content)
         $date = date($config['date_format'], $row['utimestamp']);
         $serialized_data = $row['datos'];
 
-        // Cut line by line
+        // Cut line by line.
         if (empty($content['line_separator'])
             || empty($serialized_data)
         ) {
             $rowsUnserialize = [$row['datos']];
         } else {
-            $rowsUnserialize = explode($content['line_separator'], $serialized_data);
+            $rowsUnserialize = explode(
+                $content['line_separator'],
+                $serialized_data
+            );
         }
 
         foreach ($rowsUnserialize as $rowUnser) {
@@ -3173,7 +3335,10 @@ function reporting_database_serialized($report, $content)
                     $row['data'][][$keys[0]] = $rowUnser;
                 }
             } else {
-                $columnsUnserialize = explode($content['column_separator'], $rowUnser);
+                $columnsUnserialize = explode(
+                    $content['column_separator'],
+                    $rowUnser
+                );
 
                 $i = 0;
                 $temp_row = [];
@@ -3639,6 +3804,14 @@ function reporting_alert_report_group($report, $content)
 }
 
 
+/**
+ * Report alert agent.
+ *
+ * @param array $report  Info report.
+ * @param array $content Content report.
+ *
+ * @return array
+ */
 function reporting_alert_report_agent($report, $content)
 {
     global $config;
@@ -3656,16 +3829,33 @@ function reporting_alert_report_agent($report, $content)
         metaconsole_connect($server);
     }
 
-    $agent_name = agents_get_alias($content['id_agent']);
+    $id_agent = $content['id_agent'];
+    $agent_description = agents_get_description($id_agent);
+    $agent_group = agents_get_agent_group($id_agent);
+    $agent_address = agents_get_address($id_agent);
+    $agent_alias = agents_get_alias($id_agent);
+
+    $items_label = [
+        'type'              => $return['type'],
+        'id_agent'          => $id_agent,
+        'id_agent_module'   => $id_agent_module,
+        'agent_description' => $agent_description,
+        'agent_group'       => $agent_group,
+        'agent_address'     => $agent_address,
+        'agent_alias'       => $agent_alias,
+    ];
 
     $return['title'] = $content['name'];
-    $return['subtitle'] = $agent_name;
+    $return['subtitle'] = $agent_alias;
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
 
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
     if ($return['label'] != '') {
-        $return['label'] = reporting_label_macro($content, $return['label']);
+        $return['label'] = reporting_label_macro(
+            $items_label,
+            $return['label']
+        );
     }
 
     $module_list = agents_get_modules($content['id_agent']);
@@ -3673,10 +3863,10 @@ function reporting_alert_report_agent($report, $content)
     $data = [];
     foreach ($module_list as $id => $module_name) {
         $data_row = [];
-        $data_row['agent']  = $agent_name;
+        $data_row['agent']  = $agent_alias;
         $data_row['module'] = $module_name;
 
-        // Alerts over $id_agent_module
+        // Alerts over $id_agent_module.
         $alerts = alerts_get_effective_alert_actions($id);
 
         if ($alerts === false) {
@@ -3770,6 +3960,14 @@ function reporting_alert_report_agent($report, $content)
 }
 
 
+/**
+ * Alert report module.
+ *
+ * @param array $report  Info report.
+ * @param array $content Content report.
+ *
+ * @return array
+ */
 function reporting_alert_report_module($report, $content)
 {
     global $config;
@@ -3787,36 +3985,56 @@ function reporting_alert_report_module($report, $content)
         metaconsole_connect($server);
     }
 
-    $module_name = io_safe_output(
-        modules_get_agentmodule_name($content['id_agent_module'])
+    $id_agent = agents_get_module_id(
+        $content['id_agent_module']
     );
-    $agent_name = io_safe_output(
-        modules_get_agentmodule_agent_alias($content['id_agent_module'])
+    $id_agent_module = $content['id_agent_module'];
+    $agent_description = agents_get_description($id_agent);
+    $agent_group = agents_get_agent_group($id_agent);
+    $agent_address = agents_get_address($id_agent);
+    $agent_alias = agents_get_alias($id_agent);
+    $module_name = modules_get_agentmodule_name(
+        $id_agent_module
     );
 
+    $module_description = modules_get_agentmodule_descripcion(
+        $id_agent_module
+    );
+
+    $items_label = [
+        'type'               => $return['type'],
+        'id_agent'           => $id_agent,
+        'id_agent_module'    => $id_agent_module,
+        'agent_description'  => $agent_description,
+        'agent_group'        => $agent_group,
+        'agent_address'      => $agent_address,
+        'agent_alias'        => $agent_alias,
+        'module_name'        => $module_name,
+        'module_description' => $module_description,
+    ];
+
     $return['title'] = $content['name'];
-    $return['subtitle'] = $agent_name.' - '.$module_name;
+    $return['subtitle'] = $agent_alias.' - '.$module_name;
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
     if ($return['label'] != '') {
-        $return['label'] = reporting_label_macro($content, $return['label']);
+        $return['label'] = reporting_label_macro(
+            $items_label,
+            $return['label']
+        );
     }
 
     $data_row = [];
 
-    $data_row['agent'] = io_safe_output(
-        agents_get_alias(
-            agents_get_agent_id_by_module_id($content['id_agent_module'])
-        )
-    );
+    $data_row['agent'] = io_safe_output($agent_alias);
     $data_row['module'] = db_get_value_filter(
         'nombre',
         'tagente_modulo',
         ['id_agente_modulo' => $content['id_agent_module']]
     );
 
-    // Alerts over $id_agent_module
+    // Alerts over $id_agent_module.
     $alerts = alerts_get_effective_alert_actions($content['id_agent_module']);
 
     $ntemplates = 0;
@@ -3945,7 +4163,7 @@ function reporting_sql_graph(
         }
     }
 
-    // Get chart
+    // Get chart.
     reporting_set_conf_charts($width, $height, $only_image, $type, $content, $ttl);
 
     if (!empty($force_width_chart)) {
@@ -3983,6 +4201,14 @@ function reporting_sql_graph(
 }
 
 
+/**
+ * Monitor report module.
+ *
+ * @param array $report  Info report.
+ * @param array $content Content report.
+ *
+ * @return array
+ */
 function reporting_monitor_report($report, $content)
 {
     global $config;
@@ -3993,48 +4219,67 @@ function reporting_monitor_report($report, $content)
         $content['name'] = __('Monitor Report');
     }
 
-    $module_name = io_safe_output(
-        modules_get_agentmodule_name($content['id_agent_module'])
-    );
-    $agent_name = io_safe_output(
-        modules_get_agentmodule_agent_alias($content['id_agent_module'])
-    );
-
-    $return['title'] = $content['name'];
-    $return['subtitle'] = $agent_name.' - '.$module_name;
-    $return['description'] = $content['description'];
-    $return['date'] = reporting_get_date_text($report, $content);
-
-    if ($config['metaconsole']) {
+    if (is_metaconsole()) {
         $id_meta = metaconsole_get_id_server($content['server_name']);
 
         $server = metaconsole_get_connection_by_id($id_meta);
         metaconsole_connect($server);
     }
 
+    $id_agent = agents_get_module_id(
+        $content['id_agent_module']
+    );
+    $id_agent_module = $content['id_agent_module'];
+    $agent_description = agents_get_description($id_agent);
+    $agent_group = agents_get_agent_group($id_agent);
+    $agent_address = agents_get_address($id_agent);
+    $agent_alias = agents_get_alias($id_agent);
+    $module_name = modules_get_agentmodule_name(
+        $id_agent_module
+    );
+
+    $module_description = modules_get_agentmodule_descripcion(
+        $id_agent_module
+    );
+
+    $items_label = [
+        'type'               => $return['type'],
+        'id_agent'           => $id_agent,
+        'id_agent_module'    => $id_agent_module,
+        'agent_description'  => $agent_description,
+        'agent_group'        => $agent_group,
+        'agent_address'      => $agent_address,
+        'agent_alias'        => $agent_alias,
+        'module_name'        => $module_name,
+        'module_description' => $module_description,
+    ];
+
+    $return['title'] = $content['name'];
+    $return['subtitle'] = $agent_alias.' - '.$module_name;
+    $return['description'] = $content['description'];
+    $return['date'] = reporting_get_date_text($report, $content);
+
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
     if ($return['label'] != '') {
-        $return['label'] = reporting_label_macro($content, $return['label']);
+        $return['label'] = reporting_label_macro(
+            $items_label,
+            $return['label']
+        );
     }
 
-    $module_name = io_safe_output(
-        modules_get_agentmodule_name($content['id_agent_module'])
-    );
-    $agent_name = io_safe_output(
-        modules_get_agentmodule_agent_name($content['id_agent_module'])
-    );
-
-    $return['agent_name'] = $agent_name;
+    $return['agent_name'] = $agent_alias;
     $return['module_name'] = $module_name;
 
-    // All values (except id module and report time) by default
+    // All values (except id module and report time) by default.
     $report = reporting_advanced_sla(
         $content['id_agent_module'],
         ($report['datetime'] - $content['period']),
         $report['datetime']
     );
 
-    if ($report['time_total'] === $report['time_unknown'] || empty($content['id_agent_module'])) {
+    if ($report['time_total'] === $report['time_unknown']
+        || empty($content['id_agent_module'])
+    ) {
         $return['data']['unknown'] = 1;
     } else {
         $return['data']['ok']['value'] = $report['SLA'];
@@ -4540,12 +4785,10 @@ function reporting_value($report, $content, $type, $pdf=false)
         'period'          => $content['period'],
         'width'           => '600px',
         'pure'            => false,
-    // true
         'date'            => $report['datetime'],
         'only_image'      => $only_image,
         'homeurl'         => ui_get_full_url(false, false, false, false),
         'ttl'             => 1,
-    // 2
         'type_graph'      => $config['type_module_charts'],
         'time_interval'   => $content['lapse'],
         'server_id'       => $id_meta,
@@ -4555,323 +4798,104 @@ function reporting_value($report, $content, $type, $pdf=false)
 
     switch ($type) {
         case 'max':
-            if ($content['lapse_calc'] == 0) {
-                $value = reporting_get_agentmodule_data_max(
-                    $content['id_agent_module'],
-                    $content['period'],
-                    $report['datetime']
-                );
-                if (!$config['simple_module_value']) {
-                    $formated_value = $value;
-                } else {
-                    $formated_value = format_for_graph($value, $config['graph_precision']).' '.$unit;
-                }
-            } else {
-                $value = '
-                <table border="0" style="margin:0 auto;text-align:center;">
-                    <tr>
-                        <td width="400px;" height="20%;">';
-                if ($content['visual_format'] == 1 || $content['visual_format'] == 2 || $content['visual_format'] == 3) {
-                    $value .= '
-                            <table style="width:90%;margin:0 auto;background-color:#eee;border: solid lightgray 1px;">
-                                <tr>
-                                    <th style="padding:5px;background-color:#82b92e;">
-                                        '.__('Agent').'
-                                    </th>
-                                    <th style="padding:5px;background-color:#82b92e;">
-                                        '.__('Module').'
-                                    </th>
-                                    <th style="padding:5px;background-color:#82b92e;">
-                                        '.__('Maximum').'
-                                    </th>
-                                <tr>
-                                    <td style="padding:5px;">
-                                        '.$agent_name.'
-                                    </td>
-                                    <td style="padding:5px;">
-                                        '.$module_name.'
-                                    </td>
-                                    <td style="padding:5px;">
-                                        '.format_for_graph(reporting_get_agentmodule_data_max($content['id_agent_module'], $content['period'], $report['datetime']), $config['graph_precision']).' '.$unit.'
-                                    </td>
-                                </tr>
-                            </table>';
-                }
-
-                $value .= '
-                    </td>
-                    <td rowspan="2" width="150px">
-                    </td>
-                    <td rowspan="2">';
-
-                if ($content['visual_format'] == 2 || $content['visual_format'] == 3) {
-                    $params['force_interval'] = 'max_only';
-                    $value .= grafico_modulo_sparse($params);
-                }
-
-                $value .= '
-
-                    </td>
-                </tr>
-                <tr>
-                    <td>';
-
-                if ($content['visual_format'] == 1 || $content['visual_format'] == 3) {
-                    $value .= '
-                        <table style="width:90%;margin:0 auto;margin-top:30px;background-color:#eee;border: solid lightgray 1px;">
-                            <tr>
-                                <th style="padding:5px;background-color:#82b92e;">
-                                    '.__('Lapse').'
-                                </th>
-                                <th style="padding:5px;background-color:#82b92e;">
-                                    '.__('Maximum').'
-                                </th>
-                            </tr>
-                            <tr>';
-                            $time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module'], true);
-                            $date_reference = getdate();
-
-                    for ($i = $date_reference[0]; $i > ($date_reference[0] - $content['period']); $i -= $content['lapse']) {
-                        $value .= '<tr><td style="padding:5px;">'.date('Y-m-d H:i:s', ($i - $content['lapse'] + 1)).' to '.date('Y-m-d H:i:s', $i).'</td><td>';
-
-                        if ($i > $time_begin['utimestamp']) {
-                            $value .= format_for_graph(
-                                reporting_get_agentmodule_data_max(
-                                    $content['id_agent_module'],
-                                    $content['lapse'],
-                                    $i
-                                ),
-                                $config['graph_precision']
-                            ).' '.$unit.'</td></tr>';
-                        } else {
-                            $value .= 'N/A</td></tr>';
-                        }
-                    }
-
-                    $value .= '</table>';
-                }
-
-                $value .= '
-                            </td>
-                        </tr>
-                    </table>';
-
-                $formated_value = $value;
-            }
-        break;
-
         case 'min':
-            if ($content['lapse_calc'] == 0) {
-                $value = reporting_get_agentmodule_data_min(
-                    $content['id_agent_module'],
-                    $content['period'],
-                    $report['datetime']
-                );
-
-                if (!$config['simple_module_value']) {
-                    $formated_value = $value;
-                } else {
-                    $formated_value = format_for_graph($value, $config['graph_precision']).' '.$unit;
-                }
-            } else {
-                $value = '
-                    <table border="0" style="margin:0 auto;text-align:center;">
-                        <tr>
-                            <td width="400px;" height="20%;">';
-
-                if ($content['visual_format'] == 1 || $content['visual_format'] == 2 || $content['visual_format'] == 3) {
-                    $value .= '
-                        <table style="width:90%;margin:0 auto;background-color:#eee;border: solid lightgray 1px;">
-                            <tr>
-                                <th style="padding:5px;background-color:#82b92e;">
-                                    '.__('Agent').'
-                                </th>
-                                <th style="padding:5px;background-color:#82b92e;">
-                                    '.__('Module').'
-                                </th>
-                                <th style="padding:5px;background-color:#82b92e;">
-                                    '.__('Minimum').'
-                                </th>
-                            <tr>
-                                <td style="padding:5px;">
-                                    '.$agent_name.'
-                                </td>
-                                <td style="padding:5px;">
-                                    '.$module_name.'
-                                </td>
-                                <td style="padding:5px;">
-                                    '.format_for_graph(reporting_get_agentmodule_data_min($content['id_agent_module'], $content['period'], $report['datetime']), $config['graph_precision']).' '.$unit.'
-                                    </td>
-                                </tr>
-                            </table>';
-                }
-
-                        $value .= '
-                    </td>
-                    <td rowspan="2" width="150px">
-                    </td>
-                    <td rowspan="2">';
-
-                if ($content['visual_format'] == 2 || $content['visual_format'] == 3) {
-                    $params['force_interval'] = 'min_only';
-                    $value .= grafico_modulo_sparse($params);
-                }
-
-                    $value .= '
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>';
-
-                if ($content['visual_format'] == 1 || $content['visual_format'] == 3) {
-                    $value .= '
-                        <table style="width:90%;margin:0 auto;margin-top:30px;background-color:#eee;border: solid lightgray 1px;">
-                            <tr>
-                                <th style="padding:5px;background-color:#82b92e;">
-                                    '.__('Lapse').'
-                                </th>
-                                <th style="padding:5px;background-color:#82b92e;">
-                                    '.__('Minimum').'
-                                </th>
-                            </tr>
-                            <tr>';
-                            $time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module']);
-                            $date_reference = getdate();
-
-                    for ($i = $date_reference[0]; $i > ($date_reference[0] - $content['period']); $i -= $content['lapse']) {
-                        $value .= '<tr><td style="padding:5px;">'.date('Y-m-d H:i:s', ($i - $content['lapse'] + 1)).' to '.date('Y-m-d H:i:s', $i).'</td><td>';
-
-                        if ($i > $time_begin['utimestamp']) {
-                            $value .= format_for_graph(
-                                reporting_get_agentmodule_data_min(
-                                    $content['id_agent_module'],
-                                    $content['lapse'],
-                                    $i
-                                ),
-                                $config['graph_precision']
-                            ).' '.$unit.'</td></tr>';
-                        } else {
-                            $value .= 'N/A</td></tr>';
-                        }
-                    }
-
-                    $value .= '</table>';
-                }
-
-                $value .= '
-                        
-                            </td>
-                        </tr>
-                    </table>';
-
-                $formated_value = $value;
-            }
-        break;
-
         case 'avg':
             if ($content['lapse_calc'] == 0) {
-                $value = reporting_get_agentmodule_data_average(
-                    $content['id_agent_module'],
-                    $content['period'],
-                    $report['datetime']
-                );
+                switch ($type) {
+                    case 'max':
+                        $value = reporting_get_agentmodule_data_max(
+                            $content['id_agent_module'],
+                            $content['period'],
+                            $report['datetime']
+                        );
+                    break;
+
+                    case 'min':
+                        $value = reporting_get_agentmodule_data_min(
+                            $content['id_agent_module'],
+                            $content['period'],
+                            $report['datetime']
+                        );
+                    break;
+
+                    case 'avg':
+                        $value = reporting_get_agentmodule_data_average(
+                            $content['id_agent_module'],
+                            $content['period'],
+                            $report['datetime']
+                        );
+                    break;
+                }
+
                 if (!$config['simple_module_value']) {
                     $formated_value = $value;
                 } else {
                     $formated_value = format_for_graph($value, $config['graph_precision']).' '.$unit;
                 }
             } else {
-                $value = '
-                    <table border="0" style="margin:0 auto;text-align:center;">
-                        <tr>
-                            <td width="400px;" height="20%;">';
+                $return['visual_format'] = $content['visual_format'];
 
-                if ($content['visual_format'] == 1 || $content['visual_format'] == 2 || $content['visual_format'] == 3) {
-                    $value .= '
-                            <table style="width:90%;margin:0 auto;background-color:#eee;border: solid lightgray 1px;">
-                                <tr>
-                                    <th style="padding:5px;background-color:#82b92e;">
-                                        '.__('Agent').'
-                                    </th>
-                                    <th style="padding:5px;background-color:#82b92e;">
-                                        '.__('Module').'
-                                    </th>
-                                    <th style="padding:5px;background-color:#82b92e;">
-                                        '.__('Average').'
-                                    </th>
-                                <tr>
-                                    <td style="padding:5px;">
-                                        '.$agent_name.'
-                                    </td>
-                                    <td style="padding:5px;">
-                                        '.$module_name.'
-                                    </td>
-                                    <td style="padding:5px;">
-                                        '.format_for_graph(reporting_get_agentmodule_data_average($content['id_agent_module'], $content['period'], $report['datetime']), $config['graph_precision']).' '.$unit.'
-                                    </td>
-                                </tr>
-                            </table>';
+                switch ($type) {
+                    case 'max':
+                        $params['force_interval'] = 'max_only';
+                        $value = format_for_graph(reporting_get_agentmodule_data_max($content['id_agent_module'], $content['period'], $report['datetime']), $config['graph_precision']).' '.$unit;
+                    break;
+
+                    case 'min':
+                        $params['force_interval'] = 'min_only';
+                        $value = format_for_graph(reporting_get_agentmodule_data_min($content['id_agent_module'], $content['period'], $report['datetime']), $config['graph_precision']).' '.$unit;
+                    break;
+
+                    case 'avg':
+                        $params['force_interval'] = 'avg_only';
+                        $value = format_for_graph(reporting_get_agentmodule_data_average($content['id_agent_module'], $content['period'], $report['datetime']), $config['graph_precision']).' '.$unit;
+                    break;
                 }
 
-                        $value .= '
-                    </td>
-                    <td rowspan="2" width="150px">
-                    </td>
-                    <td rowspan="2">';
-                if ($content['visual_format'] == 2 || $content['visual_format'] == 3) {
-                    $params['force_interval'] = 'avg_only';
-                    $value .= grafico_modulo_sparse($params);
+                $return['data'][] = [
+                    __('Agent')   => $agent_name,
+                    __('Module')  => $module_name,
+                    __('Maximun') => $value,
+                ];
+
+                if ($content['visual_format'] != 1) {
+                    $graph = grafico_modulo_sparse($params);
+                    $return['data'][] = ['value' => $graph];
                 }
 
-                $value .= '
-                    
-                    </td>               
-                </tr>
-                <tr>
-                    <td>';
-
-                if ($content['visual_format'] == 1 || $content['visual_format'] == 3) {
-                    $value .= '
-                        <table style="width:90%;margin:0 auto;margin-top:30px;background-color:#eee;border: solid lightgray 1px;">
-                            <tr>
-                                <th style="padding:5px;background-color:#82b92e;">
-                                    '.__('Lapse').'
-                                </th>
-                                <th style="padding:5px;background-color:#82b92e;">
-                                    '.__('Average').'
-                                </th>
-                            </tr>
-                            <tr>';
-                    $time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module']);
-                    $date_reference = getdate();
-
-                    for ($i = $date_reference[0]; $i > ($date_reference[0] - $content['period']); $i -= $content['lapse']) {
-                        $value .= '<tr><td style="padding:5px;">'.date('Y-m-d H:i:s', ($i - $content['lapse'] + 1)).' to '.date('Y-m-d H:i:s', $i).'</td><td>';
+                if ($content['visual_format'] != 2) {
+                    $time_begin = db_get_row_sql('select utimestamp from tagente_datos where id_agente_modulo ='.$content['id_agent_module'], true);
+                    for ($i = $report['datetime']; $i > ($report['datetime'] - $content['period']); $i -= $content['lapse']) {
+                        $row = [];
+                        $row[__('Lapse')] = date('Y-m-d H:i:s', ($i - $content['lapse'] + 1)).' to '.date('Y-m-d H:i:s', $i);
 
                         if ($i > $time_begin['utimestamp']) {
-                            $value .= format_for_graph(
-                                reporting_get_agentmodule_data_average(
-                                    $content['id_agent_module'],
-                                    $content['lapse'],
-                                    $i
-                                ),
-                                $config['graph_precision']
-                            ).' '.$unit.'</td></tr>';
-                        } else {
-                            $value .= 'N/A</td></tr>';
-                        }
-                    }
+                            switch ($type) {
+                                case 'max':
+                                    $row[__('Maximun')] = format_for_graph(reporting_get_agentmodule_data_max($content['id_agent_module'], $content['lapse'], $i), $config['graph_precision']).' '.$unit;
+                                break;
 
-                    $value .= '</table>';
+                                case 'min':
+                                    $row[__('Maximun')] = format_for_graph(reporting_get_agentmodule_data_min($content['id_agent_module'], $content['lapse'], $i), $config['graph_precision']).' '.$unit;
+                                break;
+
+                                case 'avg':
+                                    $row[__('Maximun')] = format_for_graph(reporting_get_agentmodule_data_average($content['id_agent_module'], $content['lapse'], $i), $config['graph_precision']).' '.$unit;
+                                break;
+                            }
+                        } else {
+                            $row[__('Maximun')] = 'N/A';
+                        }
+
+                        $return['data'][] = $row;
+                    }
                 }
 
-                $value .= '
-                        
-                            </td>
-                        </tr>
-                    </table>';
+                if ($config['metaconsole']) {
+                    metaconsole_restore_db();
+                }
 
-                $formated_value = $value;
+                return reporting_check_structure_content($return);
             }
         break;
 
@@ -5065,6 +5089,9 @@ function reporting_sql($report, $content)
         $sql = io_safe_output($content['external_source']);
     }
 
+    // Check if exist sql macro
+    $sql = reporting_sql_macro($report, $sql);
+
     // Do a security check on SQL coming from the user.
     $sql = check_sql($sql);
 
@@ -7573,6 +7600,17 @@ function reporting_custom_graph(
 }
 
 
+/**
+ * Simple graph report.
+ *
+ * @param array   $report             Info report.
+ * @param array   $content            Content report.
+ * @param string  $type               Type report.
+ * @param integer $force_width_chart  Width chart.
+ * @param integer $force_height_chart Height chart.
+ *
+ * @return array
+ */
 function reporting_simple_graph(
     $report,
     $content,
@@ -7582,13 +7620,6 @@ function reporting_simple_graph(
 ) {
     global $config;
 
-    if ($config['metaconsole']) {
-        $id_meta = metaconsole_get_id_server($content['server_name']);
-
-        $server = metaconsole_get_connection_by_id($id_meta);
-        metaconsole_connect($server);
-    }
-
     $return = [];
     $return['type'] = 'simple_graph';
 
@@ -7596,16 +7627,52 @@ function reporting_simple_graph(
         $content['name'] = __('Simple graph');
     }
 
-    $module_name = io_safe_output(
-        modules_get_agentmodule_name($content['id_agent_module'])
+    if ($config['metaconsole']) {
+        $id_meta = metaconsole_get_id_server($content['server_name']);
+
+        $server = metaconsole_get_connection_by_id($id_meta);
+        metaconsole_connect($server);
+    }
+
+    $id_agent = agents_get_module_id(
+        $content['id_agent_module']
     );
-    $agent_name = io_safe_output(
-        modules_get_agentmodule_agent_alias($content['id_agent_module'])
+    $id_agent_module = $content['id_agent_module'];
+    $agent_description = agents_get_description($id_agent);
+    $agent_group = agents_get_agent_group($id_agent);
+    $agent_address = agents_get_address($id_agent);
+    $agent_alias = agents_get_alias($id_agent);
+    $module_name = modules_get_agentmodule_name(
+        $id_agent_module
     );
 
+    $module_description = modules_get_agentmodule_descripcion(
+        $id_agent_module
+    );
+
+    $items_label = [
+        'type'               => $return['type'],
+        'id_agent'           => $id_agent,
+        'id_agent_module'    => $id_agent_module,
+        'agent_description'  => $agent_description,
+        'agent_group'        => $agent_group,
+        'agent_address'      => $agent_address,
+        'agent_alias'        => $agent_alias,
+        'module_name'        => $module_name,
+        'module_description' => $module_description,
+    ];
+
+    $label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    if ($label != '') {
+        $label = reporting_label_macro(
+            $items_label,
+            $label
+        );
+    }
+
     $return['title'] = $content['name'];
-    $return['subtitle'] = $agent_name.' - '.$module_name;
-    $return['agent_name'] = $agent_name;
+    $return['subtitle'] = $agent_alias.' - '.$module_name;
+    $return['agent_name'] = $agent_alias;
     $return['module_name'] = $module_name;
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text(
@@ -7613,11 +7680,6 @@ function reporting_simple_graph(
         $content
     );
 
-    $label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
-    if ($label != '') {
-        $label = reporting_label_macro($content, $label);
-    }
-
     if (isset($content['style']['fullscale'])) {
         $fullscale = (bool) $content['style']['fullscale'];
     }
@@ -7625,7 +7687,14 @@ function reporting_simple_graph(
     $return['chart'] = '';
 
     // Get chart.
-    reporting_set_conf_charts($width, $height, $only_image, $type, $content, $ttl);
+    reporting_set_conf_charts(
+        $width,
+        $height,
+        $only_image,
+        $type,
+        $content,
+        $ttl
+    );
 
     if (!empty($force_width_chart)) {
         $width = $force_width_chart;
@@ -7651,7 +7720,12 @@ function reporting_simple_graph(
                 'pure'            => false,
                 'date'            => $report['datetime'],
                 'only_image'      => $only_image,
-                'homeurl'         => ui_get_full_url(false, false, false, false),
+                'homeurl'         => ui_get_full_url(
+                    false,
+                    false,
+                    false,
+                    false
+                ),
                 'ttl'             => $ttl,
                 'compare'         => $time_compare_overlapped,
                 'show_unknown'    => true,
@@ -7662,7 +7736,6 @@ function reporting_simple_graph(
             ];
 
             $return['chart'] = grafico_modulo_sparse($params);
-
         break;
 
         case 'data':
@@ -7676,6 +7749,10 @@ function reporting_simple_graph(
                 $return['chart'][$d['utimestamp']] = $d['data'];
             }
         break;
+
+        default:
+            // Not Possible.
+        break;
     }
 
     if ($config['metaconsole']) {
@@ -11721,155 +11798,100 @@ function reporting_get_agentmodule_sla_working_timestamp($period, $date_end, $wt
 }
 
 
+/**
+ * Convert macros for value.
+ * Item content:
+ *      type
+ *      id_agent
+ *      id_agent_module
+ *      agent_description
+ *      agent_group
+ *      agent_address
+ *      agent_alias
+ *      module_name
+ *      module_description.
+ *
+ * @param array  $item  Data to replace in the macros.
+ * @param string $label String check macros.
+ *
+ * @return string
+ */
 function reporting_label_macro($item, $label)
 {
-    switch ($item['type']) {
-        case 'event_report_agent':
-        case 'alert_report_agent':
-        case 'agent_configuration':
-        case 'event_report_log':
-            if (preg_match('/_agent_/', $label)) {
-                $agent_name = agents_get_alias($item['id_agent']);
-                $label = str_replace('_agent_', $agent_name, $label);
-            }
+    if (preg_match('/_agent_/', $label)) {
+        $label = str_replace(
+            '_agent_',
+            $item['agent_alias'],
+            $label
+        );
+    }
 
-            if (preg_match('/_agentdescription_/', $label)) {
-                if (!is_metaconsole()) {
-                    $agent_name = agents_get_description($item['id_agent']);
-                } else {
-                    $agent_name = $item['agent_description'];
-                }
+    if (preg_match('/_agentdescription_/', $label)) {
+        $label = str_replace(
+            '_agentdescription_',
+            $item['agent_description'],
+            $label
+        );
+    }
 
-                $label = str_replace('_agentdescription_', $agent_name, $label);
-            }
+    if (preg_match('/_agentgroup_/', $label)) {
+        $label = str_replace(
+            '_agentgroup_',
+            $item['agent_group'],
+            $label
+        );
+    }
 
-            if (preg_match('/_agentgroup_/', $label)) {
-                if (!is_metaconsole()) {
-                    $agent_name = groups_get_name(agents_get_agent_group($item['id_agent']), true);
-                } else {
-                    $agent_name = $item['agent_group'];
-                }
+    if (preg_match('/_address_/', $label)) {
+        $label = str_replace(
+            '_address_',
+            $item['agent_address'],
+            $label
+        );
+    }
 
-                $label = str_replace('_agentgroup_', $agent_name, $label);
-            }
+    if (preg_match('/_module_/', $label)) {
+        $label = str_replace(
+            '_module_',
+            $item['module_name'],
+            $label
+        );
+    }
 
-            if (preg_match('/_address_/', $label)) {
-                if (!is_metaconsole()) {
-                    $agent_name = agents_get_address($item['id_agent']);
-                } else {
-                    $agent_name = $item['agent_address'];
-                }
-
-                $label = str_replace('_address_', $agent_name, $label);
-            }
-        break;
-
-        case 'simple_graph':
-        case 'module_histogram_graph':
-        case 'custom_graph':
-        case 'simple_baseline_graph':
-        case 'event_report_module':
-        case 'alert_report_module':
-        case 'historical_data':
-        case 'sumatory':
-        case 'database_serialized':
-        case 'monitor_report':
-        case 'min_value':
-        case 'max_value':
-        case 'avg_value':
-        case 'projection_graph':
-        case 'prediction_date':
-        case 'TTRT':
-        case 'TTO':
-        case 'MTBF':
-        case 'MTTR':
-        case 'automatic_graph':
-            if (preg_match('/_agent_/', $label)) {
-                if (isset($item['agents']) && count($item['agents']) > 1) {
-                    $agent_name = count($item['agents']).__(' agents');
-                } else {
-                    $agent_name = agents_get_alias($item['id_agent']);
-                }
-
-                $label = str_replace('_agent_', $agent_name, $label);
-            }
-
-            if (preg_match('/_agentdescription_/', $label)) {
-                if (count($item['agents']) > 1) {
-                    $agent_name = '';
-                } else {
-                    if (!is_metaconsole()) {
-                        $agent_name = agents_get_description($item['id_agent']);
-                    } else {
-                        $agent_name = $item['agent_description'];
-                    }
-                }
-
-                $label = str_replace('_agentdescription_', $agent_name, $label);
-            }
-
-            if (preg_match('/_agentgroup_/', $label)) {
-                if (count($item['agents']) > 1) {
-                    $agent_name = '';
-                } else {
-                    if (!is_metaconsole()) {
-                        $agent_name = groups_get_name(agents_get_agent_group($item['id_agent']), true);
-                    } else {
-                        $agent_name = $item['agent_group'];
-                    }
-                }
-
-                $label = str_replace('_agentgroup_', $agent_name, $label);
-            }
-
-            if (preg_match('/_address_/', $label)) {
-                if (count($item['agents']) > 1) {
-                    $agent_name = '';
-                } else {
-                    if (!is_metaconsole()) {
-                        $agent_name = agents_get_address($item['id_agent']);
-                    } else {
-                        $agent_name = $item['agent_address'];
-                    }
-                }
-
-                $label = str_replace('_address_', $agent_name, $label);
-            }
-
-            if (preg_match('/_module_/', $label)) {
-                if ($item['modules'] > 1) {
-                    $module_name = $item['modules'].__(' modules');
-                } else {
-                    if (!is_metaconsole()) {
-                        $module_name = modules_get_agentmodule_name($item['id_agent_module']);
-                    } else {
-                        $module_name = $item['module_name'];
-                    }
-                }
-
-                $label = str_replace('_module_', $module_name, $label);
-            }
-
-            if (preg_match('/_moduledescription_/', $label)) {
-                if ($item['modules'] > 1) {
-                    $module_description = '';
-                } else {
-                    if (!is_metaconsole()) {
-                        $module_description = modules_get_agentmodule_descripcion($item['id_agent_module']);
-                    } else {
-                        $module_description = $item['module_description'];
-                    }
-                }
-
-                $label = str_replace('_moduledescription_', $module_description, $label);
-            }
-        break;
+    if (preg_match('/_moduledescription_/', $label)) {
+        $label = str_replace(
+            '_moduledescription_',
+            $item['module_description'],
+            $label
+        );
     }
 
     return $label;
 }
 
 
+/**
+ * Convert macro in sql string to value
+ *
+ * @param array  $report
+ * @param string $sql
+ *
+ * @return string
+ */
+function reporting_sql_macro(array $report, string $sql): string
+{
+    if (preg_match('/_timefrom_/', $sql)) {
+        $sql = str_replace(
+            '_timefrom_',
+            $report['datetime'],
+            $sql
+        );
+    }
+
+    return $sql;
+}
+
+
 /**
  * @brief Calculates the SLA compliance value given an sla array
  *
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index de32e94312..c2ace5699e 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -141,6 +141,15 @@ function html_do_report_info($report)
 }
 
 
+/**
+ * Print html report.
+ *
+ * @param array   $report      Info.
+ * @param boolean $mini        Type.
+ * @param integer $report_info Show info.
+ *
+ * @return array
+ */
 function reporting_html_print_report($report, $mini=false, $report_info=1)
 {
     if ($report_info == 1) {
@@ -161,7 +170,38 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
         $table->rowstyle = [];
 
         if (isset($item['label']) && $item['label'] != '') {
-            $label = reporting_label_macro($item, $item['label']);
+            $id_agent = $item['id_agent'];
+            $id_agent_module = $item['id_agent_module'];
+
+            // Add macros name.
+            $agent_description = agents_get_description($id_agent);
+            $agent_group = agents_get_agent_group($id_agent);
+            $agent_address = agents_get_address($id_agent);
+            $agent_alias = agents_get_alias($id_agent);
+            $module_name = modules_get_agentmodule_name(
+                $id_agent_module
+            );
+
+            $module_description = modules_get_agentmodule_descripcion(
+                $id_agent_module
+            );
+
+            $items_label = [
+                'type'               => $item['type'],
+                'id_agent'           => $id_agent,
+                'id_agent_module'    => $id_agent_module,
+                'agent_description'  => $agent_description,
+                'agent_group'        => $agent_group,
+                'agent_address'      => $agent_address,
+                'agent_alias'        => $agent_alias,
+                'module_name'        => $module_name,
+                'module_description' => $module_description,
+            ];
+
+            $label = reporting_label_macro(
+                $items_label,
+                $item['label']
+            );
         } else {
             $label = '';
         }
@@ -180,7 +220,10 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
 
         $table->data['description_row']['description'] = $item['description'];
 
-        if ($item['type'] == 'event_report_agent' || $item['type'] == 'event_report_group' || $item['type'] == 'event_report_module') {
+        if ($item['type'] == 'event_report_agent'
+            || $item['type'] == 'event_report_group'
+            || $item['type'] == 'event_report_module'
+        ) {
             $table->data['count_row']['count'] = 'Total events: '.$item['total_events'];
         }
 
@@ -759,7 +802,7 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
             $table1->size[10] = '2%';
             $table1->data[0][10] = '<img src ="'.$src.'images/square_light_gray.png">';
             $table1->size[11] = '15%';
-            $table1->data[0][11] = '<span>'.__('Ignore time').'</span>';
+            $table1->data[0][11] = '<span>'.__('Planned Downtime').'</span>';
 
             if ($pdf === 0) {
                 $table->colspan['legend']['cell'] = 2;
@@ -2741,20 +2784,130 @@ function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_e
         $font_size = '3';
     }
 
-    $table->colspan['data']['cell'] = 3;
-    $table->cellstyle['data']['cell'] = 'text-align: left;';
+    if (isset($item['visual_format']) && $item['visual_format'] != 0
+        && ($item['type'] == 'max_value' || $item['type'] == 'min_value' || $item['type'] == 'avg_value')
+    ) {
+        $table2 = new stdClass();
+        $table2->width = '100%';
+        switch ($item['type']) {
+            case 'max_value':
+                $table2->head = [
+                    __('Agent'),
+                    __('Module'),
+                    __('Maximun'),
+                ];
+            break;
 
-    $table->data['data']['cell'] = '<p style="font: bold '.$font_size.'em Arial, Sans-serif; color: #000000;">';
+            case 'min_value':
+                $table2->head = [
+                    __('Agent'),
+                    __('Module'),
+                    __('Minimun'),
+                ];
+            break;
 
-    if ($check_empty && empty($item['data']['value'])) {
-        $table->data['data']['cell'] .= __('Unknown');
-    } else if ($only_value) {
-        $table->data['data']['cell'] .= $item['data']['value'];
+            case 'avg_value':
+                $table2->head = [
+                    __('Agent'),
+                    __('Module'),
+                    __('Average'),
+                ];
+            break;
+        }
+
+        $table2->data = [];
+
+        $data = $item['data'][0];
+
+        $row = [
+            $data[__('Agent')],
+            $data[__('Module')],
+            $data[__('Maximun')],
+        ];
+
+        $table2->data[] = $row;
+
+        $table2->title = $item['title'];
+        $table2->titleclass = 'title_table_pdf';
+        $table2->titlestyle = 'text-align:left;';
+        $table->colspan[1][0] = 3;
+        $table->colspan[2][0] = 3;
+        $table->colspan[3][0] = 3;
+
+        array_push($table->data, html_print_table($table2, true));
+        unset($item['data'][0]);
+
+        if ($item['visual_format'] != 1) {
+            $value = $item['data'][1]['value'];
+            array_push($table->data, $value);
+            unset($item['data'][1]);
+        }
+
+        if ($item['visual_format'] != 2) {
+            $table1 = new stdClass();
+            $table1->width = '100%';
+            switch ($item['type']) {
+                case 'max_value':
+                    $table1->head = [
+                        __('Lapse'),
+                        __('Maximun'),
+                    ];
+                break;
+
+                case 'min_value':
+                    $table1->head = [
+                        __('Lapse'),
+                        __('Minimun'),
+                    ];
+                break;
+
+                case 'avg_value':
+                    $table1->head = [
+                        __('Lapse'),
+                        __('Average'),
+                    ];
+                break;
+            }
+
+            $table1->data = [];
+            foreach ($item['data'] as $data) {
+                if (!is_numeric($data[__('Maximun')])) {
+                    $row = [
+                        $data[__('Lapse')],
+                        $data[__('Maximun')],
+                    ];
+                } else {
+                    $row = [
+                        $data[__('Lapse')],
+                        remove_right_zeros(number_format($data[__('Maximun')], $config['graph_precision'])),
+                    ];
+                }
+
+                $table1->data[] = $row;
+            }
+
+            $table1->title = $item['title'];
+            $table1->titleclass = 'title_table_pdf';
+            $table1->titlestyle = 'text-align:left;';
+
+            array_push($table->data, html_print_table($table1, true));
+        }
     } else {
-        $table->data['data']['cell'] .= $item['data']['formated_value'];
-    }
+        $table->colspan['data']['cell'] = 3;
+        $table->cellstyle['data']['cell'] = 'text-align: left;';
 
-    $table->data['data']['cell'] .= '</p>';
+        $table->data['data']['cell'] = '<p style="font: bold '.$font_size.'em Arial, Sans-serif; color: #000000;">';
+
+        if ($check_empty && empty($item['data']['value'])) {
+            $table->data['data']['cell'] .= __('Unknown');
+        } else if ($only_value) {
+            $table->data['data']['cell'] .= $item['data']['value'];
+        } else {
+            $table->data['data']['cell'] .= $item['data']['formated_value'];
+        }
+
+        $table->data['data']['cell'] .= '</p>';
+    }
 }
 
 
@@ -3399,7 +3552,7 @@ function reporting_html_availability_graph($table, $item, $pdf=0)
         $table2->size[10] = '2%';
         $table2->data[0][10] = '<img src ="'.$src.$hack_metaconsole.'images/square_light_gray.png">';
         $table2->size[11] = '15%';
-        $table2->data[0][11] = '<span>'.__('Ignore time').'</span>';
+        $table2->data[0][11] = '<span>'.__('Planned Downtime').'</span>';
     }
 
     if ($pdf !== 0) {
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 0850dcbfac..4049df62c9 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -32,9 +32,9 @@ require_once __DIR__.'/constants.php';
 /**
  * Get a server.
  *
- * @param int Server id to get.
- * @param array Extra filter.
- * @param array Fields to get.
+ * @param integer $id_server Server id to get.
+ * @param array   $filter    Extra filter.
+ * @param array   $fields    Fields to get.
  *
  * @return Server with the given id. False if not available.
  */
@@ -61,7 +61,12 @@ function servers_get_server($id_server, $filter=false, $fields=false)
  */
 function servers_get_names()
 {
-    $all_servers = @db_get_all_rows_filter('tserver', false, ['DISTINCT(name) as name']);
+    $all_servers = db_get_all_rows_sql(
+        'SELECT DISTINCT(`name`) as name
+        FROM tserver
+        WHERE server_type <> 13'
+    );
+
     if ($all_servers === false) {
         return [];
     }
@@ -76,7 +81,11 @@ function servers_get_names()
 
 
 /**
- * This function forces a recon task to be queued by the server asap
+ * This function forces a recon task to be queued by the server asap.
+ *
+ * @param integer $id_recon_task Id.
+ *
+ * @return void
  */
 function servers_force_recon_task($id_recon_task)
 {
@@ -141,9 +150,10 @@ function servers_get_total_modules()
 
 
 /**
- * This function will get several metrics from the database to get info about server performance
+ * This function will get several metrics from the database
+ * to get info about server performance.
  *
- * @return array with several data
+ * @return array with several data.
  */
 function servers_get_performance()
 {
@@ -161,18 +171,20 @@ function servers_get_performance()
 
     if ($config['realtimestats'] == 1) {
         $counts = db_get_all_rows_sql(
-            '
-			SELECT tagente_modulo.id_modulo,
+            'SELECT tagente_modulo.id_modulo,
 				COUNT(tagente_modulo.id_agente_modulo) modules
 			FROM tagente_modulo, tagente_estado, tagente
 			WHERE tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
 				AND tagente.id_agente = tagente_estado.id_agente
-				
 				AND tagente_modulo.disabled = 0
 				AND delete_pending = 0
-				AND (utimestamp > 0 OR (id_tipo_modulo = 100 OR (id_tipo_modulo > 21 AND id_tipo_modulo < 23)))
+				AND (utimestamp > 0
+                    OR (id_tipo_modulo = 100
+                        OR (id_tipo_modulo > 21
+                        AND id_tipo_modulo < 23)
+                    )
+                )
 				AND tagente.disabled = 0
-				
 			GROUP BY tagente_modulo.id_modulo'
         );
 
@@ -205,6 +217,10 @@ function servers_get_performance()
                 case MODULE_WEB:
                     $data['total_web_modules'] = $c['modules'];
                 break;
+
+                default:
+                    // Not possible.
+                break;
             }
 
             if ($c['id_modulo'] != MODULE_DATA) {
@@ -259,6 +275,8 @@ function servers_get_performance()
                 case SERVER_TYPE_EVENT:
                 case SERVER_TYPE_DISCOVERY:
                 case SERVER_TYPE_SYSLOG:
+                default:
+                    // Nothing.
                 break;
             }
 
@@ -272,17 +290,22 @@ function servers_get_performance()
 
     $interval_avgs = [];
 
-    // Avg of modules interval when modules have module_interval > 0
+    // Avg of modules interval when modules have module_interval > 0.
     $interval_avgs_modules = db_get_all_rows_sql(
-        '
-		SELECT count(tagente_modulo.id_modulo) modules ,
+        'SELECT count(tagente_modulo.id_modulo) modules ,
 			tagente_modulo.id_modulo,
 			AVG(tagente_modulo.module_interval) avg_interval
 		FROM tagente_modulo, tagente_estado, tagente
 		WHERE tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
 			AND tagente_modulo.disabled = 0
 			AND module_interval > 0
-			AND (utimestamp > 0 OR (id_tipo_modulo = 100 OR (id_tipo_modulo > 21 AND id_tipo_modulo < 23)))
+			AND (utimestamp > 0 OR (
+                    id_tipo_modulo = 100
+                    OR (id_tipo_modulo > 21
+                        AND id_tipo_modulo < 23
+                    )
+                )
+            )
 			AND delete_pending = 0
 			AND tagente.disabled = 0
 			AND tagente.id_agente = tagente_estado.id_agente
@@ -293,16 +316,15 @@ function servers_get_performance()
         $interval_avgs_modules = [];
     }
 
-    // Transform into a easily format
+    // Transform into a easily format.
     foreach ($interval_avgs_modules as $iamodules) {
         $interval_avgs[$iamodules['id_modulo']]['avg_interval'] = $iamodules['avg_interval'];
         $interval_avgs[$iamodules['id_modulo']]['modules'] = $iamodules['modules'];
     }
 
-    // Avg of agents interval when modules have module_interval == 0
+    // Avg of agents interval when modules have module_interval == 0.
     $interval_avgs_agents = db_get_all_rows_sql(
-        '
-		SELECT count(tagente_modulo.id_modulo) modules ,
+        'SELECT count(tagente_modulo.id_modulo) modules ,
 			tagente_modulo.id_modulo, AVG(tagente.intervalo) avg_interval
 		FROM tagente_modulo, tagente_estado, tagente
 		WHERE tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
@@ -319,50 +341,89 @@ function servers_get_performance()
         $interval_avgs_agents = [];
     }
 
-    // Merge with the previous calculated array
+    // Merge with the previous calculated array.
     foreach ($interval_avgs_agents as $iaagents) {
         if (!isset($interval_avgs[$iaagents['id_modulo']]['modules'])) {
             $interval_avgs[$iaagents['id_modulo']]['avg_interval'] = $iaagents['avg_interval'];
             $interval_avgs[$iaagents['id_modulo']]['modules'] = $iaagents['modules'];
         } else {
-            $interval_avgs[$iaagents['id_modulo']]['avg_interval'] = servers_get_avg_interval($interval_avgs[$iaagents['id_modulo']], $iaagents);
+            $interval_avgs[$iaagents['id_modulo']]['avg_interval'] = servers_get_avg_interval(
+                $interval_avgs[$iaagents['id_modulo']],
+                $iaagents
+            );
             $interval_avgs[$iaagents['id_modulo']]['modules'] += $iaagents['modules'];
         }
     }
 
+    $info_servers = array_reduce(
+        servers_get_info(),
+        function ($carry, $item) {
+            $carry[$item['server_type']] = $item;
+            return $carry;
+        }
+    );
     foreach ($interval_avgs as $id_modulo => $ia) {
+        $module_lag = 0;
         switch ($id_modulo) {
             case MODULE_DATA:
+                $module_lag = $info_servers[SERVER_TYPE_DATA]['module_lag'];
                 $data['avg_interval_local_modules'] = $ia['avg_interval'];
-                $data['local_modules_rate'] = servers_get_rate($data['avg_interval_local_modules'], $data['total_local_modules']);
+                $data['local_modules_rate'] = servers_get_rate(
+                    $data['avg_interval_local_modules'],
+                    ($data['total_local_modules'] - $module_lag)
+                );
             break;
 
             case MODULE_NETWORK:
+                $module_lag = $info_servers[SERVER_TYPE_NETWORK]['module_lag'];
+                $module_lag += $info_servers[SERVER_TYPE_SNMP]['module_lag'];
+                $module_lag += $info_servers[SERVER_TYPE_ENTERPRISE_ICMP]['module_lag'];
+                $module_lag += $info_servers[SERVER_TYPE_ENTERPRISE_SNMP]['module_lag'];
                 $data['avg_interval_network_modules'] = $ia['avg_interval'];
                 $data['network_modules_rate'] = servers_get_rate(
                     $data['avg_interval_network_modules'],
-                    $data['total_network_modules']
+                    ($data['total_network_modules'] - $module_lag)
                 );
             break;
 
             case MODULE_PLUGIN:
+                $module_lag = $info_servers[SERVER_TYPE_PLUGIN]['module_lag'];
                 $data['avg_interval_plugin_modules'] = $ia['avg_interval'];
-                $data['plugin_modules_rate'] = servers_get_rate($data['avg_interval_plugin_modules'], $data['total_plugin_modules']);
+                $data['plugin_modules_rate'] = servers_get_rate(
+                    $data['avg_interval_plugin_modules'],
+                    ($data['total_plugin_modules'] - $module_lag)
+                );
             break;
 
             case MODULE_PREDICTION:
+                $module_lag = $info_servers[SERVER_TYPE_PREDICTION]['module_lag'];
                 $data['avg_interval_prediction_modules'] = $ia['avg_interval'];
-                $data['prediction_modules_rate'] = servers_get_rate($data['avg_interval_prediction_modules'], $data['total_prediction_modules']);
+                $data['prediction_modules_rate'] = servers_get_rate(
+                    $data['avg_interval_prediction_modules'],
+                    ($data['total_prediction_modules'] - $module_lag)
+                );
             break;
 
             case MODULE_WMI:
+                $module_lag = $info_servers[SERVER_TYPE_WMI]['module_lag'];
                 $data['avg_interval_wmi_modules'] = $ia['avg_interval'];
-                $data['wmi_modules_rate'] = servers_get_rate($data['avg_interval_wmi_modules'], $data['total_wmi_modules']);
+                $data['wmi_modules_rate'] = servers_get_rate(
+                    $data['avg_interval_wmi_modules'],
+                    ($data['total_wmi_modules'] - $module_lag)
+                );
             break;
 
             case MODULE_WEB:
+                $module_lag = $info_servers[SERVER_TYPE_WEB]['module_lag'];
                 $data['avg_interval_web_modules'] = $ia['avg_interval'];
-                $data['web_modules_rate'] = servers_get_rate($data['avg_interval_web_modules'], $data['total_web_modules']);
+                $data['web_modules_rate'] = servers_get_rate(
+                    $data['avg_interval_web_modules'],
+                    ($data['total_web_modules'] - $module_lag)
+                );
+            break;
+
+            default:
+                // Not possible.
             break;
         }
 
@@ -385,25 +446,55 @@ function servers_get_performance()
         $data['avg_interval_total_modules'] = (array_sum($data['avg_interval_total_modules']) / count($data['avg_interval_total_modules']));
     }
 
-    $data['remote_modules_rate'] = servers_get_rate($data['avg_interval_remote_modules'], $data['total_remote_modules']);
-    $data['total_modules_rate'] = servers_get_rate($data['avg_interval_total_modules'], $data['total_modules']);
+    $total_modules_lag = 0;
+    foreach ($info_servers as $key => $value) {
+        switch ($key) {
+            case SERVER_TYPE_DATA:
+            case SERVER_TYPE_NETWORK:
+            case SERVER_TYPE_SNMP:
+            case SERVER_TYPE_ENTERPRISE_ICMP:
+            case SERVER_TYPE_ENTERPRISE_SNMP:
+            case SERVER_TYPE_PLUGIN:
+            case SERVER_TYPE_PREDICTION:
+            case SERVER_TYPE_WMI:
+            case SERVER_TYPE_WEB:
+                $total_modules_lag += $value['module_lag'];
+            break;
+
+            default:
+                // Not possible.
+            break;
+        }
+    }
+
+    $data['remote_modules_rate'] = servers_get_rate(
+        $data['avg_interval_remote_modules'],
+        $data['total_remote_modules']
+    );
+
+    $data['total_modules_rate'] = servers_get_rate(
+        $data['avg_interval_total_modules'],
+        ($data['total_modules'] - $total_modules_lag)
+    );
 
     return ($data);
 }
 
 
 /**
- * Get avg interval
+ * Get avg interval.
  *
- * @param mixed Array with avg and count data of first part
- * @param mixed Array with avg and count data of second part
+ * @param array $modules_avg_interval1 Array with avg and count
+ * data of first part.
+ * @param array $modules_avg_interval2 Array with avg and count
+ * data of second part.
  *
- * @return float number of avg modules between two parts
+ * @return float number of avg modules between two parts.
  */
-
-
-function servers_get_avg_interval($modules_avg_interval1, $modules_avg_interval2)
-{
+function servers_get_avg_interval(
+    $modules_avg_interval1,
+    $modules_avg_interval2
+) {
     $total_modules = ($modules_avg_interval1['modules'] + $modules_avg_interval2['modules']);
 
     $parcial1 = ($modules_avg_interval1['avg_interval'] * $modules_avg_interval1['modules']);
@@ -416,21 +507,23 @@ function servers_get_avg_interval($modules_avg_interval1, $modules_avg_interval2
 /**
  * Get server rate
  *
- * @param float avg of interval of these modules
- * @param int number of modules
+ * @param float   $avg_interval Avg of interval of these modules.
+ * @param integer $num_modules  Number of modules.
  *
  * @return float number of modules processed by second
  */
 function servers_get_rate($avg_interval, $num_modules)
 {
-    return $avg_interval > 0 ? ($num_modules / $avg_interval) : 0;
+    return ($avg_interval > 0) ? ($num_modules / $avg_interval) : 0;
 }
 
 
 /**
- * This function will get all the server information in an array or a specific server
+ * This function will get all the server information in an array
+ * or a specific server.
  *
- * @param mixed An optional integer or array of integers to select specific servers
+ * @param integer $id_server An optional integer or array of integers
+ * to select specific servers.
  *
  * @return mixed False in case the server doesn't exist or an array with info.
  */
@@ -461,127 +554,211 @@ function servers_get_info($id_server=-1)
     foreach ($result as $server) {
         switch ($server['server_type']) {
             case SERVER_TYPE_DATA:
-                $server['img'] = html_print_image('images/data.png', true, ['title' => __('Data server')]);
+                $server['img'] = html_print_image(
+                    'images/data.png',
+                    true,
+                    ['title' => __('Data server')]
+                );
                 $server['type'] = 'data';
                 $id_modulo = 1;
             break;
 
             case SERVER_TYPE_NETWORK:
-                $server['img'] = html_print_image('images/network.png', true, ['title' => __('Network server')]);
+                $server['img'] = html_print_image(
+                    'images/network.png',
+                    true,
+                    ['title' => __('Network server')]
+                );
                 $server['type'] = 'network';
                 $id_modulo = 2;
             break;
 
             case SERVER_TYPE_SNMP:
-                $server['img'] = html_print_image('images/snmp.png', true, ['title' => __('SNMP Trap server')]);
+                $server['img'] = html_print_image(
+                    'images/snmp.png',
+                    true,
+                    ['title' => __('SNMP Trap server')]
+                );
                 $server['type'] = 'snmp';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_DISCOVERY:
-                $server['img'] = html_print_image('images/recon.png', true, ['title' => __('Discovery server')]);
+                $server['img'] = html_print_image(
+                    'images/recon.png',
+                    true,
+                    ['title' => __('Discovery server')]
+                );
                 $server['type'] = 'recon';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_PLUGIN:
-                $server['img'] = html_print_image('images/plugin.png', true, ['title' => __('Plugin server')]);
+                $server['img'] = html_print_image(
+                    'images/plugin.png',
+                    true,
+                    ['title' => __('Plugin server')]
+                );
                 $server['type'] = 'plugin';
                 $id_modulo = 4;
             break;
 
             case SERVER_TYPE_PREDICTION:
-                $server['img'] = html_print_image('images/chart_bar.png', true, ['title' => __('Prediction server')]);
+                $server['img'] = html_print_image(
+                    'images/chart_bar.png',
+                    true,
+                    ['title' => __('Prediction server')]
+                );
                 $server['type'] = 'prediction';
                 $id_modulo = 5;
             break;
 
             case SERVER_TYPE_WMI:
-                $server['img'] = html_print_image('images/wmi.png', true, ['title' => __('WMI server')]);
+                $server['img'] = html_print_image(
+                    'images/wmi.png',
+                    true,
+                    ['title' => __('WMI server')]
+                );
                 $server['type'] = 'wmi';
                 $id_modulo = 6;
             break;
 
             case SERVER_TYPE_EXPORT:
-                $server['img'] = html_print_image('images/server_export.png', true, ['title' => __('Export server')]);
+                $server['img'] = html_print_image(
+                    'images/server_export.png',
+                    true,
+                    ['title' => __('Export server')]
+                );
                 $server['type'] = 'export';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_INVENTORY:
-                $server['img'] = html_print_image('images/page_white_text.png', true, ['title' => __('Inventory server')]);
+                $server['img'] = html_print_image(
+                    'images/page_white_text.png',
+                    true,
+                    ['title' => __('Inventory server')]
+                );
                 $server['type'] = 'inventory';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_WEB:
-                $server['img'] = html_print_image('images/world.png', true, ['title' => __('Web server')]);
+                $server['img'] = html_print_image(
+                    'images/world.png',
+                    true,
+                    ['title' => __('Web server')]
+                );
                 $server['type'] = 'web';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_EVENT:
-                $server['img'] = html_print_image('images/lightning_go.png', true, ['title' => __('Event server')]);
+                $server['img'] = html_print_image(
+                    'images/lightning_go.png',
+                    true,
+                    ['title' => __('Event server')]
+                );
                 $server['type'] = 'event';
                 $id_modulo = 2;
             break;
 
             case SERVER_TYPE_ENTERPRISE_ICMP:
-                $server['img'] = html_print_image('images/network.png', true, ['title' => __('Enterprise ICMP server')]);
+                $server['img'] = html_print_image(
+                    'images/network.png',
+                    true,
+                    ['title' => __('Enterprise ICMP server')]
+                );
                 $server['type'] = 'enterprise icmp';
                 $id_modulo = 2;
             break;
 
             case SERVER_TYPE_ENTERPRISE_SNMP:
-                $server['img'] = html_print_image('images/network.png', true, ['title' => __('Enterprise SNMP server')]);
+                $server['img'] = html_print_image(
+                    'images/network.png',
+                    true,
+                    ['title' => __('Enterprise SNMP server')]
+                );
                 $server['type'] = 'enterprise snmp';
                 $id_modulo = 2;
             break;
 
             case SERVER_TYPE_ENTERPRISE_SATELLITE:
-                $server['img'] = html_print_image('images/satellite.png', true, ['title' => __('Enterprise Satellite server')]);
+                $server['img'] = html_print_image(
+                    'images/satellite.png',
+                    true,
+                    ['title' => __('Enterprise Satellite server')]
+                );
                 $server['type'] = 'enterprise satellite';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_ENTERPRISE_TRANSACTIONAL:
-                $server['img'] = html_print_image('images/transactional_map.png', true, ['title' => __('Enterprise Transactional server')]);
+                $server['img'] = html_print_image(
+                    'images/transactional_map.png',
+                    true,
+                    ['title' => __('Enterprise Transactional server')]
+                );
                 $server['type'] = 'enterprise transactional';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_MAINFRAME:
-                $server['img'] = html_print_image('images/mainframe.png', true, ['title' => __('Mainframe server')]);
+                $server['img'] = html_print_image(
+                    'images/mainframe.png',
+                    true,
+                    ['title' => __('Mainframe server')]
+                );
                 $server['type'] = 'mainframe';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_SYNC:
-                $server['img'] = html_print_image('images/sync.png', true, ['title' => __('Sync server')]);
+                $server['img'] = html_print_image(
+                    'images/sync.png',
+                    true,
+                    ['title' => __('Sync server')]
+                );
                 $server['type'] = 'sync';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_WUX:
-                $server['img'] = html_print_image('images/icono-wux.png', true, ['title' => __('Wux server')]);
+                $server['img'] = html_print_image(
+                    'images/icono-wux.png',
+                    true,
+                    ['title' => __('Wux server')]
+                );
                 $server['type'] = 'wux';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_SYSLOG:
-                $server['img'] = html_print_image('images/syslog.png', true, ['title' => __('Syslog server')]);
+                $server['img'] = html_print_image(
+                    'images/syslog.png',
+                    true,
+                    ['title' => __('Log server')]
+                );
                 $server['type'] = 'syslog';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_AUTOPROVISION:
-                $server['img'] = html_print_image('images/autoprovision.png', true, ['title' => __('Autoprovision server')]);
+                $server['img'] = html_print_image(
+                    'images/autoprovision.png',
+                    true,
+                    ['title' => __('Autoprovision server')]
+                );
                 $server['type'] = 'autoprovision';
                 $id_modulo = 0;
             break;
 
             case SERVER_TYPE_MIGRATION:
-                $server['img'] = html_print_image('images/migration.png', true, ['title' => __('Migration server')]);
+                $server['img'] = html_print_image(
+                    'images/migration.png',
+                    true,
+                    ['title' => __('Migration server')]
+                );
                 $server['type'] = 'migration';
                 $id_modulo = 0;
             break;
@@ -594,31 +771,54 @@ function servers_get_info($id_server=-1)
         }
 
         if ($config['realtimestats'] == 0) {
-            // ---------------------------------------------------------------
-            // Take data from database if not realtime stats
-            // ---------------------------------------------------------------
-            $server['lag'] = db_get_sql('SELECT lag_time FROM tserver WHERE id_server = '.$server['id_server']);
-            $server['module_lag'] = db_get_sql('SELECT lag_modules FROM tserver WHERE id_server = '.$server['id_server']);
-            $server['modules'] = db_get_sql('SELECT my_modules FROM tserver WHERE id_server = '.$server['id_server']);
-            $server['modules_total'] = db_get_sql('SELECT total_modules_running FROM tserver WHERE id_server = '.$server['id_server']);
+            // Take data from database if not realtime stats.
+            $server['lag'] = db_get_sql(
+                'SELECT lag_time
+                FROM tserver
+                WHERE id_server = '.$server['id_server']
+            );
+            $server['module_lag'] = db_get_sql(
+                'SELECT lag_modules
+                FROM tserver
+                WHERE id_server = '.$server['id_server']
+            );
+            $server['modules'] = db_get_sql(
+                'SELECT my_modules
+                FROM tserver
+                WHERE id_server = '.$server['id_server']
+            );
+            $server['modules_total'] = db_get_sql(
+                'SELECT total_modules_running
+                FROM tserver
+                WHERE id_server = '.$server['id_server']
+            );
         } else {
-            // ---------------------------------------------------------------
-            // Take data in realtime
-            // ---------------------------------------------------------------
+            // Take data in realtime.
             $server['module_lag'] = 0;
             $server['lag'] = 0;
 
-            // Inventory server
+            // Inventory server.
             if ($server['server_type'] == SERVER_TYPE_INVENTORY) {
-                // Get modules exported by this server
-                $server['modules'] = db_get_sql("SELECT COUNT(tagent_module_inventory.id_agent_module_inventory) FROM tagente, tagent_module_inventory WHERE tagente.disabled=0 AND tagent_module_inventory.id_agente = tagente.id_agente AND tagente.server_name = '".$server['name']."'");
+                // Get modules exported by this server.
+                $server['modules'] = db_get_sql(
+                    "SELECT COUNT(tagent_module_inventory.id_agent_module_inventory)
+                    FROM tagente, tagent_module_inventory
+                    WHERE tagente.disabled=0
+                        AND tagent_module_inventory.id_agente = tagente.id_agente
+                        AND tagente.server_name = '".$server['name']."'"
+                );
 
-                // Get total exported modules
-                $server['modules_total'] = db_get_sql('SELECT COUNT(tagent_module_inventory.id_agent_module_inventory) FROM tagente, tagent_module_inventory WHERE tagente.disabled=0 AND tagent_module_inventory.id_agente = tagente.id_agente');
+                // Get total exported modules.
+                $server['modules_total'] = db_get_sql(
+                    'SELECT COUNT(tagent_module_inventory.id_agent_module_inventory)
+                    FROM tagente, tagent_module_inventory
+                    WHERE tagente.disabled=0
+                    AND tagent_module_inventory.id_agente = tagente.id_agente'
+                );
 
                 $interval_esc = db_escape_key_identifier('interval');
 
-                // Get the module lag
+                // Get the module lag.
                 $server['module_lag'] = db_get_sql(
                     'SELECT COUNT(tagent_module_inventory.id_agent_module_inventory) AS module_lag
 					FROM tagente, tagent_module_inventory
@@ -630,7 +830,7 @@ function servers_get_info($id_server=-1)
 					AND (UNIX_TIMESTAMP() - utimestamp) > tagent_module_inventory.'.$interval_esc
                 );
 
-                // Get the lag
+                // Get the lag.
                 $server['lag'] = db_get_sql(
                     'SELECT AVG(UNIX_TIMESTAMP() - utimestamp - tagent_module_inventory.'.$interval_esc.')
 					FROM tagente, tagent_module_inventory
@@ -641,162 +841,119 @@ function servers_get_info($id_server=-1)
 					AND (UNIX_TIMESTAMP() - utimestamp) < (tagent_module_inventory.".$interval_esc.' * 10)
 					AND (UNIX_TIMESTAMP() - utimestamp) > tagent_module_inventory.'.$interval_esc
                 );
-                // Export server
+                // Export server.
             } else if ($server['server_type'] == SERVER_TYPE_EXPORT) {
-                // Get modules exported by this server
-                $server['modules'] = db_get_sql('SELECT COUNT(tagente_modulo.id_agente_modulo) FROM tagente, tagente_modulo, tserver_export WHERE tagente.disabled=0 AND tagente_modulo.id_agente = tagente.id_agente AND tagente_modulo.id_export = tserver_export.id AND tserver_export.id_export_server = '.$server['id_server']);
+                // Get modules exported by this server.
+                $server['modules'] = db_get_sql(
+                    'SELECT COUNT(tagente_modulo.id_agente_modulo)
+                    FROM tagente, tagente_modulo, tserver_export
+                    WHERE tagente.disabled=0
+                        AND tagente_modulo.id_agente = tagente.id_agente
+                        AND tagente_modulo.id_export = tserver_export.id
+                        AND tserver_export.id_export_server = '.$server['id_server']
+                );
 
-                // Get total exported modules
-                $server['modules_total'] = db_get_sql('SELECT COUNT(tagente_modulo.id_agente_modulo) FROM tagente, tagente_modulo WHERE tagente.disabled=0 AND tagente_modulo.id_agente = tagente.id_agente AND tagente_modulo.id_export != 0');
+                // Get total exported modules.
+                $server['modules_total'] = db_get_sql(
+                    'SELECT COUNT(tagente_modulo.id_agente_modulo)
+                    FROM tagente, tagente_modulo
+                    WHERE tagente.disabled=0
+                        AND tagente_modulo.id_agente = tagente.id_agente
+                        AND tagente_modulo.id_export != 0'
+                );
 
                 $server['lag'] = 0;
                 $server['module_lag'] = 0;
-            }
-            // Discovery server
-            else if ($server['server_type'] == SERVER_TYPE_DISCOVERY) {
+            } else if ($server['server_type'] == SERVER_TYPE_DISCOVERY) {
+                // Discovery server.
                 $server['name'] = '<a href="index.php?sec=estado&amp;sec2=operation/servers/recon_view&amp;server_id='.$server['id_server'].'">'.$server['name'].'</a>';
 
-                // Total jobs running on this Discovery server
+                // Total jobs running on this Discovery server.
                 $server['modules'] = db_get_sql(
                     'SELECT COUNT(id_rt)
 					FROM trecon_task
 					WHERE id_recon_server = '.$server['id_server']
                 );
 
-                // Total recon jobs (all servers)
-                $server['modules_total'] = db_get_sql('SELECT COUNT(status) FROM trecon_task');
+                // Total recon jobs (all servers).
+                $server['modules_total'] = db_get_sql(
+                    'SELECT COUNT(status) FROM trecon_task'
+                );
 
-                // Lag (take average active time of all active tasks)
+                // Lag (take average active time of all active tasks).
                 $server['module_lag'] = 0;
-
-                switch ($config['dbtype']) {
-                    case 'mysql':
-                        $server['lag'] = db_get_sql('SELECT UNIX_TIMESTAMP() - utimestamp from trecon_task WHERE UNIX_TIMESTAMP()  > (utimestamp + interval_sweep) AND id_recon_server = '.$server['id_server']);
-
-                        $server['module_lag'] = db_get_sql('SELECT COUNT(id_rt) FROM trecon_task WHERE UNIX_TIMESTAMP()  > (utimestamp + interval_sweep) AND id_recon_server = '.$server['id_server']);
-                    break;
-
-                    case 'postgresql':
-                        $server['lag'] = db_get_sql("SELECT ceil(date_part('epoch', CURRENT_TIMESTAMP)) - utimestamp from trecon_task WHERE ceil(date_part('epoch', CURRENT_TIMESTAMP))  > (utimestamp + interval_sweep) AND id_recon_server = ".$server['id_server']);
-
-                        $server['module_lag'] = db_get_sql("SELECT COUNT(id_rt) FROM trecon_task WHERE ceil(date_part('epoch', CURRENT_TIMESTAMP))  > (utimestamp + interval_sweep) AND id_recon_server = ".$server['id_server']);
-                    break;
-
-                    case 'oracle':
-                        $server['lag'] = db_get_sql("SELECT ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.")) - utimestamp from trecon_task WHERE ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.'))  > (utimestamp + interval_sweep) AND id_recon_server = '.$server['id_server']);
-
-                        $server['module_lag'] = db_get_sql("SELECT COUNT(id_rt) FROM trecon_task WHERE ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.'))  > (utimestamp + interval_sweep) AND id_recon_server = '.$server['id_server']);
-                    break;
-                }
+                $server['lag'] = db_get_sql(
+                    'SELECT UNIX_TIMESTAMP() - utimestamp
+                    FROM trecon_task
+                    WHERE UNIX_TIMESTAMP()  > (utimestamp + interval_sweep)
+                    AND id_recon_server = '.$server['id_server']
+                );
+                $server['module_lag'] = db_get_sql(
+                    'SELECT COUNT(id_rt)
+                    FROM trecon_task
+                    WHERE UNIX_TIMESTAMP()  > (utimestamp + interval_sweep)
+                    AND id_recon_server = '.$server['id_server']
+                );
             } else {
-                // ---------------------------------------------------------------
-                // Data, Plugin, WMI, Network and Others
-                $server['modules'] = db_get_sql('SELECT count(tagente_estado.id_agente_modulo) FROM tagente_estado, tagente_modulo, tagente WHERE tagente.disabled=0 AND tagente_modulo.id_agente = tagente.id_agente AND tagente_modulo.disabled = 0 AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo AND tagente_estado.running_by = '.$server['id_server']);
+                // Data, Plugin, WMI, Network and Others.
+                $server['modules'] = db_get_sql(
+                    'SELECT count(tagente_estado.id_agente_modulo)
+                    FROM tagente_estado, tagente_modulo, tagente
+                    WHERE tagente.disabled=0
+                        AND tagente_modulo.id_agente = tagente.id_agente
+                        AND tagente_modulo.disabled = 0
+                        AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
+                        AND tagente_estado.running_by = '.$server['id_server']
+                );
 
-                $server['modules_total'] = db_get_sql('SELECT count(tagente_estado.id_agente_modulo) FROM tserver, tagente_estado, tagente_modulo, tagente WHERE tagente.disabled=0 AND tagente_modulo.id_agente = tagente.id_agente AND tagente_modulo.disabled = 0 AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo AND tagente_estado.running_by = tserver.id_server AND tserver.server_type = '.$server['server_type']);
+                $server['modules_total'] = db_get_sql(
+                    'SELECT count(tagente_estado.id_agente_modulo)
+                    FROM tserver, tagente_estado, tagente_modulo, tagente
+                    WHERE tagente.disabled=0
+                    AND tagente_modulo.id_agente = tagente.id_agente
+                    AND tagente_modulo.disabled = 0
+                    AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
+                    AND tagente_estado.running_by = tserver.id_server
+                    AND tserver.server_type = '.$server['server_type']
+                );
 
-                // Remote servers LAG Calculation (server_type != 0)
+                // Remote servers LAG Calculation (server_type != 0).
                 if ($server['server_type'] != 0) {
-                    switch ($config['dbtype']) {
-                        case 'mysql':
-                            $result = db_get_row_sql(
-                                'SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag, AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS lag FROM tagente_estado, tagente_modulo, tagente
-								WHERE utimestamp > 0
-								AND tagente.disabled = 0
-								AND tagente.id_agente = tagente_estado.id_agente
-								AND tagente_modulo.disabled = 0
-								AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
-								AND current_interval > 0
-								AND running_by = '.$server['id_server'].'
-								AND (UNIX_TIMESTAMP() - utimestamp) < ( current_interval * 10)
-								AND (UNIX_TIMESTAMP() - utimestamp) > current_interval'
-                            );
-                        break;
-
-                        case 'postgresql':
-                            $result = db_get_row_sql(
-                                "SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag, AVG(ceil(date_part('epoch', CURRENT_TIMESTAMP)) - utimestamp - current_interval) AS lag FROM tagente_estado, tagente_modulo, tagente
-								WHERE utimestamp > 0
-								AND tagente.disabled = 0
-								AND tagente.id_agente = tagente_estado.id_agente
-								AND tagente_modulo.disabled = 0
-								AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
-								AND current_interval > 0
-								AND running_by = ".$server['id_server']."
-								AND (ceil(date_part('epoch', CURRENT_TIMESTAMP)) - utimestamp) < ( current_interval * 10)
-								AND (ceil(date_part('epoch', CURRENT_TIMESTAMP)) - utimestamp) > current_interval"
-                            );
-                        break;
-
-                        case 'oracle':
-                            $result = db_get_row_sql(
-                                "SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag, AVG(ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - utimestamp - current_interval) AS lag FROM tagente_estado, tagente_modulo, tagente
-								WHERE utimestamp > 0
-								AND tagente.disabled = 0
-								AND tagente.id_agente = tagente_estado.id_agente
-								AND tagente_modulo.disabled = 0
-								AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
-								AND current_interval > 0
-								AND running_by = '.$server['id_server']."
-								AND (ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.")) - utimestamp) < ( current_interval * 10)
-								AND (ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) - utimestamp) * (".SECONDS_1DAY.')) > current_interval'
-                            );
-                        break;
-                    }
+                    $result = db_get_row_sql(
+                        'SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag,
+                            AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS lag
+                        FROM tagente_estado, tagente_modulo, tagente
+                        WHERE utimestamp > 0
+                            AND tagente.disabled = 0
+                            AND tagente.id_agente = tagente_estado.id_agente
+                            AND tagente_modulo.disabled = 0
+                            AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
+                            AND current_interval > 0
+                            AND running_by = '.$server['id_server'].'
+                            AND (UNIX_TIMESTAMP() - utimestamp) < ( current_interval * 10)
+                            AND (UNIX_TIMESTAMP() - utimestamp) > current_interval'
+                    );
                 } else {
-                    // Local/Dataserver server LAG calculation:
-                    switch ($config['dbtype']) {
-                        case 'mysql':
-                            $result = db_get_row_sql(
-                                'SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag, AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS lag FROM tagente_estado, tagente_modulo, tagente
-								WHERE utimestamp > 0
-								AND tagente.disabled = 0
-								AND tagente.id_agente = tagente_estado.id_agente
-								AND tagente_modulo.disabled = 0
-								AND tagente_modulo.id_tipo_modulo < 5
-								AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
-								AND current_interval > 0
-								AND (UNIX_TIMESTAMP() - utimestamp) < ( current_interval * 10)
-								AND running_by = '.$server['id_server'].'
-								AND (UNIX_TIMESTAMP() - utimestamp) > (current_interval * 1.1)'
-                            );
-                        break;
-
-                        case 'postgresql':
-                            $result = db_get_row_sql(
-                                "SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag, AVG(ceil(date_part('epoch', CURRENT_TIMESTAMP)) - utimestamp - current_interval) AS lag FROM tagente_estado, tagente_modulo, tagente
-								WHERE utimestamp > 0
-								AND tagente.disabled = 0
-								AND tagente.id_agente = tagente_estado.id_agente
-								AND tagente_modulo.disabled = 0
-								AND tagente_modulo.id_tipo_modulo < 5 
-								AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
-								AND current_interval > 0
-								AND (ceil(date_part('epoch', CURRENT_TIMESTAMP)) - utimestamp) < ( current_interval * 10)
-								AND running_by = ".$server['id_server']."
-								AND (ceil(date_part('epoch', CURRENT_TIMESTAMP)) - utimestamp) > (current_interval * 1.1)"
-                            );
-                        break;
-
-                        case 'oracle':
-                            $result = db_get_row_sql(
-                                "SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag, AVG(ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.")) - utimestamp - current_interval) AS lag FROM tagente_estado, tagente_modulo, tagente
-								WHERE utimestamp > 0
-								AND tagente.disabled = 0
-								AND tagente.id_agente = tagente_estado.id_agente
-								AND tagente_modulo.disabled = 0
-								AND tagente_modulo.id_tipo_modulo < 5 
-								AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
-								AND current_interval > 0
-								AND (ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - utimestamp) < ( current_interval * 10)
-								AND running_by = '.$server['id_server']."
-								AND (ceil((sysdate - to_date('19700101000000','YYYYMMDDHH24MISS')) * (".SECONDS_1DAY.')) - utimestamp) > (current_interval * 1.1)'
-                            );
-                        break;
-                    }
+                    // Local/Dataserver server LAG calculation.
+                    $result = db_get_row_sql(
+                        'SELECT COUNT(tagente_modulo.id_agente_modulo) AS module_lag,
+                            AVG(UNIX_TIMESTAMP() - utimestamp - current_interval) AS lag
+                        FROM tagente_estado, tagente_modulo, tagente
+                        WHERE utimestamp > 0
+                            AND tagente.disabled = 0
+                            AND tagente.id_agente = tagente_estado.id_agente
+                            AND tagente_modulo.disabled = 0
+                            AND tagente_modulo.id_tipo_modulo < 5
+                            AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
+                            AND current_interval > 0
+                            AND (UNIX_TIMESTAMP() - utimestamp) < ( current_interval * 10)
+                            AND running_by = '.$server['id_server'].'
+                            AND (UNIX_TIMESTAMP() - utimestamp) > (current_interval * 1.1)'
+                    );
                 }
 
-                // Lag over current_interval * 2 is not lag, it's a timed out module
+                // Lag over current_interval * 2 is not lag,
+                // it's a timed out module.
                 if (!empty($result['lag'])) {
                     $server['lag'] = $result['lag'];
                 }
@@ -805,28 +962,37 @@ function servers_get_info($id_server=-1)
                     $server['module_lag'] = $result['module_lag'];
                 }
             }
-        } //end if
+        }
 
         if (isset($server['module_lag'])) {
-            $server['lag_txt'] = ($server['lag'] == 0 ? '-' : human_time_description_raw($server['lag'])).' / '.$server['module_lag'];
+            $server['lag_txt'] = (($server['lag'] == 0) ? '-' : human_time_description_raw($server['lag'])).' / '.$server['module_lag'];
         } else {
             $server['lag_txt'] = '';
         }
 
         if ($server['modules_total'] > 0) {
-            $server['load'] = round(($server['modules'] / $server['modules_total'] * 100));
+            $server['load'] = round(
+                ($server['modules'] / $server['modules_total'] * 100)
+            );
         } else {
             $server['load'] = 0;
         }
 
-        // Push the raw data on the return stack
+        // Push the raw data on the return stack.
         $return[$server['id_server']] = $server;
-    } //end foreach
+    }
 
     return $return;
 }
 
 
+/**
+ * Get server type
+ *
+ * @param integer $type Type.
+ *
+ * @return array Result.
+ */
 function servers_get_servers_type($type)
 {
     return db_get_all_rows_filter('tserver', ['server_type' => $type]);
@@ -836,25 +1002,28 @@ function servers_get_servers_type($type)
 /**
  * Get the server name.
  *
- * @param int Server id.
+ * @param integer $id_server Server id.
  *
  * @return string Name of the given server
  */
 function servers_get_name($id_server)
 {
-    return (string) db_get_value('name', 'tserver', 'id_server', (int) $id_server);
+    return (string) db_get_value(
+        'name',
+        'tserver',
+        'id_server',
+        (int) $id_server
+    );
 }
 
 
 /**
- * Get the presence of .conf and .md5 into remote_config dir
+ * Get the presence of .conf and .md5 into remote_config dir.
  *
- * @param string Agent name
+ * @param string $server_name Agent name.
  *
- * @return true if files exist and are writable
+ * @return true If files exist and are writable.
  */
-
-
 function servers_check_remote_config($server_name)
 {
     global $config;
@@ -862,8 +1031,12 @@ function servers_check_remote_config($server_name)
     $server_md5 = md5($server_name, false);
 
     $filenames = [];
-    $filenames['md5'] = io_safe_output($config['remote_config']).'/md5/'.$server_md5.'.srv.md5';
-    $filenames['conf'] = io_safe_output($config['remote_config']).'/conf/'.$server_md5.'.srv.conf';
+    $filenames['md5'] = io_safe_output(
+        $config['remote_config']
+    ).'/md5/'.$server_md5.'.srv.md5';
+    $filenames['conf'] = io_safe_output(
+        $config['remote_config']
+    ).'/conf/'.$server_md5.'.srv.conf';
 
     if (! isset($filenames['conf'])) {
         return false;
@@ -881,14 +1054,15 @@ function servers_check_remote_config($server_name)
 
 
 /**
- * Return a string containing image tag for a given target id (server)
- * TODO: Make this print_servertype_icon and move to functions_ui.php. Make XHTML compatible. Make string translatable
+ * Return a string containing image tag for a given target id (server).
+ * TODO: Make this print_servertype_icon and move to functions_ui.php.
+ *      Make XHTML compatible. Make string translatable.
  *
- * @deprecated Use print_servertype_icon instead
+ * @param integer $id Server type id.
  *
- * @param int Server type id
+ * @deprecated Use print_servertype_icon instead.
  *
- * @return string Fully formatted IMG HTML tag with icon
+ * @return string Fully formatted IMG HTML tag with icon.
  */
 function servers_show_type($id)
 {
@@ -896,37 +1070,67 @@ function servers_show_type($id)
 
     switch ($id) {
         case 1:
-        return html_print_image('images/database.png', true, ['title' => get_product_name().' Data server']);
+            $return = html_print_image(
+                'images/database.png',
+                true,
+                ['title' => get_product_name().' Data server']
+            );
+        break;
 
-            break;
         case 2:
-        return html_print_image('images/network.png', true, ['title' => get_product_name().' Network server']);
+            $return = html_print_image(
+                'images/network.png',
+                true,
+                ['title' => get_product_name().' Network server']
+            );
+        break;
 
-            break;
         case 4:
-        return html_print_image('images/plugin.png', true, ['title' => get_product_name().' Plugin server']);
+            $return = html_print_image(
+                'images/plugin.png',
+                true,
+                ['title' => get_product_name().' Plugin server']
+            );
+        break;
 
-            break;
         case 5:
-        return html_print_image('images/chart_bar.png', true, ['title' => get_product_name().' Prediction server']);
+            $return = html_print_image(
+                'images/chart_bar.png',
+                true,
+                ['title' => get_product_name().' Prediction server']
+            );
+        break;
 
-            break;
         case 6:
-        return html_print_image('images/wmi.png', true, ['title' => get_product_name().' WMI server']);
+            $return = html_print_image(
+                'images/wmi.png',
+                true,
+                ['title' => get_product_name().' WMI server']
+            );
+        break;
 
-            break;
         case 7:
-        return html_print_image('images/server_web.png', true, ['title' => get_product_name().' WEB server']);
+            $return = html_print_image(
+                'images/server_web.png',
+                true,
+                ['title' => get_product_name().' WEB server']
+            );
+        break;
 
-            break;
         case 8:
-        return html_print_image('images/module-wux.png', true, ['title' => get_product_name().' WUX server']);
+            $return = html_print_image(
+                'images/module-wux.png',
+                true,
+                ['title' => get_product_name().' WUX server']
+            );
+        break;
 
-            break;
         default:
-        return '--';
-            break;
+            $return = '--';
+        break;
     }
+
+    return $return;
 }
 
 
@@ -941,28 +1145,10 @@ function servers_check_status()
 {
     global $config;
 
-    switch ($config['dbtype']) {
-        case 'mysql':
-            $sql = 'SELECT COUNT(id_server)
-				FROM tserver
-				WHERE status = 1
-					AND keepalive > NOW() - INTERVAL server_keepalive*2 SECOND';
-        break;
-
-        case 'postgresql':
-            $sql = "SELECT COUNT(id_server)
-				FROM tserver
-				WHERE status = 1
-					AND keepalive > NOW() - INTERVAL 'server_keepalive*2 SECOND'";
-        break;
-
-        case 'oracle':
-            $sql = "SELECT COUNT(id_server)
-				FROM tserver
-				WHERE status = 1
-					AND keepalive > systimestamp - INTERVAL 'server_keepalive*2' SECOND";
-        break;
-    }
+    $sql = 'SELECT COUNT(id_server)
+        FROM tserver
+        WHERE status = 1
+            AND keepalive > NOW() - INTERVAL server_keepalive*2 SECOND';
 
     $status = (int) db_get_sql($sql);
     // Cast as int will assure a number value
@@ -972,10 +1158,9 @@ function servers_check_status()
 
 
 /**
- * @deprecated use servers_get_info instead
  * Get statistical information for a given server
  *
- * @param int Server id to get status.
+ * @param integer $id_server Server id to get status.
  *
  * @return array Server info array
  */
@@ -1036,7 +1221,7 @@ function servers_get_server_string_name(int $server)
         return __('Discovery server');
 
         case SERVER_TYPE_SYSLOG:
-        return __('Syslog server');
+        return __('Log server');
 
         case SERVER_TYPE_WUX:
         return __('WUX server');
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 0050ccdf9d..008c05b8d7 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -48,15 +48,16 @@ if (isset($config['homedir'])) {
  */
 function ui_bbcode_to_html($text, $allowed_tags=['[url]'])
 {
-    $return = $text;
-
     if (array_search('[url]', $allowed_tags) !== false) {
-        $return = preg_replace(
-            '/\[url=([^\]]*)\]/',
-            '<a target="_blank" rel="noopener noreferrer" href="$1">',
-            $return
-        );
-        $return = str_replace('[/url]', '</a>', $return);
+        // If link hasn't http, add it.
+        if (preg_match('/https?:\/\//', $text)) {
+            $html_bbcode = '<a target="_blank" rel="noopener noreferrer" href="$1">$2</a>';
+        } else {
+            $html_bbcode = '<a target="_blank" rel="noopener noreferrer" href="http://$1">$2</a>';
+        }
+
+        // Replace bbcode format [url=www.example.org] String [/url] with or without http and slashes
+        $return = preg_replace('/\[url(?|](((?:https?:\/\/)?[^[]+))|(?:=[\'"]?((?:https?:\/\/)?[^]]+?)[\'"]?)](.+?))\[\/url]/', $html_bbcode, $text);
     }
 
     return $return;
@@ -1487,7 +1488,7 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
     $filename = $path.$name.'.js';
 
     if ($echo_tag) {
-        echo '<script type="text/javascript" src="'.ui_get_full_url(false, false, false, false).$filename.'"></script>';
+        echo '<script type="text/javascript" src="'.ui_get_full_url($filename, false, false, false).'"></script>';
         return null;
     }
 
@@ -1504,7 +1505,7 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
         return false;
     }
 
-    if (defined('METACONSOLE')) {
+    if (is_metaconsole()) {
         $config['js'][$name] = '../../'.$filename;
     } else {
         $config['js'][$name] = $filename;
@@ -1794,7 +1795,7 @@ function ui_process_page_head($string, $bitfield)
 
         array_push($loaded, $name);
 
-        $url_css = ui_get_full_url($filename);
+        $url_css = ui_get_full_url($filename, false, false, false);
         $output .= '<link rel="stylesheet" href="'.$url_css.'" type="text/css" />'."\n\t";
     }
 
@@ -1851,7 +1852,7 @@ function ui_process_page_head($string, $bitfield)
 
         array_push($loaded, $name);
 
-        $url_js = ui_get_full_url($filename);
+        $url_js = ui_get_full_url($filename, false, false, false);
         $output .= '<script type="text/javascript" src="'.$url_js.'"></script>'."\n\t";
     }
 
@@ -1892,7 +1893,7 @@ function ui_process_page_head($string, $bitfield)
 
         array_push($loaded, $name);
 
-        $url_js = ui_get_full_url($filename);
+        $url_js = ui_get_full_url($filename, false, false, false);
         $output .= '<script type="text/javascript" src="'.$url_js.'"></script>'."\n\t";
     }
 
@@ -2055,7 +2056,7 @@ function ui_pagination(
     $actual_page = floor($offset / $pagination);
     $ini_page = (floor($actual_page / $block_limit) * $block_limit);
     $end_page = ($ini_page + $block_limit - 1);
-    if ($end_page > $number_of_pages) {
+    if ($end_page >= $number_of_pages) {
         $end_page = ($number_of_pages - 1);
     }
 
@@ -2841,7 +2842,7 @@ function ui_progress(
                 width_interval = '.$ajax['interval'].';
                 if (last % 10 == 0) {
                     $.post({
-                        url: "'.ui_get_full_url('ajax.php').'",
+                        url: "'.ui_get_full_url('ajax.php', false, false, false).'",
                         data: {';
         if (is_array($ajax['data'])) {
             foreach ($ajax['data'] as $token => $value) {
@@ -3094,38 +3095,7 @@ function ui_print_datatable(array $parameters)
         $filter .= '<ul class="datatable_filter content">';
 
         foreach ($parameters['form']['inputs'] as $input) {
-            $filter .= '<li>';
-            $filter .= '<label>'.$input['label'].'</label>';
-            if ($input['type'] != 'select') {
-                $filter .= '<input type="'.$input['type'].'" ';
-                $filter .= ' style="'.$input['style'].'" ';
-                $filter .= ' class="'.$input['class'].'" ';
-                $filter .= ' value="'.$input['value'].'" ';
-                $filter .= ' name="'.$input['name'].'" id="'.$input['id'].'" />';
-            } else {
-                // Select.
-                $filter .= '<select class="'.$input['class'].'"';
-                $filter .= ' style="'.$input['style'].'" ';
-                $filter .= ' name="'.$input['name'].'" ';
-                $filter .= 'id="'.$input['id'].'">';
-
-                foreach ($input['options'] as $key => $opt) {
-                    if (is_array($opt)) {
-                        $filter .= '<option value="'.$opt['value'].'"';
-                        if ($opt['selected']) {
-                            $filter .= ' selected="yes" >';
-                        }
-
-                        $filter .= __($opt['text']).'</option>';
-                    } else {
-                        $filter .= '<option value="'.$key.'">'.$opt.'</option>';
-                    }
-                }
-
-                $filter .= '</select>';
-            }
-
-            $filter .= '</li>';
+            $filter .= html_print_input(($input + ['return' => true]), 'li');
         }
 
         $filter .= '<li>';
@@ -3247,7 +3217,7 @@ function ui_print_datatable(array $parameters)
             ],
             lengthMenu: '.json_encode($pagination_options).',
             ajax: {
-                url: "'.ui_get_full_url('ajax.php').'",
+                url: "'.ui_get_full_url('ajax.php', false, false, false).'",
                 type: "POST",
                 dataSrc: function (json) {
                     if (json.error) {
@@ -3723,13 +3693,31 @@ function ui_get_url_refresh($params=false, $relative=true, $add_post=true)
     $url = htmlspecialchars($url);
 
     if (! $relative) {
-        return ui_get_full_url($url);
+        return ui_get_full_url($url, false, false, false);
     }
 
     return $url;
 }
 
 
+/**
+ * Checks if public_url usage is being forced to target 'visitor'.
+ *
+ * @return boolean
+ */
+function ui_forced_public_url()
+{
+    global $config;
+    $exclusions = preg_split("/[\n\s,]+/", io_safe_output($config['public_url_exclusions']));
+
+    if (in_array($_SERVER['REMOTE_ADDR'], $exclusions)) {
+        return false;
+    }
+
+    return (bool) $config['force_public_url'];
+}
+
+
 /**
  * Returns a full URL in Pandora. (with the port and https in some systems)
  *
@@ -3776,13 +3764,27 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
     }
 
     if (!$no_proxy) {
-        // Check if the PandoraFMS runs across the proxy like as
-        // mod_proxy of Apache
-        // and check if public_url is set.
-        if (!empty($config['public_url'])
+        // Check proxy.
+        $proxy = false;
+        if (ui_forced_public_url()) {
+            $proxy = true;
+            $fullurl = $config['public_url'];
+            if (substr($fullurl, -1) != '/') {
+                $fullurl .= '/';
+            }
+
+            if ($url == 'index.php' && is_metaconsole()) {
+                $fullurl .= ENTERPRISE_DIR.'/meta';
+            }
+        } else if (!empty($config['public_url'])
             && (!empty($_SERVER['HTTP_X_FORWARDED_HOST']))
         ) {
+            // Forced to use public url when being forwarder by a reverse proxy.
             $fullurl = $config['public_url'];
+            if (substr($fullurl, -1) != '/') {
+                $fullurl .= '/';
+            }
+
             $proxy = true;
         } else {
             $fullurl = $protocol.'://'.$_SERVER['SERVER_NAME'];
@@ -3813,7 +3815,7 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
             $url = $config['homeurl_static'].'/';
         }
 
-        if (defined('METACONSOLE') && $metaconsole_root) {
+        if (is_metaconsole() && $metaconsole_root) {
             $url .= 'enterprise/meta/';
         }
     } else if (!strstr($url, '.php')) {
@@ -3823,7 +3825,7 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
             $fullurl .= $config['homeurl_static'].'/';
         }
 
-        if (defined('METACONSOLE') && $metaconsole_root) {
+        if (is_metaconsole() && $metaconsole_root) {
             $fullurl .= 'enterprise/meta/';
         }
     } else {
@@ -3835,7 +3837,7 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
             } else {
                 $fullurl .= $config['homeurl_static'].'/';
 
-                if (defined('METACONSOLE') && $metaconsole_root) {
+                if (is_metaconsole() && $metaconsole_root) {
                     $fullurl .= 'enterprise/meta/';
                 }
             }
@@ -4443,6 +4445,10 @@ function ui_print_agent_autocomplete_input($parameters)
         $get_only_string_modules = true;
     }
 
+    if (isset($parameters['no_disabled_modules'])) {
+        $no_disabled_modules = $parameters['no_disabled_modules'];
+    }
+
     $spinner_image = html_print_image('images/spinner.gif', true, false, true);
     if (isset($parameters['spinner_image'])) {
         $spinner_image = $parameters['spinner_image'];
@@ -4450,7 +4456,7 @@ function ui_print_agent_autocomplete_input($parameters)
 
     // Javascript configurations
     // ------------------------------------------------------------------.
-    $javascript_ajax_page = ui_get_full_url('ajax.php', false, false, false, false);
+    $javascript_ajax_page = ui_get_full_url('ajax.php', false, false, false);
     // Default value.
     if (isset($parameters['javascript_ajax_page'])) {
         $javascript_ajax_page = $parameters['javascript_ajax_page'];
@@ -4590,7 +4596,11 @@ function ui_print_agent_autocomplete_input($parameters)
 			if ('.((int) $get_only_string_modules).') {
 				inputs.push ("get_only_string_modules=1");
 			}
-			
+
+            if ('.((int) $no_disabled_modules).') {
+                inputs.push ("disabled=0");
+            }
+
 			if ('.((int) $metaconsole_enabled).') {
 				if (('.((int) $use_input_server).')
 						|| ('.((int) $print_input_server).')) {
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index d461ca9754..97d97c7273 100755
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -617,16 +617,21 @@ function users_save_login()
 
     $user_list = json_decode($user_list_json, true);
     if (empty($user_list)) {
-        $user_list = [];
-    }
-
-    if (isset($user_list[$config['id_user']])) {
-        $user_list[$config['id_user']]['count']++;
-    } else {
         $user_list[$config['id_user']] = [
             'name'  => $user['fullname'],
             'count' => 1,
         ];
+    } else if (isset($user_list[$config['id_user']])) {
+        $user_list[$config['id_user']] = [
+            'name'  => $user['fullname'],
+            'count' => $user_list[$config['id_user']]['count'],
+        ];
+    } else {
+        $users_count = count($user_list);
+        $user_list[$config['id_user']] = [
+            'name'  => $user['fullname'],
+            'count' => ++$users_count,
+        ];
     }
 
     // Clean the file
@@ -704,17 +709,7 @@ function users_save_logout($user=false, $delete=false)
         $user_list = [];
     }
 
-    if ($delete) {
-        unset($user_list[$user['id_user']]);
-    } else {
-        if (isset($user_list[$config['id_user']])) {
-            $user_list[$config['id_user']]['count']--;
-        }
-
-        if ($user_list[$config['id_user']]['count'] <= 0) {
-            unset($user_list[$user['id_user']]);
-        }
-    }
+    unset($user_list[$user['id_user']]);
 
     // Clean the file
     ftruncate($fp_user_list, 0);
@@ -1052,6 +1047,13 @@ function users_check_users()
         'users'   => '',
     ];
 
+    $users_with_session = db_get_all_rows_sql('SELECT tsessions_php.data FROM pandora.tsessions_php;');
+    $users_logged_now = [];
+    foreach ($users_with_session as $user_with_session) {
+        $tmp_id_user = explode('"', $user_with_session['data']);
+        array_push($users_logged_now, $tmp_id_user[1]);
+    }
+
     $file_global_user_list = $config['attachment_store'].'/pandora_chat.user_list.json.txt';
 
     // First lock the file
@@ -1082,13 +1084,32 @@ function users_check_users()
         $user_list = [];
     }
 
-    fclose($fp_user_list);
-
+    // Compare both user list. Meanwhile the user from chat file have an active
+    // session, his continue in the list of active chat users
     $user_name_list = [];
-    foreach ($user_list as $user) {
-        $user_name_list[] = $user['name'];
+    foreach ($user_list as $key => $user) {
+        if (in_array($key, $users_logged_now)) {
+            array_push($user_name_list, $user['name']);
+        } else {
+            unset($user_list[$key]);
+        }
     }
 
+    // Clean the file
+    ftruncate($fp_user_list, 0);
+
+    // Update the file with the correct list of users
+    $status = fwrite($fp_user_list, json_encode($user_list));
+
+    /*
+        if ($status === false) {
+        fclose($fp_user_list);
+
+        return;
+    } */
+    // Closing the resource
+    fclose($fp_user_list);
+
     $return['correct'] = true;
     $return['users'] = implode('<br />', $user_name_list);
     echo json_encode($return);
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index ee97467430..1c6afb9eed 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -3611,11 +3611,6 @@ function visual_map_print_visual_map(
 
     global $config;
 
-    $metaconsole_hack = '/';
-    if (defined('METACONSOLE')) {
-        $metaconsole_hack = '../../';
-    }
-
     enterprise_include_once('meta/include/functions_ui_meta.php');
 
     include_once $config['homedir'].'/include/functions_custom_graphs.php';
@@ -3681,11 +3676,11 @@ function visual_map_print_visual_map(
         $mapHeight = $layout['height'];
         $backgroundImage = '';
         if ($layout['background'] != 'None.png') {
-            $backgroundImage = $metaconsole_hack.'images/console/background/'.$layout['background'];
+            $backgroundImage = 'images/console/background/'.$layout['background'];
         }
     }
 
-    if (defined('METACONSOLE')) {
+    if (is_metaconsole()) {
         echo "<div style='width: 100%; overflow:auto; margin: 0 auto; padding:5px;'>";
     }
 
@@ -3698,7 +3693,7 @@ function visual_map_print_visual_map(
                 background-color:'.$layout['background_color'].';">';
 
     if ($layout['background'] != 'None.png') {
-        echo "<img src='".ui_get_full_url($backgroundImage)."' width='100%' height='100%' />";
+        echo "<img src='".ui_get_full_url($backgroundImage, false, false, false)."' width='100%' height='100%' />";
     }
 
     $layout_datas = db_get_all_rows_field_filter(
@@ -3776,7 +3771,7 @@ function visual_map_print_visual_map(
     // End main div
     echo '</div></div>';
 
-    if (defined('METACONSOLE')) {
+    if (is_metaconsole()) {
         echo '</div>';
     }
 }
@@ -4271,7 +4266,7 @@ function visual_map_create_internal_name_item($label=null, $type, $image, $agent
 
             case 'static_graph':
             case STATIC_GRAPH:
-                $text = __('Static graph').' - '.$image;
+                $text = __('Static Image').' - '.$image;
             break;
 
             case 'simple_value':
diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php
index 7e7cffeca4..0e678c6111 100755
--- a/pandora_console/include/functions_visual_map_editor.php
+++ b/pandora_console/include/functions_visual_map_editor.php
@@ -1294,7 +1294,7 @@ function visual_map_editor_print_toolbox()
     }
 
     echo '<div id="toolbox">';
-        visual_map_print_button_editor('static_graph', __('Static Graph'), 'left', false, 'camera_min', true);
+        visual_map_print_button_editor('static_graph', __('Static Image'), 'left', false, 'camera_min', true);
         visual_map_print_button_editor('percentile_item', __('Percentile Item'), 'left', false, 'percentile_item_min', true);
         visual_map_print_button_editor('module_graph', __('Module Graph'), 'left', false, 'graph_min', true);
         visual_map_print_button_editor('donut_graph', __('Serialized pie graph'), 'left', false, 'donut_graph_min', true);
diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 9fabfeef64..d8012c15dd 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -21,6 +21,7 @@ if (empty($config['homedir'])) {
 }
 
 require_once $config['homedir'].'/include/functions.php';
+require_once $config['homedir'].'/include/graphs/functions_flot.php';
 
 $ttl = get_parameter('ttl', 1);
 $graph_type = get_parameter('graph_type', '');
diff --git a/pandora_console/include/graphs/flot/jquery.flot.pie.js b/pandora_console/include/graphs/flot/jquery.flot.pie.js
index 9c19db998b..37a8135e08 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.pie.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.pie.js
@@ -56,765 +56,897 @@ More detail and specific examples can be found in the included HTML file.
 */
 
 (function($) {
+  // Maximum redraw attempts when fitting labels within the plot
 
-	// Maximum redraw attempts when fitting labels within the plot
+  var REDRAW_ATTEMPTS = 10;
 
-	var REDRAW_ATTEMPTS = 10;
+  // Factor by which to shrink the pie when fitting labels within the plot
 
-	// Factor by which to shrink the pie when fitting labels within the plot
+  var REDRAW_SHRINK = 0.95;
 
-	var REDRAW_SHRINK = 0.95;
+  function init(plot) {
+    var canvas = null,
+      target = null,
+      options = null,
+      maxRadius = null,
+      centerLeft = null,
+      centerTop = null,
+      processed = false,
+      ctx = null;
 
-	function init(plot) {
+    // interactive variables
 
-		var canvas = null,
-			target = null,
-			options = null,
-			maxRadius = null,
-			centerLeft = null,
-			centerTop = null,
-			processed = false,
-			ctx = null;
+    var highlights = [];
 
-		// interactive variables
+    // add hook to determine if pie plugin in enabled, and then perform necessary operations
 
-		var highlights = [];
+    plot.hooks.processOptions.push(function(plot, options) {
+      if (options.series.pie.show) {
+        options.grid.show = false;
 
-		// add hook to determine if pie plugin in enabled, and then perform necessary operations
+        // set labels.show
 
-		plot.hooks.processOptions.push(function(plot, options) {
-			if (options.series.pie.show) {
+        if (options.series.pie.label.show == "auto") {
+          if (options.legend.show) {
+            options.series.pie.label.show = false;
+          } else {
+            options.series.pie.label.show = true;
+          }
+        }
 
-				options.grid.show = false;
+        // set radius
 
-				// set labels.show
+        if (options.series.pie.radius == "auto") {
+          if (options.series.pie.label.show) {
+            options.series.pie.radius = 3 / 4;
+          } else {
+            options.series.pie.radius = 1;
+          }
+        }
 
-				if (options.series.pie.label.show == "auto") {
-					if (options.legend.show) {
-						options.series.pie.label.show = false;
-					} else {
-						options.series.pie.label.show = true;
-					}
-				}
+        // ensure sane tilt
 
-				// set radius
+        if (options.series.pie.tilt > 1) {
+          options.series.pie.tilt = 1;
+        } else if (options.series.pie.tilt < 0) {
+          options.series.pie.tilt = 0;
+        }
+      }
+    });
 
-				if (options.series.pie.radius == "auto") {
-					if (options.series.pie.label.show) {
-						options.series.pie.radius = 3/4;
-					} else {
-						options.series.pie.radius = 1;
-					}
-				}
+    plot.hooks.bindEvents.push(function(plot, eventHolder) {
+      var options = plot.getOptions();
+      if (options.series.pie.show) {
+        if (options.grid.hoverable) {
+          eventHolder.unbind("mousemove").mousemove(onMouseMove);
+        }
+        if (options.grid.clickable) {
+          eventHolder.unbind("click").click(onClick);
+        }
+      }
+    });
 
-				// ensure sane tilt
+    plot.hooks.processDatapoints.push(function(plot, series, data, datapoints) {
+      var options = plot.getOptions();
+      if (options.series.pie.show) {
+        processDatapoints(plot, series, data, datapoints);
+      }
+    });
 
-				if (options.series.pie.tilt > 1) {
-					options.series.pie.tilt = 1;
-				} else if (options.series.pie.tilt < 0) {
-					options.series.pie.tilt = 0;
-				}
-			}
-		});
+    plot.hooks.drawOverlay.push(function(plot, octx) {
+      var options = plot.getOptions();
+      if (options.series.pie.show) {
+        drawOverlay(plot, octx);
+      }
+    });
 
-		plot.hooks.bindEvents.push(function(plot, eventHolder) {
-			var options = plot.getOptions();
-			if (options.series.pie.show) {
-				if (options.grid.hoverable) {
-					eventHolder.unbind("mousemove").mousemove(onMouseMove);
-				}
-				if (options.grid.clickable) {
-					eventHolder.unbind("click").click(onClick);
-				}
-			}
-		});
+    plot.hooks.draw.push(function(plot, newCtx) {
+      var options = plot.getOptions();
+      if (options.series.pie.show) {
+        draw(plot, newCtx);
+      }
+    });
 
-		plot.hooks.processDatapoints.push(function(plot, series, data, datapoints) {
-			var options = plot.getOptions();
-			if (options.series.pie.show) {
-				processDatapoints(plot, series, data, datapoints);
-			}
-		});
+    function processDatapoints(plot) {
+      if (!processed) {
+        processed = true;
+        canvas = plot.getCanvas();
+        target = $(canvas).parent();
+        options = plot.getOptions();
+        plot.setData(combine(plot.getData()));
+      }
+    }
 
-		plot.hooks.drawOverlay.push(function(plot, octx) {
-			var options = plot.getOptions();
-			if (options.series.pie.show) {
-				drawOverlay(plot, octx);
-			}
-		});
+    function combine(data) {
+      var total = 0,
+        combined = 0,
+        numCombined = 0,
+        color = options.series.pie.combine.color,
+        newdata = [];
 
-		plot.hooks.draw.push(function(plot, newCtx) {
-			var options = plot.getOptions();
-			if (options.series.pie.show) {
-				draw(plot, newCtx);
-			}
-		});
+      // Fix up the raw data from Flot, ensuring the data is numeric
 
-		function processDatapoints(plot, series, datapoints) {
-			if (!processed)	{
-				processed = true;
-				canvas = plot.getCanvas();
-				target = $(canvas).parent();
-				options = plot.getOptions();
-				plot.setData(combine(plot.getData()));
-			}
-		}
+      for (var i = 0; i < data.length; ++i) {
+        var value = data[i].data;
 
-		function combine(data) {
+        // If the data is an array, we'll assume that it's a standard
+        // Flot x-y pair, and are concerned only with the second value.
 
-			var total = 0,
-				combined = 0,
-				numCombined = 0,
-				color = options.series.pie.combine.color,
-				newdata = [];
+        // Note how we use the original array, rather than creating a
+        // new one; this is more efficient and preserves any extra data
+        // that the user may have stored in higher indexes.
 
-			// Fix up the raw data from Flot, ensuring the data is numeric
+        if ($.isArray(value) && value.length == 1) {
+          value = value[0];
+        }
 
-			for (var i = 0; i < data.length; ++i) {
+        if ($.isArray(value)) {
+          // Equivalent to $.isNumeric() but compatible with jQuery < 1.7
+          if (!isNaN(parseFloat(value[1])) && isFinite(value[1])) {
+            value[1] = +value[1];
+          } else {
+            value[1] = 0;
+          }
+        } else if (!isNaN(parseFloat(value)) && isFinite(value)) {
+          value = [1, +value];
+        } else {
+          value = [1, 0];
+        }
 
-				var value = data[i].data;
+        data[i].data = [value];
+      }
 
-				// If the data is an array, we'll assume that it's a standard
-				// Flot x-y pair, and are concerned only with the second value.
+      // Sum up all the slices, so we can calculate percentages for each
 
-				// Note how we use the original array, rather than creating a
-				// new one; this is more efficient and preserves any extra data
-				// that the user may have stored in higher indexes.
+      for (var i = 0; i < data.length; ++i) {
+        total += data[i].data[0][1];
+      }
 
-				if ($.isArray(value) && value.length == 1) {
-    				value = value[0];
-				}
+      // Count the number of slices with percentages below the combine
+      // threshold; if it turns out to be just one, we won't combine.
 
-				if ($.isArray(value)) {
-					// Equivalent to $.isNumeric() but compatible with jQuery < 1.7
-					if (!isNaN(parseFloat(value[1])) && isFinite(value[1])) {
-						value[1] = +value[1];
-					} else {
-						value[1] = 0;
-					}
-				} else if (!isNaN(parseFloat(value)) && isFinite(value)) {
-					value = [1, +value];
-				} else {
-					value = [1, 0];
-				}
+      for (var i = 0; i < data.length; ++i) {
+        var value = data[i].data[0][1];
+        if (value / total <= options.series.pie.combine.threshold) {
+          combined += value;
+          numCombined++;
+          if (!color) {
+            color = data[i].color;
+          }
+        }
+      }
 
-				data[i].data = [value];
-			}
-
-			// Sum up all the slices, so we can calculate percentages for each
-
-			for (var i = 0; i < data.length; ++i) {
-				total += data[i].data[0][1];
-			}
-
-			// Count the number of slices with percentages below the combine
-			// threshold; if it turns out to be just one, we won't combine.
-
-			for (var i = 0; i < data.length; ++i) {
-				var value = data[i].data[0][1];
-				if (value / total <= options.series.pie.combine.threshold) {
-					combined += value;
-					numCombined++;
-					if (!color) {
-						color = data[i].color;
-					}
-				}
-			}
-
-			for (var i = 0; i < data.length; ++i) {
-				var value = data[i].data[0][1];
-				if (numCombined < 2 || value / total > options.series.pie.combine.threshold) {
-					newdata.push(
-						$.extend(data[i], {     /* extend to allow keeping all other original data values
+      for (var i = 0; i < data.length; ++i) {
+        var value = data[i].data[0][1];
+        if (
+          numCombined < 2 ||
+          value / total > options.series.pie.combine.threshold
+        ) {
+          newdata.push(
+            $.extend(data[i], {
+              /* extend to allow keeping all other original data values
 						                           and using them e.g. in labelFormatter. */
-							data: [[1, value]],
-							color: data[i].color,
-							label: data[i].label,
-							angle: value * Math.PI * 2 / total,
-							percent: value / (total / 100)
-						})
-					);
-				}
-			}
-
-			if (numCombined > 1) {
-				newdata.push({
-					data: [[1, combined]],
-					color: color,
-					label: options.series.pie.combine.label,
-					angle: combined * Math.PI * 2 / total,
-					percent: combined / (total / 100)
-				});
-			}
-
-			return newdata;
-		}
-
-		function draw(plot, newCtx) {
-
-			if (!target) {
-				return; // if no series were passed
-			}
-
-			var canvasWidth = plot.getPlaceholder().width(),
-				canvasHeight = plot.getPlaceholder().height(),
-				legendWidth = target.children().filter(".legend").children().width() || 0;
-
-			ctx = newCtx;
-
-			// WARNING: HACK! REWRITE THIS CODE AS SOON AS POSSIBLE!
-
-			// When combining smaller slices into an 'other' slice, we need to
-			// add a new series.  Since Flot gives plugins no way to modify the
-			// list of series, the pie plugin uses a hack where the first call
-			// to processDatapoints results in a call to setData with the new
-			// list of series, then subsequent processDatapoints do nothing.
-
-			// The plugin-global 'processed' flag is used to control this hack;
-			// it starts out false, and is set to true after the first call to
-			// processDatapoints.
-
-			// Unfortunately this turns future setData calls into no-ops; they
-			// call processDatapoints, the flag is true, and nothing happens.
-
-			// To fix this we'll set the flag back to false here in draw, when
-			// all series have been processed, so the next sequence of calls to
-			// processDatapoints once again starts out with a slice-combine.
-			// This is really a hack; in 0.9 we need to give plugins a proper
-			// way to modify series before any processing begins.
-
-			processed = false;
-
-			// calculate maximum radius and center point
-
-			maxRadius =  Math.min(canvasWidth, canvasHeight / options.series.pie.tilt) / 2;
-			centerTop = canvasHeight / 2 + options.series.pie.offset.top;
-			centerLeft = canvasWidth / 2;
-
-			if (options.series.pie.offset.left == "auto") {
-				if (options.legend.position.match("w")) {
-					centerLeft += legendWidth / 2;
-				} else {
-					centerLeft -= legendWidth / 2;
-				}
-				if (centerLeft < maxRadius) {
-					centerLeft = maxRadius;
-				} else if (centerLeft > canvasWidth - maxRadius) {
-					centerLeft = canvasWidth - maxRadius;
-				}
-			} else {
-				centerLeft += options.series.pie.offset.left;
-			}
-
-			var slices = plot.getData(),
-				attempts = 0;
-
-			// Keep shrinking the pie's radius until drawPie returns true,
-			// indicating that all the labels fit, or we try too many times.
-
-			do {
-				if (attempts > 0) {
-					maxRadius *= REDRAW_SHRINK;
-				}
-				attempts += 1;
-				clear();
-				if (options.series.pie.tilt <= 0.8) {
-					drawShadow();
-				}
-			} while (!drawPie() && attempts < REDRAW_ATTEMPTS)
-
-			if (attempts >= REDRAW_ATTEMPTS) {
-				clear();
-				target.prepend("<div class='error'>Could not draw pie with labels contained inside canvas</div>");
-			}
-
-			if (plot.setSeries && plot.insertLegend) {
-				plot.setSeries(slices);
-				plot.insertLegend();
-			}
-
-			// we're actually done at this point, just defining internal functions at this point
-
-			function clear() {
-				ctx.clearRect(0, 0, canvasWidth, canvasHeight);
-				target.children().filter(".pieLabel, .pieLabelBackground").remove();
-			}
-
-			function drawShadow() {
-
-				var shadowLeft = options.series.pie.shadow.left;
-				var shadowTop = options.series.pie.shadow.top;
-				var edge = 10;
-				var alpha = options.series.pie.shadow.alpha;
-				var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
-				if (radius >= canvasWidth / 2 - shadowLeft || radius * options.series.pie.tilt >= canvasHeight / 2 - shadowTop || radius <= edge) {
-					return;	// shadow would be outside canvas, so don't draw it
-				}
-
-				ctx.save();
-				ctx.translate(shadowLeft,shadowTop);
-				ctx.globalAlpha = alpha;
-				ctx.fillStyle = "#000";
-
-				// center and rotate to starting position
-
-				ctx.translate(centerLeft,centerTop);
-				ctx.scale(1, options.series.pie.tilt);
-
-				//radius -= edge;
-
-				for (var i = 1; i <= edge; i++) {
-					ctx.beginPath();
-					ctx.arc(0, 0, radius, 0, Math.PI * 2, false);
-					ctx.fill();
-					radius -= i;
-				}
-
-				ctx.restore();
-			}
-
-			function drawPie() {
-
-				var startAngle = Math.PI * options.series.pie.startAngle;
-				var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
-				// center and rotate to starting position
-
-				ctx.save();
-				ctx.translate(centerLeft,centerTop);
-				ctx.scale(1, options.series.pie.tilt);
-				//ctx.rotate(startAngle); // start at top; -- This doesn't work properly in Opera
-
-				// draw slices
-
-				ctx.save();
-				var currentAngle = startAngle;
-				for (var i = 0; i < slices.length; ++i) {
-					slices[i].startAngle = currentAngle;
-					drawSlice(slices[i].angle, slices[i].color, true);
-				}
-				ctx.restore();
-
-				// draw slice outlines
-
-				if (options.series.pie.stroke.width > 0) {
-					ctx.save();
-					ctx.lineWidth = options.series.pie.stroke.width;
-					currentAngle = startAngle;
-					for (var i = 0; i < slices.length; ++i) {
-						drawSlice(slices[i].angle, options.series.pie.stroke.color, false);
-					}
-					ctx.restore();
-				}
-
-				// draw donut hole
-
-				drawDonutHole(ctx);
-
-				ctx.restore();
-
-				// Draw the labels, returning true if they fit within the plot
-
-				if (options.series.pie.label.show) {
-					return drawLabels();
-				} else return true;
-
-				function drawSlice(angle, color, fill) {
-
-					if (angle <= 0 || isNaN(angle)) {
-						return;
-					}
-
-					if (fill) {
-						ctx.fillStyle = color;
-					} else {
-						ctx.strokeStyle = color;
-						ctx.lineJoin = "round";
-					}
-
-					ctx.beginPath();
-					if (Math.abs(angle - Math.PI * 2) > 0.000000001) {
-						ctx.moveTo(0, 0); // Center of the pie
-					}
-
-					//ctx.arc(0, 0, radius, 0, angle, false); // This doesn't work properly in Opera
-					ctx.arc(0, 0, radius,currentAngle, currentAngle + angle / 2, false);
-					ctx.arc(0, 0, radius,currentAngle + angle / 2, currentAngle + angle, false);
-					ctx.closePath();
-					//ctx.rotate(angle); // This doesn't work properly in Opera
-					currentAngle += angle;
-
-					if (fill) {
-						ctx.fill();
-					} else {
-						ctx.stroke();
-					}
-				}
-
-				function drawLabels() {
-
-					var currentAngle = startAngle;
-					var radius = options.series.pie.label.radius > 1 ? options.series.pie.label.radius : maxRadius * options.series.pie.label.radius;
-
-					for (var i = 0; i < slices.length; ++i) {
-						if (slices[i].percent >= options.series.pie.label.threshold * 100) {
-							if (!drawLabel(slices[i], currentAngle, i)) {
-								return false;
-							}
-						}
-						currentAngle += slices[i].angle;
-					}
-
-					return true;
-
-					function drawLabel(slice, startAngle, index) {
-
-						if (slice.data[0][1] == 0) {
-							return true;
-						}
-
-						// format label text
-
-						var lf = options.legend.labelFormatter, text, plf = options.series.pie.label.formatter;
-
-						if (lf) {
-							text = lf(slice.label, slice);
-						} else {
-							text = slice.label;
-						}
-
-						if (plf) {
-							text = plf(text, slice);
-						}
-
-						var halfAngle = ((startAngle + slice.angle) + startAngle) / 2;
-						var x = centerLeft + Math.round(Math.cos(halfAngle) * radius);
-						var y = centerTop + Math.round(Math.sin(halfAngle) * radius) * options.series.pie.tilt;
-
-						var html = "<span class='pieLabel' id='pieLabel" + index + "' style='position:absolute;top:" + y + "px;left:" + x + "px;'>" + text + "</span>";
-						target.append(html);
-
-						var label = target.children("#pieLabel" + index);
-						var labelTop = (y - label.height() / 2);
-						var labelLeft = (x - label.width() / 2);
-
-						label.css("top", labelTop);
-						label.css("left", labelLeft);
-
-						// check to make sure that the label is not outside the canvas
-
-						if (0 - labelTop > 0 || 0 - labelLeft > 0 || canvasHeight - (labelTop + label.height()) < 0 || canvasWidth - (labelLeft + label.width()) < 0) {
-							return false;
-						}
-
-						if (options.series.pie.label.background.opacity != 0) {
-
-							// put in the transparent background separately to avoid blended labels and label boxes
-
-							var c = options.series.pie.label.background.color;
-
-							if (c == null) {
-								c = slice.color;
-							}
-
-							var pos = "top:" + labelTop + "px;left:" + labelLeft + "px;";
-							$("<div class='pieLabelBackground' style='position:absolute;width:" + label.width() + "px;height:" + label.height() + "px;" + pos + "background-color:" + c + ";'></div>")
-								.css("opacity", options.series.pie.label.background.opacity)
-								.insertBefore(label);
-						}
-
-						return true;
-					} // end individual label function
-				} // end drawLabels function
-			} // end drawPie function
-		} // end draw function
-
-		// Placed here because it needs to be accessed from multiple locations
-
-		function drawDonutHole(layer) {
-			if (options.series.pie.innerRadius > 0) {
-
-				// subtract the center
-
-				layer.save();
-				var innerRadius = options.series.pie.innerRadius > 1 ? options.series.pie.innerRadius : maxRadius * options.series.pie.innerRadius;
-				layer.globalCompositeOperation = "destination-out"; // this does not work with excanvas, but it will fall back to using the stroke color
-				layer.beginPath();
-				layer.fillStyle = options.series.pie.stroke.color;
-				layer.arc(0, 0, innerRadius, 0, Math.PI * 2, false);
-				layer.fill();
-				layer.closePath();
-				layer.restore();
-
-				// add inner stroke
-
-				layer.save();
-				layer.beginPath();
-				layer.strokeStyle = options.series.pie.stroke.color;
-				layer.arc(0, 0, innerRadius, 0, Math.PI * 2, false);
-				layer.stroke();
-				layer.closePath();
-				layer.restore();
-
-				// TODO: add extra shadow inside hole (with a mask) if the pie is tilted.
-			}
-		}
-
-		//-- Additional Interactive related functions --
-
-		function isPointInPoly(poly, pt) {
-			for(var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
-				((poly[i][1] <= pt[1] && pt[1] < poly[j][1]) || (poly[j][1] <= pt[1] && pt[1]< poly[i][1]))
-				&& (pt[0] < (poly[j][0] - poly[i][0]) * (pt[1] - poly[i][1]) / (poly[j][1] - poly[i][1]) + poly[i][0])
-				&& (c = !c);
-			return c;
-		}
-
-		function findNearbySlice(mouseX, mouseY) {
-
-			var slices = plot.getData(),
-				options = plot.getOptions(),
-				radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius,
-				x, y;
-
-			for (var i = 0; i < slices.length; ++i) {
-
-				var s = slices[i];
-
-				if (s.pie.show) {
-
-					ctx.save();
-					ctx.beginPath();
-					ctx.moveTo(0, 0); // Center of the pie
-					//ctx.scale(1, options.series.pie.tilt);	// this actually seems to break everything when here.
-					ctx.arc(0, 0, radius, s.startAngle, s.startAngle + s.angle / 2, false);
-					ctx.arc(0, 0, radius, s.startAngle + s.angle / 2, s.startAngle + s.angle, false);
-					ctx.closePath();
-					x = mouseX - centerLeft;
-					y = mouseY - centerTop;
-
-					if (ctx.isPointInPath) {
-						if (ctx.isPointInPath(mouseX - centerLeft, mouseY - centerTop)) {
-							ctx.restore();
-							return {
-								datapoint: [s.percent, s.data],
-								dataIndex: 0,
-								series: s,
-								seriesIndex: i
-							};
-						}
-					} else {
-
-						// excanvas for IE doesn;t support isPointInPath, this is a workaround.
-
-						var p1X = radius * Math.cos(s.startAngle),
-							p1Y = radius * Math.sin(s.startAngle),
-							p2X = radius * Math.cos(s.startAngle + s.angle / 4),
-							p2Y = radius * Math.sin(s.startAngle + s.angle / 4),
-							p3X = radius * Math.cos(s.startAngle + s.angle / 2),
-							p3Y = radius * Math.sin(s.startAngle + s.angle / 2),
-							p4X = radius * Math.cos(s.startAngle + s.angle / 1.5),
-							p4Y = radius * Math.sin(s.startAngle + s.angle / 1.5),
-							p5X = radius * Math.cos(s.startAngle + s.angle),
-							p5Y = radius * Math.sin(s.startAngle + s.angle),
-							arrPoly = [[0, 0], [p1X, p1Y], [p2X, p2Y], [p3X, p3Y], [p4X, p4Y], [p5X, p5Y]],
-							arrPoint = [x, y];
-
-						// TODO: perhaps do some mathmatical trickery here with the Y-coordinate to compensate for pie tilt?
-
-						if (isPointInPoly(arrPoly, arrPoint)) {
-							ctx.restore();
-							return {
-								datapoint: [s.percent, s.data],
-								dataIndex: 0,
-								series: s,
-								seriesIndex: i
-							};
-						}
-					}
-
-					ctx.restore();
-				}
-			}
-
-			return null;
-		}
-
-		function onMouseMove(e) {
-			triggerClickHoverEvent("plothover", e);
-		}
-
-		function onClick(e) {
-			triggerClickHoverEvent("plotclick", e);
-		}
-
-		// trigger click or hover event (they send the same parameters so we share their code)
-
-		function triggerClickHoverEvent(eventname, e) {
-
-			var offset = plot.offset();
-			var canvasX = parseInt(e.pageX - offset.left);
-			var canvasY =  parseInt(e.pageY - offset.top);
-			var item = findNearbySlice(canvasX, canvasY);
-
-			if (options.grid.autoHighlight) {
-
-				// clear auto-highlights
-
-				for (var i = 0; i < highlights.length; ++i) {
-					var h = highlights[i];
-					if (h.auto == eventname && !(item && h.series == item.series)) {
-						unhighlight(h.series);
-					}
-				}
-			}
-
-			// highlight the slice
-
-			if (item) {
-				highlight(item.series, eventname);
-			}
-
-			// trigger any hover bind events
-
-			var pos = { pageX: e.pageX, pageY: e.pageY };
-			target.trigger(eventname, [pos, item]);
-		}
-
-		function highlight(s, auto) {
-			//if (typeof s == "number") {
-			//	s = series[s];
-			//}
-
-			var i = indexOfHighlight(s);
-
-			if (i == -1) {
-				highlights.push({ series: s, auto: auto });
-				plot.triggerRedrawOverlay();
-			} else if (!auto) {
-				highlights[i].auto = false;
-			}
-		}
-
-		function unhighlight(s) {
-			if (s == null) {
-				highlights = [];
-				plot.triggerRedrawOverlay();
-			}
-
-			//if (typeof s == "number") {
-			//	s = series[s];
-			//}
-
-			var i = indexOfHighlight(s);
-
-			if (i != -1) {
-				highlights.splice(i, 1);
-				plot.triggerRedrawOverlay();
-			}
-		}
-
-		function indexOfHighlight(s) {
-			for (var i = 0; i < highlights.length; ++i) {
-				var h = highlights[i];
-				if (h.series == s)
-					return i;
-			}
-			return -1;
-		}
-
-		function drawOverlay(plot, octx) {
-
-			var options = plot.getOptions();
-
-			var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
-			octx.save();
-			octx.translate(centerLeft, centerTop);
-			octx.scale(1, options.series.pie.tilt);
-
-			for (var i = 0; i < highlights.length; ++i) {
-				drawHighlight(highlights[i].series);
-			}
-
-			drawDonutHole(octx);
-
-			octx.restore();
-
-			function drawHighlight(series) {
-
-				if (series.angle <= 0 || isNaN(series.angle)) {
-					return;
-				}
-
-				//octx.fillStyle = parseColor(options.series.pie.highlight.color).scale(null, null, null, options.series.pie.highlight.opacity).toString();
-				octx.fillStyle = "rgba(255, 255, 255, " + options.series.pie.highlight.opacity + ")"; // this is temporary until we have access to parseColor
-				octx.beginPath();
-				if (Math.abs(series.angle - Math.PI * 2) > 0.000000001) {
-					octx.moveTo(0, 0); // Center of the pie
-				}
-				octx.arc(0, 0, radius, series.startAngle, series.startAngle + series.angle / 2, false);
-				octx.arc(0, 0, radius, series.startAngle + series.angle / 2, series.startAngle + series.angle, false);
-				octx.closePath();
-				octx.fill();
-			}
-		}
-	} // end init (plugin body)
-
-	// define pie specific options and their default values
-
-	var options = {
-		series: {
-			pie: {
-				show: false,
-				radius: "auto",	// actual radius of the visible pie (based on full calculated radius if <=1, or hard pixel value)
-				innerRadius: 0, /* for donut */
-				startAngle: 3/2,
-				tilt: 1,
-				shadow: {
-					left: 5,	// shadow left offset
-					top: 15,	// shadow top offset
-					alpha: 0.02	// shadow alpha
-				},
-				offset: {
-					top: 0,
-					left: "auto"
-				},
-				stroke: {
-					color: "#fff",
-					width: 1
-				},
-				label: {
-					show: "auto",
-					formatter: function(label, slice) {
-						return "<div style='font-size:x-small;text-align:center;padding:2px;color:" + slice.color + ";'>" + label + "<br/>" + Math.round(slice.percent) + "%</div>";
-					},	// formatter function
-					radius: 1,	// radius at which to place the labels (based on full calculated radius if <=1, or hard pixel value)
-					background: {
-						color: null,
-						opacity: 0
-					},
-					threshold: 0	// percentage at which to hide the label (i.e. the slice is too narrow)
-				},
-				combine: {
-					threshold: -1,	// percentage at which to combine little slices into one larger slice
-					color: null,	// color to give the new slice (auto-generated if null)
-					label: "Other"	// label to give the new slice
-				},
-				highlight: {
-					//color: "#fff",		// will add this functionality once parseColor is available
-					opacity: 0.5
-				}
-			}
-		}
-	};
-
-	$.plot.plugins.push({
-		init: init,
-		options: options,
-		name: "pie",
-		version: "1.1"
-	});
-
+              data: [[1, value]],
+              color: data[i].color,
+              label: data[i].label,
+              angle: (value * Math.PI * 2) / total,
+              percent: value / (total / 100)
+            })
+          );
+        }
+      }
+
+      if (numCombined > 1) {
+        newdata.push({
+          data: [[1, combined]],
+          color: color,
+          label: options.series.pie.combine.label,
+          angle: (combined * Math.PI * 2) / total,
+          percent: combined / (total / 100)
+        });
+      }
+
+      return newdata;
+    }
+
+    function draw(plot, newCtx) {
+      if (!target) {
+        return; // if no series were passed
+      }
+
+      var canvasWidth = plot.getPlaceholder().width(),
+        canvasHeight = plot.getPlaceholder().height(),
+        legendWidth =
+          target
+            .children()
+            .filter(".legend")
+            .children()
+            .width() || 0;
+
+      ctx = newCtx;
+
+      // WARNING: HACK! REWRITE THIS CODE AS SOON AS POSSIBLE!
+
+      // When combining smaller slices into an 'other' slice, we need to
+      // add a new series.  Since Flot gives plugins no way to modify the
+      // list of series, the pie plugin uses a hack where the first call
+      // to processDatapoints results in a call to setData with the new
+      // list of series, then subsequent processDatapoints do nothing.
+
+      // The plugin-global 'processed' flag is used to control this hack;
+      // it starts out false, and is set to true after the first call to
+      // processDatapoints.
+
+      // Unfortunately this turns future setData calls into no-ops; they
+      // call processDatapoints, the flag is true, and nothing happens.
+
+      // To fix this we'll set the flag back to false here in draw, when
+      // all series have been processed, so the next sequence of calls to
+      // processDatapoints once again starts out with a slice-combine.
+      // This is really a hack; in 0.9 we need to give plugins a proper
+      // way to modify series before any processing begins.
+
+      processed = false;
+
+      // calculate maximum radius and center point
+
+      maxRadius =
+        Math.min(canvasWidth, canvasHeight / options.series.pie.tilt) / 2;
+      centerTop = canvasHeight / 2 + options.series.pie.offset.top;
+      centerLeft = canvasWidth / 2;
+
+      if (options.series.pie.offset.left == "auto") {
+        if (options.legend.position.match("w")) {
+          centerLeft += legendWidth / 2;
+        } else {
+          centerLeft -= legendWidth / 2;
+        }
+        if (centerLeft < maxRadius) {
+          centerLeft = maxRadius;
+        } else if (centerLeft > canvasWidth - maxRadius) {
+          centerLeft = canvasWidth - maxRadius;
+        }
+      } else {
+        centerLeft += options.series.pie.offset.left;
+      }
+
+      var slices = plot.getData(),
+        attempts = 0;
+
+      // Keep shrinking the pie's radius until drawPie returns true,
+      // indicating that all the labels fit, or we try too many times.
+
+      do {
+        if (attempts > 0) {
+          maxRadius *= REDRAW_SHRINK;
+        }
+        attempts += 1;
+        clear();
+        if (options.series.pie.tilt <= 0.8) {
+          drawShadow();
+        }
+      } while (!drawPie() && attempts < REDRAW_ATTEMPTS);
+
+      if (attempts >= REDRAW_ATTEMPTS) {
+        clear();
+        target.prepend(
+          "<div class='error'>Could not draw pie with labels contained inside canvas</div>"
+        );
+      }
+
+      if (plot.setSeries && plot.insertLegend) {
+        plot.setSeries(slices);
+        plot.insertLegend();
+      }
+
+      // we're actually done at this point, just defining internal functions at this point
+
+      function clear() {
+        ctx.clearRect(0, 0, canvasWidth, canvasHeight);
+        target
+          .children()
+          .filter(".pieLabel, .pieLabelBackground")
+          .remove();
+      }
+
+      function drawShadow() {
+        var shadowLeft = options.series.pie.shadow.left;
+        var shadowTop = options.series.pie.shadow.top;
+        var edge = 10;
+        var alpha = options.series.pie.shadow.alpha;
+        var radius =
+          options.series.pie.radius > 1
+            ? options.series.pie.radius
+            : maxRadius * options.series.pie.radius;
+
+        if (
+          radius >= canvasWidth / 2 - shadowLeft ||
+          radius * options.series.pie.tilt >= canvasHeight / 2 - shadowTop ||
+          radius <= edge
+        ) {
+          return; // shadow would be outside canvas, so don't draw it
+        }
+
+        ctx.save();
+        ctx.translate(shadowLeft, shadowTop);
+        ctx.globalAlpha = alpha;
+        ctx.fillStyle = "#000";
+
+        // center and rotate to starting position
+
+        ctx.translate(centerLeft, centerTop);
+        ctx.scale(1, options.series.pie.tilt);
+
+        //radius -= edge;
+
+        for (var i = 1; i <= edge; i++) {
+          ctx.beginPath();
+          ctx.arc(0, 0, radius, 0, Math.PI * 2, false);
+          ctx.fill();
+          radius -= i;
+        }
+
+        ctx.restore();
+      }
+
+      function drawPie() {
+        var startAngle = Math.PI * options.series.pie.startAngle;
+        var radius =
+          options.series.pie.radius > 1
+            ? options.series.pie.radius
+            : maxRadius * options.series.pie.radius;
+
+        // center and rotate to starting position
+
+        ctx.save();
+        ctx.translate(centerLeft, centerTop);
+        ctx.scale(1, options.series.pie.tilt);
+        //ctx.rotate(startAngle); // start at top; -- This doesn't work properly in Opera
+
+        // draw slices
+
+        ctx.save();
+        var currentAngle = startAngle;
+        for (var i = 0; i < slices.length; ++i) {
+          slices[i].startAngle = currentAngle;
+          drawSlice(slices[i].angle, slices[i].color, true);
+        }
+        ctx.restore();
+
+        // draw slice outlines
+
+        if (options.series.pie.stroke.width > 0) {
+          ctx.save();
+          ctx.lineWidth = options.series.pie.stroke.width;
+          currentAngle = startAngle;
+          for (var i = 0; i < slices.length; ++i) {
+            drawSlice(slices[i].angle, options.series.pie.stroke.color, false);
+          }
+          ctx.restore();
+        }
+
+        // draw donut hole
+
+        drawDonutHole(ctx);
+
+        ctx.restore();
+
+        // Draw the labels, returning true if they fit within the plot
+
+        if (options.series.pie.label.show) {
+          return drawLabels();
+        } else return true;
+
+        function drawSlice(angle, color, fill) {
+          if (angle <= 0 || isNaN(angle)) {
+            return;
+          }
+
+          if (fill) {
+            ctx.fillStyle = color;
+          } else {
+            ctx.strokeStyle = color;
+            ctx.lineJoin = "round";
+          }
+
+          ctx.beginPath();
+          if (Math.abs(angle - Math.PI * 2) > 0.000000001) {
+            ctx.moveTo(0, 0); // Center of the pie
+          }
+
+          //ctx.arc(0, 0, radius, 0, angle, false); // This doesn't work properly in Opera
+          ctx.arc(0, 0, radius, currentAngle, currentAngle + angle / 2, false);
+          ctx.arc(
+            0,
+            0,
+            radius,
+            currentAngle + angle / 2,
+            currentAngle + angle,
+            false
+          );
+          ctx.closePath();
+          //ctx.rotate(angle); // This doesn't work properly in Opera
+          currentAngle += angle;
+
+          if (fill) {
+            ctx.fill();
+          } else {
+            ctx.stroke();
+          }
+        }
+
+        function drawLabels() {
+          var labels = [];
+          var currentAngle = startAngle;
+          var radius =
+            options.series.pie.label.radius > 1
+              ? options.series.pie.label.radius
+              : maxRadius * options.series.pie.label.radius;
+
+          for (var i = 0; i < slices.length; ++i) {
+            if (slices[i].percent >= options.series.pie.label.threshold * 100) {
+              if (!drawLabel(slices[i], currentAngle, i)) {
+                return false;
+              }
+            }
+            currentAngle += slices[i].angle;
+          }
+
+          return true;
+
+          function drawLabel(slice, startAngle, index) {
+            if (slice.data[0][1] == 0) {
+              return true;
+            }
+
+            // format label text
+
+            var lf = options.legend.labelFormatter,
+              text,
+              plf = options.series.pie.label.formatter;
+
+            if (lf) {
+              text = lf(slice.label, slice);
+            } else {
+              text = slice.label;
+            }
+
+            if (plf) {
+              text = plf(text, slice);
+            }
+
+            var halfAngle = (startAngle + slice.angle + startAngle) / 2;
+            var x = centerLeft + Math.round(Math.cos(halfAngle) * radius);
+            var y =
+              centerTop +
+              Math.round(Math.sin(halfAngle) * radius) *
+                options.series.pie.tilt;
+
+            var html =
+              "<span class='pieLabel' id='pieLabel" +
+              index +
+              "' style='position:absolute;top:" +
+              y +
+              "px;left:" +
+              x +
+              "px;'>" +
+              text +
+              "</span>";
+            target.append(html);
+
+            var label = target.children("#pieLabel" + index);
+            var labelTop = y - label.height() / 2;
+            var labelLeft = x - label.width() / 2;
+
+            label.css("top", labelTop);
+            label.css("left", labelLeft);
+
+            // check to make sure that the label doesn't overlap one of the other labels
+            var label_pos = getPositions(label);
+            for (var j = 0; j < labels.length; j++) {
+              var tmpPos = getPositions(labels[j]);
+              var horizontalMatch = comparePositions(label_pos[0], tmpPos[0]);
+              var verticalMatch = comparePositions(label_pos[1], tmpPos[1]);
+              var match = horizontalMatch && verticalMatch;
+              if (match) {
+                var newTop = tmpPos[1][0] - (label.height() + 1);
+                label.css("top", newTop);
+                labelTop = newTop;
+              }
+            }
+
+            function getPositions(box) {
+              var $box = $(box);
+              var pos = $box.position();
+              var width = $box.width();
+              var height = $box.height();
+              return [
+                [pos.left, pos.left + width],
+                [pos.top, pos.top + height]
+              ];
+            }
+
+            function comparePositions(p1, p2) {
+              var x1 = p1[0] < p2[0] ? p1 : p2;
+              var x2 = p1[0] < p2[0] ? p2 : p1;
+              return x1[1] > x2[0] || x1[0] === x2[0] ? true : false;
+            }
+            labels.push(label);
+
+            // check to make sure that the label is not outside the canvas
+
+            if (
+              0 - labelTop > 0 ||
+              0 - labelLeft > 0 ||
+              canvasHeight - (labelTop + label.height()) < 0 ||
+              canvasWidth - (labelLeft + label.width()) < 0
+            ) {
+              return false;
+            }
+
+            if (options.series.pie.label.background.opacity != 0) {
+              // put in the transparent background separately to avoid blended labels and label boxes
+
+              var c = options.series.pie.label.background.color;
+
+              if (c == null) {
+                c = slice.color;
+              }
+
+              var pos = "top:" + labelTop + "px;left:" + labelLeft + "px;";
+              $(
+                "<div class='pieLabelBackground' style='position:absolute;width:" +
+                  label.width() +
+                  "px;height:" +
+                  label.height() +
+                  "px;" +
+                  pos +
+                  "background-color:" +
+                  c +
+                  ";'></div>"
+              )
+                .css("opacity", options.series.pie.label.background.opacity)
+                .insertBefore(label);
+            }
+
+            return true;
+          } // end individual label function
+        } // end drawLabels function
+      } // end drawPie function
+    } // end draw function
+
+    // Placed here because it needs to be accessed from multiple locations
+
+    function drawDonutHole(layer) {
+      if (options.series.pie.innerRadius > 0) {
+        // subtract the center
+
+        layer.save();
+        var innerRadius =
+          options.series.pie.innerRadius > 1
+            ? options.series.pie.innerRadius
+            : maxRadius * options.series.pie.innerRadius;
+        layer.globalCompositeOperation = "destination-out"; // this does not work with excanvas, but it will fall back to using the stroke color
+        layer.beginPath();
+        layer.fillStyle = options.series.pie.stroke.color;
+        layer.arc(0, 0, innerRadius, 0, Math.PI * 2, false);
+        layer.fill();
+        layer.closePath();
+        layer.restore();
+
+        // add inner stroke
+
+        layer.save();
+        layer.beginPath();
+        layer.strokeStyle = options.series.pie.stroke.color;
+        layer.arc(0, 0, innerRadius, 0, Math.PI * 2, false);
+        layer.stroke();
+        layer.closePath();
+        layer.restore();
+
+        // TODO: add extra shadow inside hole (with a mask) if the pie is tilted.
+      }
+    }
+
+    //-- Additional Interactive related functions --
+
+    function isPointInPoly(poly, pt) {
+      for (var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
+        ((poly[i][1] <= pt[1] && pt[1] < poly[j][1]) ||
+          (poly[j][1] <= pt[1] && pt[1] < poly[i][1])) &&
+          pt[0] <
+            ((poly[j][0] - poly[i][0]) * (pt[1] - poly[i][1])) /
+              (poly[j][1] - poly[i][1]) +
+              poly[i][0] &&
+          (c = !c);
+      return c;
+    }
+
+    function findNearbySlice(mouseX, mouseY) {
+      var slices = plot.getData(),
+        options = plot.getOptions(),
+        radius =
+          options.series.pie.radius > 1
+            ? options.series.pie.radius
+            : maxRadius * options.series.pie.radius,
+        x,
+        y;
+
+      for (var i = 0; i < slices.length; ++i) {
+        var s = slices[i];
+
+        if (s.pie.show) {
+          ctx.save();
+          ctx.beginPath();
+          ctx.moveTo(0, 0); // Center of the pie
+          //ctx.scale(1, options.series.pie.tilt);	// this actually seems to break everything when here.
+          ctx.arc(
+            0,
+            0,
+            radius,
+            s.startAngle,
+            s.startAngle + s.angle / 2,
+            false
+          );
+          ctx.arc(
+            0,
+            0,
+            radius,
+            s.startAngle + s.angle / 2,
+            s.startAngle + s.angle,
+            false
+          );
+          ctx.closePath();
+          x = mouseX - centerLeft;
+          y = mouseY - centerTop;
+
+          if (ctx.isPointInPath) {
+            if (ctx.isPointInPath(mouseX - centerLeft, mouseY - centerTop)) {
+              ctx.restore();
+              return {
+                datapoint: [s.percent, s.data],
+                dataIndex: 0,
+                series: s,
+                seriesIndex: i
+              };
+            }
+          } else {
+            // excanvas for IE doesn;t support isPointInPath, this is a workaround.
+
+            var p1X = radius * Math.cos(s.startAngle),
+              p1Y = radius * Math.sin(s.startAngle),
+              p2X = radius * Math.cos(s.startAngle + s.angle / 4),
+              p2Y = radius * Math.sin(s.startAngle + s.angle / 4),
+              p3X = radius * Math.cos(s.startAngle + s.angle / 2),
+              p3Y = radius * Math.sin(s.startAngle + s.angle / 2),
+              p4X = radius * Math.cos(s.startAngle + s.angle / 1.5),
+              p4Y = radius * Math.sin(s.startAngle + s.angle / 1.5),
+              p5X = radius * Math.cos(s.startAngle + s.angle),
+              p5Y = radius * Math.sin(s.startAngle + s.angle),
+              arrPoly = [
+                [0, 0],
+                [p1X, p1Y],
+                [p2X, p2Y],
+                [p3X, p3Y],
+                [p4X, p4Y],
+                [p5X, p5Y]
+              ],
+              arrPoint = [x, y];
+
+            // TODO: perhaps do some mathmatical trickery here with the Y-coordinate to compensate for pie tilt?
+
+            if (isPointInPoly(arrPoly, arrPoint)) {
+              ctx.restore();
+              return {
+                datapoint: [s.percent, s.data],
+                dataIndex: 0,
+                series: s,
+                seriesIndex: i
+              };
+            }
+          }
+
+          ctx.restore();
+        }
+      }
+
+      return null;
+    }
+
+    function onMouseMove(e) {
+      triggerClickHoverEvent("plothover", e);
+    }
+
+    function onClick(e) {
+      triggerClickHoverEvent("plotclick", e);
+    }
+
+    // trigger click or hover event (they send the same parameters so we share their code)
+
+    function triggerClickHoverEvent(eventname, e) {
+      var offset = plot.offset();
+      var canvasX = parseInt(e.pageX - offset.left);
+      var canvasY = parseInt(e.pageY - offset.top);
+      var item = findNearbySlice(canvasX, canvasY);
+
+      if (options.grid.autoHighlight) {
+        // clear auto-highlights
+
+        for (var i = 0; i < highlights.length; ++i) {
+          var h = highlights[i];
+          if (h.auto == eventname && !(item && h.series == item.series)) {
+            unhighlight(h.series);
+          }
+        }
+      }
+
+      // highlight the slice
+
+      if (item) {
+        highlight(item.series, eventname);
+      }
+
+      // trigger any hover bind events
+
+      var pos = { pageX: e.pageX, pageY: e.pageY };
+      target.trigger(eventname, [pos, item]);
+    }
+
+    function highlight(s, auto) {
+      //if (typeof s == "number") {
+      //	s = series[s];
+      //}
+
+      var i = indexOfHighlight(s);
+
+      if (i == -1) {
+        highlights.push({ series: s, auto: auto });
+        plot.triggerRedrawOverlay();
+      } else if (!auto) {
+        highlights[i].auto = false;
+      }
+    }
+
+    function unhighlight(s) {
+      if (s == null) {
+        highlights = [];
+        plot.triggerRedrawOverlay();
+      }
+
+      //if (typeof s == "number") {
+      //	s = series[s];
+      //}
+
+      var i = indexOfHighlight(s);
+
+      if (i != -1) {
+        highlights.splice(i, 1);
+        plot.triggerRedrawOverlay();
+      }
+    }
+
+    function indexOfHighlight(s) {
+      for (var i = 0; i < highlights.length; ++i) {
+        var h = highlights[i];
+        if (h.series == s) return i;
+      }
+      return -1;
+    }
+
+    function drawOverlay(plot, octx) {
+      var options = plot.getOptions();
+
+      var radius =
+        options.series.pie.radius > 1
+          ? options.series.pie.radius
+          : maxRadius * options.series.pie.radius;
+
+      octx.save();
+      octx.translate(centerLeft, centerTop);
+      octx.scale(1, options.series.pie.tilt);
+
+      for (var i = 0; i < highlights.length; ++i) {
+        drawHighlight(highlights[i].series);
+      }
+
+      drawDonutHole(octx);
+
+      octx.restore();
+
+      function drawHighlight(series) {
+        if (series.angle <= 0 || isNaN(series.angle)) {
+          return;
+        }
+
+        //octx.fillStyle = parseColor(options.series.pie.highlight.color).scale(null, null, null, options.series.pie.highlight.opacity).toString();
+        octx.fillStyle =
+          "rgba(255, 255, 255, " + options.series.pie.highlight.opacity + ")"; // this is temporary until we have access to parseColor
+        octx.beginPath();
+        if (Math.abs(series.angle - Math.PI * 2) > 0.000000001) {
+          octx.moveTo(0, 0); // Center of the pie
+        }
+        octx.arc(
+          0,
+          0,
+          radius,
+          series.startAngle,
+          series.startAngle + series.angle / 2,
+          false
+        );
+        octx.arc(
+          0,
+          0,
+          radius,
+          series.startAngle + series.angle / 2,
+          series.startAngle + series.angle,
+          false
+        );
+        octx.closePath();
+        octx.fill();
+      }
+    }
+  } // end init (plugin body)
+
+  // define pie specific options and their default values
+
+  var options = {
+    series: {
+      pie: {
+        show: false,
+        radius: "auto", // actual radius of the visible pie (based on full calculated radius if <=1, or hard pixel value)
+        innerRadius: 0 /* for donut */,
+        startAngle: 3 / 2,
+        tilt: 1,
+        shadow: {
+          left: 5, // shadow left offset
+          top: 15, // shadow top offset
+          alpha: 0.02 // shadow alpha
+        },
+        offset: {
+          top: 0,
+          left: "auto"
+        },
+        stroke: {
+          color: "#fff",
+          width: 1
+        },
+        label: {
+          show: "auto",
+          formatter: function(label, slice) {
+            return (
+              "<div style='font-size:x-small;text-align:center;padding:2px;color:" +
+              slice.color +
+              ";'>" +
+              label +
+              "<br/>" +
+              Math.round(slice.percent) +
+              "%</div>"
+            );
+          }, // formatter function
+          radius: 1, // radius at which to place the labels (based on full calculated radius if <=1, or hard pixel value)
+          background: {
+            color: null,
+            opacity: 0
+          },
+          threshold: 0 // percentage at which to hide the label (i.e. the slice is too narrow)
+        },
+        combine: {
+          threshold: -1, // percentage at which to combine little slices into one larger slice
+          color: null, // color to give the new slice (auto-generated if null)
+          label: "Other" // label to give the new slice
+        },
+        highlight: {
+          //color: "#fff",		// will add this functionality once parseColor is available
+          opacity: 0.5
+        }
+      }
+    }
+  };
+
+  $.plot.plugins.push({
+    init: init,
+    options: options,
+    name: "pie",
+    version: "1.1"
+  });
 })(jQuery);
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index f7af997508..c62614ccd3 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1,4 +1,5 @@
 /* global $ */
+/* exported pandoraFlotPie, pandoraFlotPieCustom */
 
 function pandoraFlotPie(
   graph_id,
@@ -14,7 +15,7 @@ function pandoraFlotPie(
   colors,
   hide_labels
 ) {
-  var labels = labels.split(separator);
+  labels = labels.split(separator);
   var data = values.split(separator);
 
   if (colors != "") {
@@ -92,7 +93,7 @@ function pandoraFlotPie(
   function pieHover(event, pos, obj) {
     if (!obj) return;
 
-    index = obj.seriesIndex;
+    var index = obj.seriesIndex;
     legends.css("color", "#3F3F3D");
     legends.eq(index).css("color", "");
   }
@@ -144,21 +145,14 @@ function pandoraFlotPieCustom(
     .pop()
     .split(".")
     .shift();
-  var labels = labels.split(separator);
-  var legend = legend.split(separator);
+  labels = labels.split(separator);
+  legend = legend.split(separator);
   var data = values.split(separator);
   var no_data = 0;
   if (colors != "") {
     colors = colors.split(separator);
   }
-  var colors_data = [
-    "#e63c52",
-    "#FFA631",
-    "#f3b200",
-    "#5BB6E5",
-    "#F2919D",
-    "#82b92e"
-  ];
+
   var color = null;
   for (var i = 0; i < data.length; i++) {
     if (colors != "") {
@@ -174,28 +168,31 @@ function pandoraFlotPieCustom(
 
   if (width <= 450) {
     show_legend = false;
-    label_conf = {
-      show: false
-    };
-  } else {
     label_conf = {
       show: true,
-      radius: 0.75,
+      radius: 5 / 8,
       formatter: function(label, series) {
+        console.log(series);
         return (
           '<div style="font-size:' +
           font_size +
-          "pt;" +
-          'text-align:center;padding:2px;color:white;">' +
-          series.percent.toFixed(2) +
-          "%</div>"
+          "pt; font-weight:bolder;" +
+          "text-align:center;padding:2px;color:rgb(63, 63, 61)" +
+          '">' +
+          label +
+          ":<br>" +
+          series.data[0][1] +
+          "</div>"
         );
       },
       background: {
-        opacity: 0.5,
-        color: ""
+        opacity: 0.5
       }
     };
+  } else {
+    label_conf = {
+      show: false
+    };
   }
 
   var conf_pie = {
@@ -203,8 +200,8 @@ function pandoraFlotPieCustom(
       pie: {
         show: true,
         radius: 3 / 4,
-        innerRadius: 0.4
-        //label: label_conf
+        innerRadius: 0.4,
+        label: label_conf
       }
     },
     legend: {
@@ -234,7 +231,7 @@ function pandoraFlotPieCustom(
   var legends = $("#" + graph_id + " .legendLabel");
   var j = 0;
   legends.each(function() {
-    //$(this).css('width', $(this).width());
+    //$(this).css("width", $(this).width());
     $(this).css("font-size", font_size + "pt");
     $(this).removeClass("legendLabel");
     $(this).addClass(font);
@@ -264,19 +261,6 @@ function pandoraFlotPieCustom(
     return false;
   });
 
-  var pielegends = $("#" + graph_id + " .pieLabelBackground");
-  pielegends.each(function() {
-    $(this)
-      .css("transform", "rotate(-35deg)")
-      .css("color", "black");
-  });
-  var labelpielegends = $("#" + graph_id + " .pieLabel");
-  labelpielegends.each(function() {
-    $(this)
-      .css("transform", "rotate(-35deg)")
-      .css("color", "black");
-  });
-
   // Events
   $("#" + graph_id).bind("plothover", pieHover);
   $("#" + graph_id).bind("plotclick", Clickpie);
@@ -287,16 +271,17 @@ function pandoraFlotPieCustom(
   function pieHover(event, pos, obj) {
     if (!obj) return;
 
-    index = obj.seriesIndex;
+    var index = obj.seriesIndex;
     legends.css("color", "#3F3F3D");
     legends.eq(index).css("color", "");
   }
 
   function Clickpie(event, pos, obj) {
     if (!obj) return;
-    percent = parseFloat(obj.series.percent).toFixed(2);
-    valor = parseFloat(obj.series.data[0][1]);
+    var percent = parseFloat(obj.series.percent).toFixed(2);
+    var valor = parseFloat(obj.series.data[0][1]);
 
+    var value = "";
     if (valor > 1000000) {
       value = Math.round((valor / 1000000) * 100) / 100;
       value = value + "M";
@@ -325,42 +310,6 @@ function pandoraFlotPieCustom(
       $("#watermark_image_" + graph_id).attr("src")
     );
   }
-  /*
-	window.onresize = function(event) {
-        $.plot($('#' + graph_id), data, conf_pie);
-        if (no_data == data.length) {
-			$('#'+graph_id+' .overlay').remove();
-			$('#'+graph_id+' .base').remove();
-			$('#'+graph_id).prepend("<img style='width:50%;' src='images/no_data_toshow.png' />");
-		}
-		var legends = $('#'+graph_id+' .legendLabel');
-		var j = 0;
-		legends.each(function () {
-			//$(this).css('width', $(this).width());
-			$(this).css('font-size', font_size+'pt');
-			$(this).removeClass("legendLabel");
-			$(this).addClass(font);
-			$(this).text(legend[j]);
-			j++;
-		});
-
-		if ($('input[name="custom_graph"]').val()) {
-			$('.legend>div').css('right',($('.legend>div').height()*-1));
-			$('.legend>table').css('right',($('.legend>div').height()*-1));
-		}
-		//$('.legend>table').css('border',"1px solid #E2E2E2");
-		$('.legend>table').css('background-color',"transparent");
-
-		var pielegends = $('#'+graph_id+' .pieLabelBackground');
-		pielegends.each(function () {
-			$(this).css('transform', "rotate(-35deg)").css('color', 'black');
-		});
-		var labelpielegends = $('#'+graph_id+' .pieLabel');
-		labelpielegends.each(function () {
-			$(this).css('transform', "rotate(-35deg)").css('color', 'black');
-		});
-    }
-*/
 }
 
 function pandoraFlotHBars(
@@ -2791,14 +2740,16 @@ function pandoraFlotArea(
     if (short_data) {
       formatted = number_format(v, force_integer, "", short_data);
     } else {
-      // It is an integer
+      // It is an integer.
       if (v - Math.floor(v) == 0) {
         formatted = number_format(v, force_integer, "", 2);
       }
     }
 
-    // Get only two decimals
-    formatted = round_with_decimals(formatted, 100);
+    // Get only two decimals.
+    if (typeof formatted != "string") {
+      formatted = Math.round(formatted * 100) / 100;
+    }
     return formatted;
   }
 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 8e32673b48..309ddf364b 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -24,7 +24,7 @@ function include_javascript_dependencies_flot_graph($return=false)
         $is_include_javascript = true;
 
         $metaconsole_hack = '';
-        if (defined('METACONSOLE')) {
+        if (is_metaconsole()) {
             $metaconsole_hack = '../../';
         }
 
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 0fa503f81f..05009e7292 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -1870,3 +1870,100 @@ function logo_preview(icon_name, icon_path, incoming_options) {
     // console.log(err);
   }
 }
+
+// Advanced Form control.
+/* global $ */
+/* exported load_modal */
+function load_modal(settings) {
+  var AJAX_RUNNING = 0;
+  var data = new FormData();
+  if (settings.extradata) {
+    settings.extradata.forEach(function(item) {
+      if (item.value != undefined) data.append(item.name, item.value);
+    });
+  }
+  data.append("page", settings.onshow.page);
+  data.append("method", settings.onshow.method);
+
+  var width = 630;
+  if (settings.onshow.width) {
+    width = settings.onshow.width;
+  }
+
+  $.ajax({
+    method: "post",
+    url: settings.url,
+    processData: false,
+    contentType: false,
+    data: data,
+    success: function(data) {
+      settings.target.html(data);
+      settings.target.dialog({
+        resizable: true,
+        draggable: true,
+        modal: true,
+        title: settings.modal.title,
+        width: width,
+        overlay: {
+          opacity: 0.5,
+          background: "black"
+        },
+        buttons: [
+          {
+            class:
+              "ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel",
+            text: settings.modal.cancel,
+            click: function() {
+              $(this).dialog("close");
+              settings.cleanup();
+            }
+          },
+          {
+            class:
+              "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
+            text: settings.modal.ok,
+            click: function() {
+              if (AJAX_RUNNING) return;
+              AJAX_RUNNING = 1;
+              var formdata = new FormData();
+              if (settings.extradata) {
+                settings.extradata.forEach(function(item) {
+                  if (item.value != undefined)
+                    formdata.append(item.name, item.value);
+                });
+              }
+              formdata.append("page", settings.onsubmit.page);
+              formdata.append("method", settings.onsubmit.method);
+
+              $("#" + settings.form + " :input").each(function() {
+                if (this.type == "file") {
+                  if ($(this).prop("files")[0]) {
+                    formdata.append(this.name, $(this).prop("files")[0]);
+                  }
+                } else {
+                  formdata.append(this.name, $(this).val());
+                }
+              });
+
+              $.ajax({
+                method: "post",
+                url: settings.url,
+                processData: false,
+                contentType: false,
+                data: formdata,
+                success: function(data) {
+                  settings.ajax_callback(data);
+                  AJAX_RUNNING = 0;
+                }
+              });
+            }
+          }
+        ],
+        closeOnEscape: false,
+        open: function() {
+          $(".ui-dialog-titlebar-close").hide();
+        }
+      });
+    }
+  });
+}
diff --git a/pandora_console/include/load_session.php b/pandora_console/include/load_session.php
index 8b243d808a..39e0973287 100644
--- a/pandora_console/include/load_session.php
+++ b/pandora_console/include/load_session.php
@@ -91,6 +91,11 @@ function pandora_session_write($session_id, $data)
 {
     $session_id = addslashes($session_id);
 
+    // If it's an api call, the session must not be created.
+    if (get_parameter('op', false) && get_parameter('op2', false)) {
+        return true;
+    }
+
     if (is_ajax()) {
         // Avoid session upadte while processing ajax responses - notifications.
         if (get_parameter('check_new_notifications', false)) {
@@ -159,7 +164,26 @@ function pandora_session_gc($max_lifetime=300)
     global $config;
 
     if (isset($config['session_timeout'])) {
-        $max_lifetime = $config['session_timeout'];
+        $session_timeout = $config['session_timeout'];
+    } else {
+        // if $config doesn`t work ...
+        $session_timeout = db_get_value(
+            'value',
+            'tconfig',
+            'token',
+            'session_timeout'
+        );
+    }
+
+    if (!empty($session_timeout)) {
+        if ($session_timeout == -1) {
+            // The session expires in 10 years
+            $session_timeout = 315576000;
+        } else {
+            $session_timeout *= 60;
+        }
+
+        $max_lifetime = $session_timeout;
     }
 
     $time_limit = (time() - $max_lifetime);
@@ -171,6 +195,11 @@ function pandora_session_gc($max_lifetime=300)
         ]
     );
 
+    // Deleting cron and empty sessions.
+    $sql = "DELETE FROM tsessions_php WHERE 
+        data IS NULL OR id_session REGEXP '^cron-'";
+    db_process_sql($sql);
+
     return $retval;
 }
 
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/Group.php b/pandora_console/include/rest-api/models/VisualConsole/Items/Group.php
index cbbe877f8d..53f2adcadd 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Items/Group.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Items/Group.php
@@ -291,21 +291,9 @@ final class Group extends Item
             $width = (int) $data['width'];
             $height = (int) $data['height'];
             if ($width === 0 || $height === 0) {
-                // TODO: This will be the default behaviour after we finish the
-                // builder. Don't delete this code.
-                // $sizeImage = getimagesize($config['homedir'].'/'.$imagePath);
-                // $data['width'] = $sizeImage[0];
-                // $data['height'] = $sizeImage[1];
                 $sizeImage = getimagesize($config['homedir'].'/'.$imagePath);
-                $imageHeight = $sizeImage[1];
-
-                if ($width === 0) {
-                    $data['width'] = 70;
-                }
-
-                if ($height === 0) {
-                    $data['height'] = ($imageHeight > 70) ? 70 : $imageHeight;
-                }
+                $data['width'] = $sizeImage[0];
+                $data['height'] = $sizeImage[1];
             }
 
             $data['html'] = '<img src="'.$data['statusImageSrc'].'">';
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/Icon.php b/pandora_console/include/rest-api/models/VisualConsole/Items/Icon.php
index 29605ffb4f..e67c76a6a7 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Items/Icon.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Items/Icon.php
@@ -120,21 +120,9 @@ final class Icon extends Item
         $width = (int) $data['width'];
         $height = (int) $data['height'];
         if ($width === 0 || $height === 0) {
-            // TODO: This will be the default behaviour after we finish the
-            // builder. Don't delete this code.
-            // $sizeImage = getimagesize($config['homedir'].'/'.$imagePath);
-            // $data['width'] = $sizeImage[0];
-            // $data['height'] = $sizeImage[1];
             $sizeImage = getimagesize($config['homedir'].'/'.$imagePath);
-            $imageHeight = $sizeImage[1];
-
-            if ($width === 0) {
-                $data['width'] = 70;
-            }
-
-            if ($height === 0) {
-                $data['height'] = ($imageHeight > 70) ? 70 : $imageHeight;
-            }
+            $data['width'] = $sizeImage[0];
+            $data['height'] = $sizeImage[1];
         }
 
         return $data;
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php b/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php
index 9af4287d26..c43fb39136 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Items/StaticGraph.php
@@ -184,23 +184,9 @@ final class StaticGraph extends Item
         $width = (int) $data['width'];
         $height = (int) $data['height'];
         if ($width === 0 || $height === 0) {
-            // TODO: This will be the default behaviour after we finish the
-            // builder. Don't delete this code.
-            // $sizeImage = getimagesize($config['homedir'].'/'.$imagePath);
-            // $data['width'] = $sizeImage[0];
-            // $data['height'] = $sizeImage[1];
-            // Default value. Will be replaced by a dynamic image size
-            // calculation after the phase 3.
             $sizeImage = getimagesize($config['homedir'].'/'.$imagePath);
-            $imageHeight = $sizeImage[1];
-
-            if ($width === 0) {
-                $data['width'] = 70;
-            }
-
-            if ($height === 0) {
-                $data['height'] = ($imageHeight > 70) ? 70 : $imageHeight;
-            }
+            $data['width'] = $sizeImage[0];
+            $data['height'] = $sizeImage[1];
         }
 
         // Get last value.
diff --git a/pandora_console/include/styles/agent_repository.css b/pandora_console/include/styles/agent_repository.css
new file mode 100644
index 0000000000..4f0794338d
--- /dev/null
+++ b/pandora_console/include/styles/agent_repository.css
@@ -0,0 +1,29 @@
+ul.wizard li > label:not(.p-switch) {
+  width: auto;
+}
+
+form.top-action-buttons ul.wizard {
+  display: flex;
+  flex-direction: row;
+}
+
+ul.wizard li {
+  margin-right: 1em;
+}
+
+form.modal ul.wizard li {
+  display: flex;
+  flex-direction: row;
+  width: 90%;
+  margin: 0.5em auto;
+  justify-items: center;
+}
+
+form.modal ul.wizard li * {
+  flex: 1;
+}
+
+ul.wizard li.flex-indep {
+  flex: 1;
+  margin: 0;
+}
diff --git a/pandora_console/include/styles/deployment_list.css b/pandora_console/include/styles/deployment_list.css
new file mode 100644
index 0000000000..e487207b05
--- /dev/null
+++ b/pandora_console/include/styles/deployment_list.css
@@ -0,0 +1,34 @@
+ul.wizard li > label:not(.p-switch) {
+  width: auto;
+}
+
+form.top-action-buttons ul.wizard {
+  display: flex;
+  flex-direction: row;
+}
+
+ul.wizard li {
+  margin-right: 1em;
+}
+
+form.modal ul.wizard li {
+  display: flex;
+  flex-direction: row;
+  width: 90%;
+  margin: 0.5em auto;
+  justify-items: center;
+}
+
+form.modal ul.wizard li * {
+  flex: 1;
+}
+
+ul.wizard li.flex-indep {
+  flex: 1;
+  margin: 0;
+}
+
+.datatable_filter.content li input[type="text"] {
+  width: 150px;
+  margin: 0 1em 0 0;
+}
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index 1ed0028dc8..8b46a97ca6 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -118,14 +118,6 @@ table.dataTable tbody td {
   border-bottom: 2px solid #dedede;
 }
 
-.info_table.events tr > td:first-child {
-  padding-left: 5px;
-  padding-top: 0;
-  vertical-align: middle;
-  width: 40%;
-  padding-bottom: 0;
-}
-
 .filter_input {
   align-items: center;
 }
diff --git a/pandora_console/include/styles/js/cluetip.css b/pandora_console/include/styles/js/cluetip.css
index 233dbf3cbb..a1360b0afe 100644
--- a/pandora_console/include/styles/js/cluetip.css
+++ b/pandora_console/include/styles/js/cluetip.css
@@ -2,19 +2,23 @@
 #cluetip-close img {
   border: 0;
 }
+
 #cluetip-title {
   overflow: hidden;
 }
+
 #cluetip-title #cluetip-close {
   float: right;
   position: relative;
 }
+
 #cluetip-waitimage {
   width: 43px;
   height: 11px;
   position: absolute;
   background-image: url(../../../images/wait.gif);
 }
+
 .cluetip-arrows {
   display: none;
   position: absolute;
@@ -25,9 +29,11 @@
   background-repeat: no-repeat;
   background-position: 0 0;
 }
+
 #cluetip-extra {
   display: none;
 }
+
 /***************************************
  =cluetipClass: 'default' 
 -------------------------------------- */
@@ -36,11 +42,13 @@
   background-color: #fff;
   text-align: left;
 }
+
 .cluetip-default #cluetip-outer {
   position: relative;
   margin: 0;
   background-color: #fff;
 }
+
 .cluetip-default h3 {
   margin: 0 0 5px;
   padding: 8px 10px 4px;
@@ -49,6 +57,7 @@
   background-color: #b1b1b1;
   color: #fff;
 }
+
 .cluetip-default h3#cluetip-title {
   display: none;
   height: 0px;
@@ -56,41 +65,49 @@
   padding: 0;
   color: #fff;
 }
+
 .cluetip-default #cluetip-title a {
   color: #fff;
   font-size: 0.95em;
 }
+
 .cluetip-default #cluetip-inner {
   padding: 10px;
 }
+
 .cluetip-default div#cluetip-close {
   text-align: right;
   margin: 0 5px 5px;
   color: #900;
 }
+
 .cluetip-default ul {
   text-align: left;
 }
+
 /* default arrows */
 
 .clue-right-default .cluetip-arrows {
-  background-image: url(../../images/darrowleft.png);
+  background-image: url(../../../images/darrowleft.png);
 }
+
 .clue-left-default .cluetip-arrows {
-  background-image: url(../../images/darrowright.png);
+  background-image: url(../../../images/darrowright.png);
   left: 100%;
   margin-right: -11px;
 }
+
 .clue-top-default .cluetip-arrows {
-  background-image: url(../../images/darrowdown.png);
+  background-image: url(../../../images/darrowdown.png);
   top: 100%;
   left: 50%;
   margin-left: -11px;
   height: 11px;
   width: 22px;
 }
+
 .clue-bottom-default .cluetip-arrows {
-  background-image: url(../../images/darrowup.png);
+  background-image: url(../../../images/darrowup.png);
   top: -11px;
   left: 50%;
   margin-left: -11px;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index f688186567..8c12d11d04 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -437,8 +437,17 @@ select:-internal-list-box {
  * - GLOBAL STYLES                           									-
  * ---------------------------------------------------------------------
  */
+.truncate {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.truncate:hover {
+  white-space: pre-wrap;
+}
 .w120px {
   width: 120px;
+  max-width: 120px;
 }
 .mw120px {
   min-width: 120px;
@@ -1588,6 +1597,8 @@ button.config,
 button.filter,
 button.cancel,
 button.default,
+button.deploy,
+input.deploy,
 input.next,
 input.upd,
 input.ok,
@@ -1708,7 +1719,10 @@ button.spinn,
 input.spinn {
   background-image: url(../../images/spinner_green.gif);
 }
-
+button.deploy,
+input.deploy {
+  background-image: url(../../images/input_deploy.png);
+}
 /*#table-add-item select, #table-add-sla select {
 	width: 180px;
 }*/
@@ -5324,6 +5338,10 @@ table.info_table.policy_sub_table {
   margin-bottom: 4px;
 }
 
+.agent_options input[readonly] {
+  color: #848484;
+}
+
 /*
  * ---------------------------------------------------------------------
  * - CLASSES FOR THE NEW TOGGLES                     								-
@@ -5862,3 +5880,7 @@ table.table_modal_alternate tr td:first-child {
   padding-left: 20px;
 }
 /* END - Table for show more info in events and config menu in modules graphs */
+
+.fullwidth {
+  width: 100%;
+}
diff --git a/pandora_console/include/styles/pandoraPDF.css b/pandora_console/include/styles/pandoraPDF.css
index 5bb0e15174..9a55b6a1e4 100644
--- a/pandora_console/include/styles/pandoraPDF.css
+++ b/pandora_console/include/styles/pandoraPDF.css
@@ -27,6 +27,10 @@
  * GNU General Public License for more details.
  * ============================================================================
  */
+table {
+  text-align: center;
+}
+
 table.header_table {
   width: 100%;
 }
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 030eae88ca..6f0c74d16b 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -237,19 +237,12 @@ table.table_modal_alternate tr:nth-child(even) td {
   background-color: #555 !important;
 }
 
-.info_table .datos3,
-.datos3,
-.info_table .datos4,
-.datos4 {
-  background-color: #666;
-  color: #fff;
-}
-
 .info_table .datos3,
 .datos3,
 .info_table .datos4,
 .datos4 {
   background-color: #444;
+  color: #fff;
 }
 
 .action_buttons a[href] img,
@@ -394,3 +387,16 @@ ul.ui-tabs-nav.ui-corner-all.ui-helper-reset.ui-helper-clearfix.ui-widget-header
 div#box_online * {
   color: #000;
 }
+
+/* discovery.css */
+#text_wizard {
+  color: #555;
+}
+
+div#code_license_dialog div#code,
+div#form_activate_licence #code {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  border: 0px;
+  background-color: #222;
+}
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index c3e1deb94c..23f6253421 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -122,6 +122,7 @@
   letter-spacing: 0.3pt;
   color: #000;
   background-color: #fff;
+  cursor: pointer;
 }
 
 .info_table tr th {
@@ -261,11 +262,16 @@ a.pandora_pagination {
   padding: 5px;
   color: #000;
   border: 1px solid #cacaca;
+  border-left: none;
   min-width: 12px;
-  margin-right: -1px;
   text-decoration: none;
   cursor: pointer;
 }
+.dataTables_paginate > span > span.ellipsis + a.pandora_pagination:last-child,
+.dataTables_paginate a.pandora_pagination.previous {
+  border-left: 1px solid #cacaca;
+}
+
 a.pandora_pagination.disabled {
   color: #cacaca;
 }
@@ -341,3 +347,8 @@ a.pandora_pagination.current:hover {
   background-position-y: center;
   cursor: pointer;
 }
+
+.info_table tr th.sorting_asc,
+.info_table tr th.sorting_desc {
+  padding-left: 15px;
+}
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 70b078b8bf..74621dded1 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * Index.
+ *
+ * @category   Main entrypoint.
+ * @package    Pandora FMS
+ * @subpackage Opensource.
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2012 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-// Enable profiler for testing
+// Begin.
 if (!defined('__PAN_XHPROF__')) {
     define('__PAN_XHPROF__', 0);
 }
@@ -24,17 +39,18 @@ if (__PAN_XHPROF__ === 1) {
     }
 }
 
-// Set character encoding to UTF-8 - fixes a lot of multibyte character headaches
+// Set character encoding to UTF-8
+// fixes a lot of multibyte character issues.
 if (function_exists('mb_internal_encoding')) {
     mb_internal_encoding('UTF-8');
 }
 
 // Set to 1 to do not check for installer or config file (for development!).
-// Activate gives more error information, not useful for production sites
+// Activate gives more error information, not useful for production sites.
 $develop_bypass = 0;
 
 if ($develop_bypass != 1) {
-    // If no config file, automatically try to install
+    // If no config file, automatically try to install.
     if (! file_exists('include/config.php')) {
         if (! file_exists('install.php')) {
             $url = explode('/', $_SERVER['REQUEST_URI']);
@@ -74,14 +90,14 @@ if ($develop_bypass != 1) {
         }
     }
 
-    // Check for installer presence
+    // Check installer presence.
     if (file_exists('install.php')) {
         $login_screen = 'error_install';
         include 'general/error_screen.php';
         exit;
     }
 
-    // Check perms for config.php
+    // Check perms for config.php.
     if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
         if ((substr(sprintf('%o', fileperms('include/config.php')), -4) != '0600')
             && (substr(sprintf('%o', fileperms('include/config.php')), -4) != '0660')
@@ -110,15 +126,18 @@ if ($develop_bypass != 1) {
     }
 }
 
-if ((! file_exists('include/config.php')) || (! is_readable('include/config.php'))) {
+if ((! file_exists('include/config.php'))
+    || (! is_readable('include/config.php'))
+) {
     $login_screen = 'error_noconfig';
     include 'general/error_screen.php';
     exit;
 }
 
-//
-// PLEASE DO NOT CHANGE ORDER //////
-//
+/*
+ * DO NOT CHANGE ORDER OF FOLLOWING REQUIRES.
+ */
+
 require_once 'include/config.php';
 require_once 'include/functions_config.php';
 
@@ -128,11 +147,11 @@ if (isset($config['error'])) {
     exit;
 }
 
-// If metaconsole activated, redirect to it
-if ($config['metaconsole'] == 1 && $config['enterprise_installed'] == 1) {
-    header('Location: '.$config['homeurl'].'enterprise/meta');
+// If metaconsole activated, redirect to it.
+if (is_metaconsole()) {
+    header('Location: '.ui_get_full_url('index.php'));
+    // Always exit after sending location headers.
     exit;
-    // Always exit after sending location headers
 }
 
 if (file_exists(ENTERPRISE_DIR.'/include/functions_login.php')) {
@@ -141,12 +160,12 @@ if (file_exists(ENTERPRISE_DIR.'/include/functions_login.php')) {
 
 if (!empty($config['https']) && empty($_SERVER['HTTPS'])) {
     $query = '';
-    if (sizeof($_REQUEST)) {
-        // Some (old) browsers don't like the ?&key=var
+    if (count($_REQUEST)) {
+        // Some (old) browsers don't like the ?&key=var.
         $query .= '?1=1';
     }
 
-    // We don't clean these variables up as they're only being passed along
+    // We don't clean these variables up as they're only being passed along.
     foreach ($_GET as $key => $value) {
         if ($key == 1) {
             continue;
@@ -162,12 +181,12 @@ if (!empty($config['https']) && empty($_SERVER['HTTPS'])) {
     $url = ui_get_full_url($query);
 
     // Prevent HTTP response splitting attacks
-    // http://en.wikipedia.org/wiki/HTTP_response_splitting
+    // http://en.wikipedia.org/wiki/HTTP_response_splitting.
     $url = str_replace("\n", '', $url);
 
     header('Location: '.$url);
+    // Always exit after sending location headers.
     exit;
-    // Always exit after sending location headers
 }
 
 // Pure mode (without menu, header and footer).
@@ -188,20 +207,21 @@ echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www
 echo '<html xmlns="http://www.w3.org/1999/xhtml">'."\n";
 echo '<head>'."\n";
 
-// This starts the page head. In the call back function, things from $page['head'] array will be processed into the head
+// This starts the page head. In the callback function,
+// $page['head'] array content will be processed into the head.
 ob_start('ui_process_page_head');
 
-// Enterprise main
+// Enterprise main.
 enterprise_include('index.php');
 
 echo '<script type="text/javascript">';
     echo 'var dispositivo = navigator.userAgent.toLowerCase();';
     echo 'if( dispositivo.search(/iphone|ipod|ipad|android/) > -1 ){';
-        echo 'document.location = "'.$config['homeurl'].'mobile";  }';
+        echo 'document.location = "'.ui_get_full_url('/mobile').'";  }';
 echo '</script>';
 
 // This tag is included in the buffer passed to ui_process_page_head so
-// technically it can be stripped
+// technically it can be stripped.
 echo '</head>'."\n";
 
 require_once 'include/functions_themes.php';
@@ -212,13 +232,13 @@ $config['remote_addr'] = $_SERVER['REMOTE_ADDR'];
 $sec2 = get_parameter_get('sec2');
 $sec2 = safe_url_extraclean($sec2);
 $page = $sec2;
-// Reference variable for old time sake
+// Reference variable for old time sake.
 $sec = get_parameter_get('sec');
 $sec = safe_url_extraclean($sec);
 
 $process_login = false;
 
-// Update user password
+// Update user password.
 $change_pass = get_parameter_post('renew_password', 0);
 
 if ($change_pass == 1) {
@@ -235,14 +255,14 @@ $searchPage = false;
 $search = get_parameter_get('head_search_keywords');
 if (strlen($search) > 0) {
     $config['search_keywords'] = io_safe_input(trim(io_safe_output(get_parameter('keywords'))));
-    // If not search category providad, we'll use an agent search
+    // If not search category providad, we'll use an agent search.
     $config['search_category'] = get_parameter('search_category', 'all');
     if (($config['search_keywords'] != 'Enter keywords to search') && (strlen($config['search_keywords']) > 0)) {
         $searchPage = true;
     }
 }
 
-// Login process
+// Login process.
 if (! isset($config['id_user'])) {
     // Clear error messages.
     unset($_COOKIE['errormsg']);
@@ -250,50 +270,53 @@ if (! isset($config['id_user'])) {
 
     if (isset($_GET['login'])) {
         include_once 'include/functions_db.php';
-        // Include it to use escape_string_sql function
+        // Include it to use escape_string_sql function.
         $config['auth_error'] = '';
-        // Set this to the error message from the authorization mechanism
+        // Set this to the error message from the authorization mechanism.
         $nick = get_parameter_post('nick');
-        // This is the variable with the login
+        // This is the variable with the login.
         $pass = get_parameter_post('pass');
-        // This is the variable with the password
+        // This is the variable with the password.
         $nick = db_escape_string_sql($nick);
         $pass = db_escape_string_sql($pass);
 
-        // Since now, only the $pass variable are needed
+        // Since now, only the $pass variable are needed.
         unset($_GET['pass'], $_POST['pass'], $_REQUEST['pass']);
 
-        // If the auth_code exists, we assume the user has come through the double auth page
+        // If the auth_code exists, we assume the user has come from
+        // double authorization page.
         if (isset($_POST['auth_code'])) {
             $double_auth_success = false;
 
-            // The double authentication is activated and the user has surpassed the first step (the login).
+            // The double authentication is activated and the user has
+            // surpassed the first step (the login).
             // Now the authentication code provided will be checked.
             if (isset($_SESSION['prepared_login_da'])) {
                 if (isset($_SESSION['prepared_login_da']['id_user'])
                     && isset($_SESSION['prepared_login_da']['timestamp'])
                 ) {
-                    // The user has a maximum of 5 minutes to introduce the double auth code
+                    // The user has a maximum of 5 minutes to introduce
+                    // the double auth code.
                     $dauth_period = SECONDS_2MINUTES;
                     $now = time();
                     $dauth_time = $_SESSION['prepared_login_da']['timestamp'];
 
                     if (($now - $dauth_period) < $dauth_time) {
-                        // Nick
+                        // Nick.
                         $nick = $_SESSION['prepared_login_da']['id_user'];
-                        // Code
+                        // Code.
                         $code = (string) get_parameter_post('auth_code');
 
                         if (!empty($code)) {
                             $result = validate_double_auth_code($nick, $code);
 
                             if ($result === true) {
-                                // Double auth success
+                                // Double auth success.
                                 $double_auth_success = true;
                             } else {
-                                // Screen
+                                // Screen.
                                 $login_screen = 'double_auth';
-                                // Error message
+                                // Error message.
                                 $config['auth_error'] = __('Invalid code');
 
                                 if (!isset($_SESSION['prepared_login_da']['attempts'])) {
@@ -303,9 +326,9 @@ if (! isset($config['id_user'])) {
                                 $_SESSION['prepared_login_da']['attempts']++;
                             }
                         } else {
-                            // Screen
+                            // Screen.
                             $login_screen = 'double_auth';
-                            // Error message
+                            // Error message.
                             $config['auth_error'] = __("The code shouldn't be empty");
 
                             if (!isset($_SESSION['prepared_login_da']['attempts'])) {
@@ -315,27 +338,27 @@ if (! isset($config['id_user'])) {
                             $_SESSION['prepared_login_da']['attempts']++;
                         }
                     } else {
-                        // Expired login
+                        // Expired login.
                         unset($_SESSION['prepared_login_da']);
 
-                        // Error message
+                        // Error message.
                         $config['auth_error'] = __('Expired login');
                     }
                 } else {
-                    // If the code doesn't exist, remove the prepared login
+                    // If the code doesn't exist, remove the prepared login.
                     unset($_SESSION['prepared_login_da']);
 
-                    // Error message
+                    // Error message.
                     $config['auth_error'] = __('Login error');
                 }
-            }
-            // If $_SESSION['prepared_login_da'] doesn't exist, the user have to do the login again
-            else {
-                // Error message
+            } else {
+                // If $_SESSION['prepared_login_da'] doesn't exist, the user
+                // must login again.
+                // Error message.
                 $config['auth_error'] = __('Login error');
             }
 
-            // Remove the authenticator code
+            // Remove the authenticator code.
             unset($_POST['auth_code'], $code);
 
             if (!$double_auth_success) {
@@ -347,6 +370,8 @@ if (! isset($config['id_user'])) {
                     $_SERVER['REMOTE_ADDR']
                 );
                 while (@ob_end_flush()) {
+                    // Dumping...
+                    continue;
                 }
 
                 exit('</html>');
@@ -355,7 +380,8 @@ if (! isset($config['id_user'])) {
 
         $login_button_saml = get_parameter('login_button_saml', false);
         if (isset($double_auth_success) && $double_auth_success) {
-            // This values are true cause there are checked before complete the 2nd auth step
+            // This values are true cause there are checked before complete
+            // the 2nd auth step.
             $nick_in_db = $_SESSION['prepared_login_da']['id_user'];
             $expired_pass = false;
         } else if (($config['auth'] == 'saml') && ($login_button_saml)) {
@@ -400,28 +426,34 @@ if (! isset($config['id_user'])) {
                     include_once 'general/login_page.php';
                     db_pandora_audit('Password expired', 'Password expired: '.$nick, $nick);
                     while (@ob_end_flush()) {
+                        // Dumping...
+                        continue;
                     }
 
                     exit('</html>');
                 }
 
-                // Checks if password has expired
+                // Checks if password has expired.
                 $check_status = check_pass_status($nick, $pass);
 
                 switch ($check_status) {
                     case PASSSWORD_POLICIES_FIRST_CHANGE:
-                        // first change
+                        // First change.
                     case PASSSWORD_POLICIES_EXPIRED:
-                        // pass expired
+                        // Pass expired.
                         $expired_pass = true;
                         login_change_password($nick, '', $check_status);
                     break;
+
+                    default:
+                        // Ignore.
+                    break;
                 }
             }
         }
 
         if (($nick_in_db !== false) && $expired_pass) {
-            // login ok and password has expired
+            // Login ok and password has expired.
             include_once 'general/login_page.php';
             db_pandora_audit(
                 'Password expired',
@@ -429,30 +461,38 @@ if (! isset($config['id_user'])) {
                 $nick
             );
             while (@ob_end_flush()) {
+                // Dumping...
+                continue;
             }
 
             exit('</html>');
         } else if (($nick_in_db !== false) && (!$expired_pass)) {
-            // login ok and password has not expired
-            // Double auth check
-            if ((!isset($double_auth_success) || !$double_auth_success) && is_double_auth_enabled($nick_in_db)) {
-                // Store this values in the session to know if the user login was correct
+            // Login ok and password has not expired.
+            // Double auth check.
+            if ((!isset($double_auth_success)
+                || !$double_auth_success)
+                && is_double_auth_enabled($nick_in_db)
+            ) {
+                // Store this values in the session to know if the user login
+                // was correct.
                 $_SESSION['prepared_login_da'] = [
                     'id_user'   => $nick_in_db,
                     'timestamp' => time(),
                     'attempts'  => 0,
                 ];
 
-                // Load the page to introduce the double auth code
+                // Load the page to introduce the double auth code.
                 $login_screen = 'double_auth';
                 include_once 'general/login_page.php';
                 while (@ob_end_flush()) {
+                    // Dumping...
+                    continue;
                 }
 
                 exit('</html>');
             }
 
-            // login ok and password has not expired
+            // Login ok and password has not expired.
             $process_login = true;
 
             if (is_user_admin($nick)) {
@@ -464,7 +504,7 @@ if (! isset($config['id_user'])) {
             if (!isset($_GET['sec2']) && !isset($_GET['sec'])) {
                 // Avoid the show homepage when the user go to
                 // a specific section of pandora
-                // for example when timeout the sesion
+                // for example when timeout the sesion.
                 unset($_GET['sec2']);
                 $_GET['sec'] = 'general/logon_ok';
                 $home_page = '';
@@ -495,6 +535,7 @@ if (! isset($config['id_user'])) {
                             break;
 
                             case 'Default':
+                            default:
                                 $_GET['sec'] = 'general/logon_ok';
                             break;
 
@@ -530,11 +571,14 @@ if (! isset($config['id_user'])) {
             $_SESSION['id_usuario'] = $nick_in_db;
             $config['id_user'] = $nick_in_db;
 
-            // Check if connection goes through F5 balancer. If it does, then don't call config_prepare_session() or user will be back to login all the time
+            // Check if connection goes through F5 balancer. If it does, then
+            // don't call config_prepare_session() or user will be back to login
+            // all the time.
             $prepare_session = true;
             foreach ($_COOKIE as $key => $value) {
                 if (preg_match('/BIGipServer*/', $key)) {
                     $prepare_session = false;
+                    break;
                 }
             }
 
@@ -543,9 +587,13 @@ if (! isset($config['id_user'])) {
             }
 
             if (is_user_admin($config['id_user'])) {
-                // PHP configuration values
-                $PHPupload_max_filesize = config_return_in_bytes(ini_get('upload_max_filesize'));
-                $PHPmemory_limit = config_return_in_bytes(ini_get('memory_limit'));
+                // PHP configuration values.
+                $PHPupload_max_filesize = config_return_in_bytes(
+                    ini_get('upload_max_filesize')
+                );
+                $PHPmemory_limit = config_return_in_bytes(
+                    ini_get('memory_limit')
+                );
                 $PHPmax_execution_time = ini_get('max_execution_time');
 
                 if ($PHPmax_execution_time !== '0') {
@@ -580,43 +628,60 @@ if (! isset($config['id_user'])) {
 
             $l10n = null;
             if (file_exists('./include/languages/'.$user_language.'.mo')) {
-                $l10n = new gettext_reader(new CachedFileReader('./include/languages/'.$user_language.'.mo'));
+                $cacheFileReader = new CachedFileReader(
+                    './include/languages/'.$user_language.'.mo'
+                );
+                $l10n = new gettext_reader($cacheFileReader);
                 $l10n->load_tables();
             }
         } else {
-            // login wrong
+            // Login wrong.
             $blocked = false;
 
-            if ((!is_user_admin($nick) || $config['enable_pass_policy_admin']) && file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
+            if ((!is_user_admin($nick) || $config['enable_pass_policy_admin'])
+                && file_exists(ENTERPRISE_DIR.'/load_enterprise.php')
+            ) {
                 $blocked = login_check_blocked($nick);
             }
 
             if (!$blocked) {
                 if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
+                    // Checks failed attempts.
                     login_check_failed($nick);
-                    // Checks failed attempts
                 }
 
                 $login_failed = true;
                 include_once 'general/login_page.php';
-                db_pandora_audit('Logon Failed', 'Invalid login: '.$nick, $nick);
+                db_pandora_audit(
+                    'Logon Failed',
+                    'Invalid login: '.$nick,
+                    $nick
+                );
                 while (@ob_end_flush()) {
+                    // Dumping...
+                    continue;
                 }
 
                 exit('</html>');
             } else {
                 include_once 'general/login_page.php';
-                db_pandora_audit('Logon Failed', 'Invalid login: '.$nick, $nick);
+                db_pandora_audit(
+                    'Logon Failed',
+                    'Invalid login: '.$nick,
+                    $nick
+                );
                 while (@ob_end_flush()) {
+                    // Dumping...
+                    continue;
                 }
 
                 exit('</html>');
             }
         }
 
-        // Form the url
+        // Form the url.
         $query_params_redirect = $_GET;
-        // Visual console do not want sec2
+        // Visual console do not want sec2.
         if ($home_page == 'Visual console') {
             unset($query_params_redirect['sec2']);
         }
@@ -630,15 +695,19 @@ if (! isset($config['id_user'])) {
             $redirect_url .= '&'.safe_url_extraclean($key).'='.safe_url_extraclean($value);
         }
 
-        header('Location: '.$config['homeurl'].'index.php'.$redirect_url);
+        header('Location: '.ui_get_full_url('index.php'.$redirect_url));
         exit;
         // Always exit after sending location headers.
     } else if (isset($_GET['loginhash'])) {
-        // Hash login process
+        // Hash login process.
         $loginhash_data = get_parameter('loginhash_data', '');
         $loginhash_user = str_rot13(get_parameter('loginhash_user', ''));
 
-        if ($config['loginhash_pwd'] != '' && $loginhash_data == md5($loginhash_user.io_output_password($config['loginhash_pwd']))) {
+        if ($config['loginhash_pwd'] != ''
+            && $loginhash_data == md5(
+                $loginhash_user.io_output_password($config['loginhash_pwd'])
+            )
+        ) {
             db_logon($loginhash_user, $_SERVER['REMOTE_ADDR']);
             $_SESSION['id_usuario'] = $loginhash_user;
             $config['id_user'] = $loginhash_user;
@@ -646,6 +715,8 @@ if (! isset($config['id_user'])) {
             include_once 'general/login_page.php';
             db_pandora_audit('Logon Failed (loginhash', '', 'system');
             while (@ob_end_flush()) {
+                // Dumping...
+                    continue;
             }
 
             exit('</html>');
@@ -767,7 +838,7 @@ if (! isset($config['id_user'])) {
                         $body .= '<p />';
                         $body .= __('Please click the link below to reset your password');
                         $body .= '<p />';
-                        $body .= '<a href="'.$config['homeurl'].'index.php?reset_hash='.$cod_hash.'">'.__('Reset your password').'</a>';
+                        $body .= '<a href="'.ui_get_full_url('index.php?reset_hash='.$cod_hash).'">'.__('Reset your password').'</a>';
                         $body .= '<p />';
                         $body .= get_product_name();
                         $body .= '<p />';
@@ -790,6 +861,8 @@ if (! isset($config['id_user'])) {
         }
 
         while (@ob_end_flush()) {
+            // Dumping...
+            continue;
         }
 
         exit('</html>');
@@ -799,11 +872,20 @@ if (! isset($config['id_user'])) {
         $loginhash_data = get_parameter('loginhash_data', '');
         $loginhash_user = str_rot13(get_parameter('loginhash_user', ''));
         $iduser = $_SESSION['id_usuario'];
-        // logoff_db ($iduser, $_SERVER["REMOTE_ADDR"]); check why is not available
+
+        /*
+         * Check why is not available.
+         * logoff_db ($iduser, $_SERVER["REMOTE_ADDR"]);
+         */
+
         unset($_SESSION['id_usuario']);
         unset($iduser);
 
-        if ($config['loginhash_pwd'] != '' && $loginhash_data == md5($loginhash_user.io_output_password($config['loginhash_pwd']))) {
+        if ($config['loginhash_pwd'] != ''
+            && $loginhash_data == md5(
+                $loginhash_user.io_output_password($config['loginhash_pwd'])
+            )
+        ) {
             db_logon($loginhash_user, $_SERVER['REMOTE_ADDR']);
             $_SESSION['id_usuario'] = $loginhash_user;
             $config['id_user'] = $loginhash_user;
@@ -811,6 +893,8 @@ if (! isset($config['id_user'])) {
             include_once 'general/login_page.php';
             db_pandora_audit('Logon Failed (loginhash', '', 'system');
             while (@ob_end_flush()) {
+                // Dumping...
+                continue;
             }
 
             exit('</html>');
@@ -823,7 +907,7 @@ if (! isset($config['id_user'])) {
         '*'
     );
     if ($user_in_db == false) {
-        // logout
+        // Logout.
         $_REQUEST = [];
         $_GET = [];
         $_POST = [];
@@ -834,6 +918,8 @@ if (! isset($config['id_user'])) {
         unset($iduser);
         include_once 'general/login_page.php';
         while (@ob_end_flush()) {
+            // Dumping...
+            continue;
         }
 
         exit('</html>');
@@ -841,7 +927,7 @@ if (! isset($config['id_user'])) {
         if (((bool) $user_in_db['is_admin'] === false)
             && ((bool) $user_in_db['not_login'] === true)
         ) {
-            // logout
+            // Logout.
             $_REQUEST = [];
             $_GET = [];
             $_POST = [];
@@ -852,6 +938,8 @@ if (! isset($config['id_user'])) {
             unset($iduser);
             include_once 'general/login_page.php';
             while (@ob_end_flush()) {
+                // Dumping...
+                continue;
             }
 
             exit('</html>');
@@ -859,12 +947,12 @@ if (! isset($config['id_user'])) {
     }
 }
 
-// Enterprise support
+// Enterprise support.
 if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
     include_once ENTERPRISE_DIR.'/load_enterprise.php';
 }
 
-// Log off
+// Log off.
 if (isset($_GET['bye'])) {
     include 'general/logoff.php';
     $iduser = $_SESSION['id_usuario'];
@@ -877,11 +965,13 @@ if (isset($_GET['bye'])) {
 
     if ($config['auth'] == 'saml') {
         include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-        $as = new SimpleSAML_Auth_Simple($config['saml_source']);
+        $as = new SimpleSAML_Auth_Simple('PandoraFMS');
         $as->logout();
     }
 
     while (@ob_end_flush()) {
+        // Dumping...
+        continue;
     }
 
     exit('</html>');
@@ -889,10 +979,11 @@ if (isset($_GET['bye'])) {
 
 clear_pandora_error_for_header();
 
-// ----------------------------------------------------------------------
-// EXTENSIONS
-// ----------------------------------------------------------------------
 /*
+ * ----------------------------------------------------------------------
+ *  EXTENSIONS
+ * ----------------------------------------------------------------------
+ *
  * Load the basic configurations of extension and add extensions into menu.
  * Load here, because if not, some extensions not load well, I don't why.
  */
@@ -901,7 +992,7 @@ $config['logged'] = false;
 extensions_load_extensions($process_login);
 
 if ($process_login) {
-     // Call all extensions login function
+    // Call all extensions login function.
     extensions_call_login_function();
 
     unset($_SESSION['new_update']);
@@ -992,7 +1083,7 @@ if (get_parameter('login', 0) !== 0) {
     }
 }
 
-// Header
+// Header.
 if ($config['pure'] == 0) {
     echo '<div id="container"><div id="head">';
     include 'general/header.php';
@@ -1008,24 +1099,27 @@ if ($config['pure'] == 0) {
     echo '<button onclick="topFunction()" id="top_btn" title="Go to top"></button>';
 } else {
     echo '<div id="main_pure">';
-    // Require menu only to build structure to use it in ACLs
+    // Require menu only to build structure to use it in ACLs.
     include 'operation/menu.php';
     include 'godmode/menu.php';
 }
 
-// http://es2.php.net/manual/en/ref.session.php#64525
-// Session locking concurrency speedup!
+/*
+ * Session locking concurrency speedup!
+ * http://es2.php.net/manual/en/ref.session.php#64525
+ */
+
 session_write_close();
 
 
-// Main block of content
+// Main block of content.
 if ($config['pure'] == 0) {
     echo '<div id="main">';
 }
 
 
 
-// Page loader / selector
+// Page loader / selector.
 if ($searchPage) {
     include 'operation/search_results.php';
 } else {
@@ -1049,7 +1143,7 @@ if ($searchPage) {
 
         $page .= '.php';
 
-        // Enterprise ACL check
+        // Enterprise ACL check.
         if (enterprise_hook(
             'enterprise_acl',
             [
@@ -1079,7 +1173,7 @@ if ($searchPage) {
             }
         }
     } else {
-        // 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']);
@@ -1110,6 +1204,7 @@ if ($searchPage) {
                 break;
 
                 case 'Default':
+                default:
                     $_GET['sec2'] = 'general/logon_ok';
                 break;
 
@@ -1148,12 +1243,11 @@ if ($searchPage) {
 
             if (isset($_GET['sec2'])) {
                 $file = $_GET['sec2'].'.php';
-                // Translate some secs
+                // Translate some secs.
                 $main_sec = get_sec($_GET['sec']);
-                $_GET['sec'] = $main_sec == false ? $_GET['sec'] : $main_sec;
+                $_GET['sec'] = ($main_sec == false) ? $_GET['sec'] : $main_sec;
                 if (!file_exists($file)
-                    || (                        $_GET['sec2'] != 'general/logon_ok'
-                    && enterprise_hook(
+                    || ($_GET['sec2'] != 'general/logon_ok' && enterprise_hook(
                         'enterprise_acl',
                         [
                             $config['id_user'],
@@ -1162,7 +1256,7 @@ if ($searchPage) {
                             true,
                             isset($_GET['sec3']) ? $_GET['sec3'] : '',
                         ]
-                    ) == false                    )
+                    ) == false)
                 ) {
                     unset($_GET['sec2']);
                     include 'general/noaccess.php';
@@ -1181,13 +1275,13 @@ if ($searchPage) {
 if ($config['pure'] == 0) {
     echo '<div style="clear:both"></div>';
     echo '</div>';
-    // main
+    // Main.
     echo '<div style="clear:both">&nbsp;</div>';
     echo '</div>';
-    // page (id = page)
+    // Page (id = page).
 } else {
     echo '</div>';
-    // main_pure
+    // Main pure.
 }
 
 echo '<div id="wiz_container">';
@@ -1211,31 +1305,34 @@ require_once 'include/functions_clippy.php';
 clippy_start($sec2);
 
 while (@ob_end_flush()) {
-    // Dump.
+    // Dumping...
+    continue;
 }
 
 db_print_database_debug();
 echo '</html>';
 
 $run_time = format_numeric((microtime(true) - $config['start_time']), 3);
-echo "\n<!-- Page generated in $run_time seconds -->\n";
+echo "\n<!-- Page generated in ".$run_time." seconds -->\n";
 
-// Values from PHP to be recovered from JAVASCRIPT
+// Values from PHP to be recovered from JAVASCRIPT.
 require 'include/php_to_js_values.php';
 
+
 ?>
 
 <script type="text/javascript" language="javascript">
 
-    // When there are less than 5 rows, all rows must be white
-   var theme = "<?php echo $config['style']; ?>";
-   if(theme === 'pandora'){
+       // When there are less than 5 rows, all rows must be white
+       var theme = "<?php echo $config['style']; ?>";
+        if(theme === 'pandora'){
         if($('table.info_table tr').length < 5){
             $('table.info_table tbody > tr').css('background-color', '#fff');
         }
     }
 
-    // When the user scrolls down 400px from the top of the document, show the button.
+    // When the user scrolls down 400px from the top of the document, show the
+    // button.
     window.onscroll = function() {scrollFunction()};
 
     function scrollFunction() {
@@ -1248,18 +1345,24 @@ require 'include/php_to_js_values.php';
 
     // When the user clicks on the button, scroll to the top of the document.
     function topFunction() {
-        //document.body.scrollTop = 0; // For Safari.
-        //document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera.
+
+        /*
+         * Safari.
+         * document.body.scrollTop = 0;
+         * For Chrome, Firefox, IE and Opera.
+         * document.documentElement.scrollTop = 0; 
+         */
+
         $("HTML, BODY").animate({ scrollTop: 0 }, 500);
     }
 
-    //Initial load of page
+    // Initial load of page.
     $(document).ready(adjustFooter);
     
-    //Every resize of window
+    // Every resize of window.
     $(window).resize(adjustFooter);
     
-    //Every show/hide call may need footer re-layout
+    // Every show/hide call may need footer re-layout.
     (function() {
         var oShow = jQuery.fn.show;
         var oHide = jQuery.fn.hide;
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 7b1d4833a6..f5dab45f3c 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -128,8 +128,8 @@
         </div>
         <div style='height: 10px'>
             <?php
-            $version = '7.0NG.736';
-            $build = '190712';
+            $version = '7.0NG.738';
+            $build = '190916';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index bb9dc7cef7..df2c36a1cd 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -624,6 +624,13 @@ if (empty($agents)) {
     $agents = [];
 }
 
+$agent_font_size = 'font-size:  7px';
+$description_font_size = 'font-size: 6.5px';
+if ($config['language'] == 'ja' || $config['language'] == 'zh_CN' || $own_info['language'] == 'ja' || $own_info['language'] == 'zh_CN') {
+    $agent_font_size = 'font-size: 15px';
+    $description_font_size = 'font-size: 11px';
+}
+
 // Urls to sort the table.
 $url_up_agente = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=name&amp;sort=up';
 $url_down_agente = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=name&amp;sort=down';
@@ -739,7 +746,7 @@ foreach ($agents as $agent) {
     $data[0] = '<div class="left_'.$agent['id_agente'].'">';
     $data[0] .= '<span>';
 
-    $data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_agente'].'"> <span style="font-size: 7pt;font-weight:bold" title ="'.$agent['nombre'].'">'.$agent['alias'].'</span></a>';
+    $data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_agente'].'"> <span style="'.$agent_font_size.';font-weight:bold" title ="'.$agent['nombre'].'">'.$agent['alias'].'</span></a>';
     $data[0] .= '</span>';
 
     if ($agent['quiet']) {
@@ -772,7 +779,7 @@ foreach ($agents as $agent) {
 
     $data[0] .= '</div></div>';
 
-    $data[1] = ui_print_truncate_text($agent['description'], 'description', false, true, true, '[&hellip;]', 'font-size: 6.5pt');
+    $data[1] = ui_print_truncate_text($agent['description'], 'description', false, true, true, '[&hellip;]', $description_font_size);
 
     $data[10] = '';
 
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 88b1d1a247..24aa44e098 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -461,26 +461,25 @@ if ($fields === false) {
 
 $custom_fields = [];
 foreach ($fields as $field) {
-    $data = [];
-    $data[0] = '<b>'.$field['name'].ui_print_help_tip(__('Custom field'), true).'</b>';
-        $custom_value = db_get_all_rows_sql(
-            'select tagent_custom_data.description,tagent_custom_fields.is_password_type from tagent_custom_fields 
-			INNER JOIN tagent_custom_data ON tagent_custom_fields.id_field = tagent_custom_data.id_field where tagent_custom_fields.id_field = '.$field['id_field'].' and tagent_custom_data.id_agent = '.$id_agente
-        );
+    $custom_value = db_get_all_rows_sql(
+        'select tagent_custom_data.description,tagent_custom_fields.is_password_type from tagent_custom_fields 
+        INNER JOIN tagent_custom_data ON tagent_custom_fields.id_field = tagent_custom_data.id_field where tagent_custom_fields.id_field = '.$field['id_field'].' and tagent_custom_data.id_agent = '.$id_agente
+    );
 
-    if ($custom_value[0]['description'] === false || $custom_value[0]['description'] == '') {
-        $custom_value[0]['description'] = '<i>-'.__('empty').'-</i>';
-    } else {
+    if ($custom_value[0]['description'] !== false && $custom_value[0]['description'] != '') {
+        $data = [];
+
+        $data[0] = '<b>'.$field['name'].ui_print_help_tip(__('Custom field'), true).'</b>';
         $custom_value[0]['description'] = ui_bbcode_to_html($custom_value[0]['description']);
-    }
 
-    if ($custom_value[0]['is_password_type']) {
-            $data[1] = '&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;';
-    } else {
-        $data[1] = $custom_value[0]['description'];
-    }
+        if ($custom_value[0]['is_password_type']) {
+                $data[1] = '&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;';
+        } else {
+            $data[1] = $custom_value[0]['description'];
+        }
 
-    $custom_fields[] = $data;
+        $custom_fields[] = $data;
+    }
 }
 
 $custom_fields_count = count($custom_fields);
diff --git a/pandora_console/operation/agentes/exportdata.php b/pandora_console/operation/agentes/exportdata.php
index 6fbefa93dd..5743084f6a 100644
--- a/pandora_console/operation/agentes/exportdata.php
+++ b/pandora_console/operation/agentes/exportdata.php
@@ -243,9 +243,10 @@ if (empty($export_btn) || $show_form) {
         false
     );
 
-    // Agent selector
+    // Agent selector.
     $table->data[1][0] = '<b>'.__('Source agent').'</b>';
 
+    $filter = [];
     if ($group > 0) {
         $filter['id_grupo'] = (array) $group;
     } else {
diff --git a/pandora_console/operation/agentes/graphs.php b/pandora_console/operation/agentes/graphs.php
index 79ff02b021..308481d8e0 100644
--- a/pandora_console/operation/agentes/graphs.php
+++ b/pandora_console/operation/agentes/graphs.php
@@ -244,14 +244,18 @@ $htmlForm = '<form method="post" action="index.php?sec=estado&sec2=operation/age
 $htmlForm .= html_print_table($table, true);
 $htmlForm .= html_print_input_hidden('filter', 1, true);
 $htmlForm .= '<div class="action-buttons" style="width: '.$table->width.'">';
-$htmlForm .= html_print_button(
-    __('Save as custom graph'),
-    'save_custom_graph',
-    false,
-    '',
-    'class="sub add" style=""',
-    true
-).'&nbsp;&nbsp;'.html_print_submit_button(__('Filter'), 'filter_button', false, 'class="sub upd" style=""', true);
+if (check_acl($config['id_user'], 0, 'RW') || check_acl($config['id_user'], 0, 'RM')) {
+    $htmlForm .= html_print_button(
+        __('Save as custom graph'),
+        'save_custom_graph',
+        false,
+        '',
+        'class="sub add" style=""',
+        true
+    );
+}
+
+$htmlForm .= '&nbsp;&nbsp;'.html_print_submit_button(__('Filter'), 'filter_button', false, 'class="sub upd" style=""', true);
 $htmlForm .= '</div>';
 $htmlForm .= '</form>';
 
diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php
index 35eb712146..2aa1404e30 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.php
@@ -795,7 +795,7 @@ switch ($tab) {
             echo "<div style='width: ".$table->width."; margin-top: 5px;'>";
             echo '<form method="post" action="index.php?sec=network&amp;sec2=operation/agentes/pandora_networkmap">';
             html_print_input_hidden('new_networkmap', 1);
-            html_print_submit_button(__('Create networkmap'), 'crt', false, 'class="sub next" style="float: right;"');
+            html_print_submit_button(__('Create network map'), 'crt', false, 'class="sub next" style="float: right;"');
             echo '</form>';
             echo '</div>';
 
@@ -803,7 +803,7 @@ switch ($tab) {
                 echo "<div style='width: ".$table->width."; margin-top: 5px;'>";
                 echo '<form method="post" action="index.php?sec=network&amp;sec2=operation/agentes/pandora_networkmap">';
                 html_print_input_hidden('new_empty_networkmap', 1);
-                html_print_submit_button(__('Create empty networkmap'), 'crt', false, 'class="sub next" style="float: right; margin-right:20px;"');
+                html_print_submit_button(__('Create empty network map'), 'crt', false, 'class="sub next" style="float: right; margin-right:20px;"');
                 echo '</form>';
                 echo '</div>';
             }
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index b625595930..7444dda595 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1559,8 +1559,11 @@ switch ($tab) {
         include 'estado_monitores.php';
         echo "<a name='alerts'></a>";
         include 'alerts_status.php';
-        echo "<a name='events'></a>";
-        include 'status_events.php';
+        // Check permissions to read events
+        if (check_acl($config['id_user'], 0, 'ER')) {
+            echo "<a name='events'></a>";
+            include 'status_events.php';
+        }
     break;
 
     case 'data_view':
diff --git a/pandora_console/operation/events/event_statistics.php b/pandora_console/operation/events/event_statistics.php
index a4a5b1632a..00dd1f4bc6 100644
--- a/pandora_console/operation/events/event_statistics.php
+++ b/pandora_console/operation/events/event_statistics.php
@@ -62,7 +62,7 @@ echo '<table width=95%>';
         echo '</td>';
 
         echo "<td valign='top'>";
-            echo grafico_eventos_usuario(320, 296);
+            echo grafico_eventos_usuario(320, 280);
         echo '</td>';
     echo '</tr>';
 
@@ -83,7 +83,7 @@ if (!users_is_admin()) {
 
     echo '<tr>';
         echo "<td valign='top'>";
-            echo grafico_eventos_grupo(300, 200, $where);
+            echo grafico_eventos_grupo(300, 250, $where);
         echo '</td>';
 
         echo "<td valign='top'>";
@@ -101,7 +101,7 @@ if (!users_is_admin()) {
     ];
 }
 
-            echo graph_events_validated(320, 296, $extra_filter);
+            echo graph_events_validated(320, 250, $extra_filter);
         echo '</td>';
     echo '</tr>';
 
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 9561872288..786743b8d0 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -246,6 +246,8 @@ if (is_ajax()) {
                 $fields[] = 'ta.server_name as server_name';
             } else {
                 $fields[] = 'ts.server_name as server_name';
+                $fields[] = 'te.id_agentmodule';
+                $fields[] = 'te.server_id';
             }
 
             $events = events_get_all(
@@ -278,7 +280,19 @@ if (is_ajax()) {
                     $events,
                     function ($carry, $item) {
                         $tmp = (object) $item;
-                        $tmp->evento = io_safe_output($tmp->evento);
+                        $tmp->hint = '';
+                        $tmp->meta = false;
+                        if (strlen($tmp->evento) >= 255) {
+                            $tmp->hint = io_safe_output(chunk_split(substr($tmp->evento, 0, 600), 80, '<br>').'(...)');
+                            $tmp->meta = is_metaconsole();
+                            $tmp->evento = io_safe_output(substr($tmp->evento, 0, 253).'(...)');
+                            if (strpos($tmp->evento, ' ') === false) {
+                                $tmp->evento = substr($tmp->evento, 0, 80).'(...)';
+                            }
+                        } else {
+                            $tmp->evento = io_safe_output($tmp->evento);
+                        }
+
                         if ($tmp->module_name) {
                             $tmp->module_name = io_safe_output($tmp->module_name);
                         }
@@ -595,9 +609,9 @@ if ($pure) {
 
     // Countdown.
     echo '<li class="nomn">';
-    echo '<div class="vc-refr">';
-    echo '<div class="vc-countdown"></div>';
-    echo '<div id="vc-refr-form">';
+    echo '<div class="events-refr">';
+    echo '<div class="events-countdown"><span id="refrcounter"></span></div>';
+    echo '<div id="events-refr-form">';
     echo __('Refresh').':';
     echo html_print_select(
         get_refresh_time_array(),
@@ -970,7 +984,7 @@ if (is_metaconsole()) {
         'SELECT id, server_name FROM tmetaconsole_setup',
         'server_id',
         $server_id,
-        'script',
+        '',
         __('All'),
         '0',
         true
@@ -1017,15 +1031,14 @@ $adv_inputs[] = $in;
 // Only alert events.
 $data = html_print_select(
     [
-        '-1' => __('All'),
-        '0'  => __('Filter alert events'),
-        '1'  => __('Only alert events'),
+        '0' => __('Filter alert events'),
+        '1' => __('Only alert events'),
     ],
     'filter_only_alert',
     $filter_only_alert,
     '',
-    '',
-    '',
+    __('All'),
+    -1,
     true
 );
 $in = '<div class="filter_input"><label>'.__('Alert events').'</label>';
@@ -1258,7 +1271,13 @@ try {
     );
 
     // Get column names.
-    $column_names = events_get_column_names($fields);
+    $column_names = events_get_column_names($fields, true);
+
+    foreach ($column_names as $key => $column) {
+        if (is_array($column) && $column['text'] == 'S') {
+            $column_names[$key]['style'] = 'padding-left: 1em !important;';
+        }
+    }
 
     // Open current filter quick reference.
     $active_filters_div = '<div class="filter_summary">';
@@ -1469,6 +1488,11 @@ echo "<div id='event_response_command_window' title='".__('Parameters')."'></div
 // Load filter div for dialog.
 echo '<div id="load-modal-filter" style="display: none"></div>';
 echo '<div id="save-modal-filter" style="display: none"></div>';
+
+if ($_GET['refr'] || $do_refresh === true) {
+    $autorefresh_draw = true;
+}
+
 ?>
 <script type="text/javascript">
 var loading = 0;
@@ -1548,6 +1572,21 @@ function process_datatables_callback(table, settings) {
 
         })
     }
+
+    var autorefresh_draw = '<?php echo $autorefresh_draw; ?>';
+    if (autorefresh_draw == true){
+        $("#refrcounter").countdown('change', {
+            until: countdown_repeat()
+        });
+
+        function countdown_repeat() {
+            var until_time = new Date();
+            until_time.setTime (until_time.getTime () + parseInt(<?php echo ($config['refr'] * 1000); ?>));
+            return until_time;
+        }
+
+    }
+
 }
 
 function process_datatables_item(item) {
@@ -1611,6 +1650,10 @@ function process_datatables_item(item) {
         evn += '('+item.event_rep+') ';
     }
     evn += item.evento+'</a>';
+    if(item.hint !== ''){
+        let ruta = item.meta == true ? '../../images/tip_help.png' : 'images/tip_help.png';
+        evn += '&nbsp;<img src="'+ruta+'" data-title="'+item.hint+'" data-use_title_for_force_title="1" class="forced_title" alt="'+item.hint+'">';
+    }
 
     item.mini_severity = '<div class="event flex-row h100p nowrap">';
     item.mini_severity += output;
@@ -2087,6 +2130,10 @@ function reorder_tags_inputs() {
 }
 /* Tag management ends */
 $(document).ready( function() {
+
+    let refresco = <?php echo get_parameter('refr', 0); ?>;
+    $('#refresh option[value='+refresco+']').attr('selected', 'selected');
+
     /* Filter to a href */
     $('.events_link').on('click', function(e) {
         e.preventDefault();
@@ -2101,6 +2148,7 @@ $(document).ready( function() {
 
         var url = e.currentTarget.href;
         url += 'fb64=' + btoa(JSON.stringify(values));
+        url += '&refr=' + '<?php echo $config['refr']; ?>';
         document.location = url;
 
     });
@@ -2237,6 +2285,60 @@ $(document).ready( function() {
         click_button_remove_tag("without");
     });
     
+
+    //Autorefresh in fullscreen
+    var pure = '<?php echo $pure; ?>';
+    if(pure == 1){
+        var refresh_interval = parseInt('<?php echo ($config['refr'] * 1000); ?>');
+        var until_time='';
+
+        // If autorefresh is disabled, don't show the countdown   
+        var refresh_time = '<?php echo $_GET['refr']; ?>'; 
+        if(refresh_time == '' || refresh_time == 0){
+            $('#refrcounter').toggle();
+        }
+
+        function events_refresh() {
+            until_time = new Date();
+            until_time.setTime (until_time.getTime () + parseInt(<?php echo ($config['refr'] * 1000); ?>));
+
+            $("#refrcounter").countdown ({
+                until: until_time,
+                layout: '(%M%nn%M:%S%nn%S <?php echo __('Until next'); ?>)',
+                labels: ['', '', '', '', '', '', ''],
+                onExpiry: function () {
+                    dt_events.draw(false);
+                }
+            });
+        }
+        // Start the countdown when page is loaded (first time).
+        events_refresh();
+        // Repeat countdown according to refresh_interval.
+        setInterval(events_refresh, refresh_interval);
+
+
+        $("select#refresh").change (function () {
+            var href = window.location.href;
+
+            inputs = $("#events_form :input");
+            values = {};
+            inputs.each(function() {
+                values[this.name] = $(this).val();
+            })
+
+            var newValue = btoa(JSON.stringify(values));           
+            var fb64 = '<?php echo $fb64; ?>';  
+            // Check if the filters have changed.
+            if(fb64 !== newValue){
+                href = href.replace(fb64, newValue);
+            } 
+                
+            href = href.replace('refr='+refresh_time, 'refr='+this.value);
+
+            $(document).attr("location", href);
+        });
+    }
+
 });
 
 
diff --git a/pandora_console/operation/events/events_marquee.php b/pandora_console/operation/events/events_marquee.php
index 4834207172..b3332e56bf 100644
--- a/pandora_console/operation/events/events_marquee.php
+++ b/pandora_console/operation/events/events_marquee.php
@@ -17,7 +17,7 @@ error_reporting(1);
 $MAX_MARQUEE_EVENTS = 10;
 $MARQUEE_INTERVAL = 90;
 $MARQUEE_FONT_SIZE = '32px';
-$MARQUEE_SPEED = 12;
+$MARQUEE_SPEED = 9;
 
 $output = '';
 
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index 1bd1dcc444..6d337abc28 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -59,7 +59,7 @@ echo '</head>';
 echo "<body style='background-color: #494949; max-width: 550px; max-height: 400px; margin-top:40px;'>";
 echo "<h1 class='modalheaderh1'>".__('Sound console').'</h1>';
 
-$table = null;
+$table = new StdClass;
 $table->width = '100%';
 $table->styleTable = 'padding-left:16px; padding-right:16px; padding-top:16px;';
 $table->class = ' ';
@@ -82,7 +82,7 @@ $table->data[1][3] = html_print_textarea('events_fired', 200, 20, '', 'readonly=
 
 html_print_table($table);
 
-$table = null;
+$table = new StdClass;
 $table->width = '100%';
 $table->rowstyle[0] = 'text-align:center;';
 $table->styleTable = 'padding-top:16px;padding-bottom:16px;';
@@ -196,15 +196,15 @@ function forgetPreviousEvents() {
     var agents = $("#id_agents").val();
 
     jQuery.post ("../../ajax.php",
-        {"page" : "operation/events/events",
+        {"page" : "include/ajax/events",
             "get_events_fired": 1,
             "id_group": group,
-            "agents[]" : agents,
             "alert_fired": alert_fired,
             "critical": critical,
             "warning": warning,
             "unknown": unknown,
-            "id_row": id_row
+            "id_row": id_row,
+            "agents[]" : agents
         },
         function (data) {
             firedId = parseInt(data['fired']);
@@ -219,18 +219,17 @@ function forgetPreviousEvents() {
 
 function check_event() {
     var agents = $("#id_agents").val();
-    
     if (running) {
         jQuery.post ("../../ajax.php",
-            {"page" : "operation/events/events",
+            {"page" : "include/ajax/events",
                 "get_events_fired": 1,
                 "id_group": group,
-                "agents[]" : agents,
                 "alert_fired": alert_fired,
                 "critical": critical,
                 "warning": warning,
                 "unknown": unknown,
-                "id_row": id_row
+                "id_row": id_row,
+                "agents[]" : agents,
             },
             function (data) {
                 firedId = parseInt(data['fired']);
@@ -247,7 +246,6 @@ function check_event() {
                     $('audio').remove();
                     $('body').append("<audio src='../../" + data['sound'] + "' autoplay='true' hidden='true' loop='true'>");
                 }
-                
             },
             "json"
         );
diff --git a/pandora_console/operation/search_graphs.getdata.php b/pandora_console/operation/search_graphs.getdata.php
index 4dc6f3ba74..4235ea40c6 100644
--- a/pandora_console/operation/search_graphs.getdata.php
+++ b/pandora_console/operation/search_graphs.getdata.php
@@ -43,7 +43,7 @@ if ($searchGraphs) {
 
     $totalGraphs = (int) db_get_value_filter('COUNT(id_graph) AS count', 'tgraph', $filter);
 
-    if (! $only_count && $totalGraphs > 0) {
+    if ($totalGraphs > 0) {
         $filter['limit'] = $config['block_size'];
         $filter['offset'] = (int) get_parameter('offset');
         $graphs = db_get_all_rows_filter('tgraph', $filter, $columns);
diff --git a/pandora_console/operation/search_policies.getdata.php b/pandora_console/operation/search_policies.getdata.php
index a8c05ea071..5186f1f0a9 100644
--- a/pandora_console/operation/search_policies.getdata.php
+++ b/pandora_console/operation/search_policies.getdata.php
@@ -16,7 +16,7 @@ global $config;
 enterprise_include_once('include/functions_policies.php');
 
 
-$searchpolicies = check_acl($config['id'], 0, 'AW');
+$searchpolicies = check_acl($config['id_user'], 0, 'AW');
 
 $selectpolicieIDUp = '';
 $selectpolicieIDDown = '';
diff --git a/pandora_console/operation/snmpconsole/snmp_statistics.php b/pandora_console/operation/snmpconsole/snmp_statistics.php
index afe05be977..076ca806d7 100755
--- a/pandora_console/operation/snmpconsole/snmp_statistics.php
+++ b/pandora_console/operation/snmpconsole/snmp_statistics.php
@@ -155,7 +155,7 @@ foreach ($traps_generated_by_source as $trap) {
         $row['source'] = '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&new_agent=1&direccion='.$trap['source'].'" title="'.__('Create agent').'">'.$trap['source'].'</a>';
     } else {
         $agent_id = $agent['id_agente'];
-        $agent_name = ui_print_truncate_text($agent['nombre'], 'agent_medium', true, true, true, '[&hellip;]', '');
+        $agent_name = ui_print_truncate_text($agent['alias'], 'agent_medium', true, true, true, '[&hellip;]', '');
         $row['source'] = "<a href=\"index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=$agent_id\" title=\"".__('View agent details').'">';
         $row['source'] .= "<strong>$agent_name</strong></a>";
     }
diff --git a/pandora_console/operation/snmpconsole/snmp_view.php b/pandora_console/operation/snmpconsole/snmp_view.php
index c7f69b4109..677a7a625a 100755
--- a/pandora_console/operation/snmpconsole/snmp_view.php
+++ b/pandora_console/operation/snmpconsole/snmp_view.php
@@ -1,17 +1,31 @@
 <?php
+/**
+ * SNMP Console.
+ *
+ * @category   SNMP
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// Load global vars
 global $config;
 enterprise_include('operation/snmpconsole/snmp_view.php');
 enterprise_include('include/functions_snmp.php');
@@ -31,7 +45,7 @@ if (!$agent_a && !$agent_w) {
     exit;
 }
 
-// Read parameters
+// Read parameters.
 $filter_severity = (int) get_parameter('filter_severity', -1);
 $filter_fired = (int) get_parameter('filter_fired', -1);
 $filter_status = (int) get_parameter('filter_status', 0);
@@ -61,7 +75,7 @@ foreach ($user_groups as $id => $name) {
     $i++;
 }
 
-$url = 'index.php?sec=estado&'.'sec2=operation/snmpconsole/snmp_view&'.'filter_severity='.$filter_severity.'&'.'filter_fired='.$filter_fired.'&'.'free_search_string='.$free_search_string.'&'.'pagination='.$pagination.'&'.'offset='.$offset.'&'.'trap_type='.$trap_type.'&'.'group_by='.$group_by.'&'.'date_from_trap='.$date_from_trap.'&'.'date_to_trap='.$date_to_trap.'&'.'time_from_trap='.$time_from_trap.'&'.'time_to_trap='.$time_to_trap;
+$url = 'index.php?sec=estado&sec2=operation/snmpconsole/snmp_view&filter_severity='.$filter_severity.'&filter_fired='.$filter_fired.'&free_search_string='.$free_search_string.'&pagination='.$pagination.'&offset='.$offset.'&trap_type='.$trap_type.'&group_by='.$group_by.'&date_from_trap='.$date_from_trap.'&date_to_trap='.$date_to_trap.'&time_from_trap='.$time_from_trap.'&time_to_trap='.$time_to_trap;
 
 $statistics['text'] = '<a href="index.php?sec=estado&sec2=operation/snmpconsole/snmp_statistics&pure='.$config['pure'].'&refr='.$refr.'">'.html_print_image('images/op_reporting.png', true, ['title' => __('Statistics')]).'</a>';
 $list['text'] = '<a href="'.$url.'&pure='.$config['pure'].'&refresh='.$refr.'">'.html_print_image('images/op_snmp.png', true, ['title' => __('List')]).'</a>';
@@ -70,7 +84,7 @@ $list['active'] = true;
 if ($config['pure']) {
     $fullscreen['text'] = '<a target="_top" href="'.$url.'&pure=0&refresh='.$refr.'">'.html_print_image('images/normal_screen.png', true, ['title' => __('Normal screen')]).'</a>';
 } else {
-    // Fullscreen
+    // Fullscreen.
     $fullscreen['text'] = '<a target="_top" href="'.$url.'&pure=1&refresh='.$refr.'">'.html_print_image('images/full_screen.png', true, ['title' => __('Full screen')]).'</a>';
 }
 
@@ -131,7 +145,7 @@ if (isset($_GET['check'])) {
     }
 }
 
-// Mass-process DELETE
+// Mass-process DELETE.
 if (isset($_POST['deletebt'])) {
     $trap_ids = get_parameter_post('snmptrapid', []);
     if (is_array($trap_ids) && check_acl($config['id_user'], 0, 'IW')) {
@@ -161,7 +175,7 @@ if (isset($_POST['deletebt'])) {
     }
 }
 
-// Mass-process UPDATE
+// Mass-process UPDATE.
 if (isset($_POST['updatebt'])) {
     $trap_ids = get_parameter_post('snmptrapid', []);
     if (is_array($trap_ids) && check_acl($config['id_user'], 0, 'IW')) {
@@ -178,14 +192,14 @@ if (isset($_POST['updatebt'])) {
     }
 }
 
-// All traps
+// All traps.
 $all_traps = db_get_all_rows_sql('SELECT DISTINCT source FROM ttrap');
 
 if (empty($all_traps)) {
     $all_traps = [];
 }
 
-// Set filters
+// Set filters.
 $agents = [];
 $oids = [];
 $severities = get_priorities();
@@ -206,7 +220,7 @@ foreach ($all_traps as $trap) {
 
 $prea = array_keys($user_groups);
 $ids = join(',', $prea);
-// Cuantos usuarios hay operadores con un grupo que exista y no lo tenga ningun usuario
+// Cuantos usuarios hay operadores con un grupo que exista y no lo tenga ningun usuario.
 $user_in_group_wo_agents = db_get_value_sql('select count(DISTINCT(id_usuario)) from tusuario_perfil where id_usuario ="'.$config['id_user'].'" and id_perfil = 1 and id_grupo in (select id_grupo from tgrupo where id_grupo in ('.$ids.') and id_grupo not in (select id_grupo from tagente))');
 
 switch ($config['dbtype']) {
@@ -244,6 +258,10 @@ switch ($config['dbtype']) {
             }
         }
     break;
+
+    default:
+        // Default.
+    break;
 }
 
 if (empty($address_by_user_groups)) {
@@ -293,6 +311,10 @@ switch ($config['dbtype']) {
 					) OR source='' OR source NOT IN (SELECT direccion FROM tagente WHERE direccion IS NOT NULL)) %s
 			ORDER BY timestamp DESC";
     break;
+
+    default:
+         // Default.
+    break;
 }
 
 switch ($config['dbtype']) {
@@ -335,6 +357,10 @@ switch ($config['dbtype']) {
 					) OR source='' OR source NOT IN (SELECT direccion FROM tagente WHERE direccion IS NOT NULL))
 				%s";
     break;
+
+    default:
+         // Default.
+    break;
 }
 
 // $whereSubquery = 'WHERE 1=1';
@@ -372,6 +398,10 @@ if ($free_search_string != '') {
 				text LIKE \'%'.$free_search_string.'%\' OR
 				description LIKE \'%'.$free_search_string.'%\')';
         break;
+
+        default:
+             // Default.
+        break;
     }
 }
 
@@ -422,7 +452,7 @@ if ($trap_type == 5) {
     $whereSubquery .= ' AND type = '.$trap_type;
 }
 
-// Disable this feature (time will decide if temporarily) in Oracle cause the group by is very confictive
+// Disable this feature (time will decide if temporarily) in Oracle cause the group by is very confictive.
 if ($group_by && $config['dbtype'] != 'oracle') {
     $where_without_group = $whereSubquery;
     $whereSubquery .= ' GROUP BY source,oid';
@@ -444,6 +474,10 @@ switch ($config['dbtype']) {
         $sql = sprintf($sql, $whereSubquery);
         $sql = oracle_recode_query($sql, $set);
     break;
+
+    default:
+        // Default.
+    break;
 }
 
 $sql_all = sprintf($sql_all, $whereSubquery);
@@ -458,7 +492,7 @@ $table->size = [];
 $table->size[0] = '120px';
 $table->data = [];
 
-// Alert status select
+// Alert status select.
 $table->data[1][0] = '<strong>'.__('Alert').'</strong>';
 $table->data[1][1] = html_print_select(
     $alerted,
@@ -470,7 +504,7 @@ $table->data[1][1] = html_print_select(
     true
 );
 
-// Block size for pagination select
+// Block size for pagination select.
 $table->data[2][0] = '<strong>'.__('Block size for pagination').'</strong>';
 $paginations[25] = 25;
 $paginations[50] = 50;
@@ -487,7 +521,7 @@ $table->data[2][1] = html_print_select(
     true
 );
 
-// Severity select
+// Severity select.
 $table->data[1][2] = '<strong>'.__('Severity').'</strong>';
 $table->data[1][3] = html_print_select(
     $severities,
@@ -499,7 +533,7 @@ $table->data[1][3] = html_print_select(
     true
 );
 
-// Status
+// Status.
 $table->data[3][0] = '<strong>'.__('Status').'</strong>';
 
 $status_array[-1] = __('All');
@@ -515,7 +549,7 @@ $table->data[3][1] = html_print_select(
     true
 );
 
-// Free search (search by all alphanumeric fields)
+// Free search (search by all alphanumeric fields).
 $table->data[2][3] = '<strong>'.__('Free search').'</strong>'.ui_print_help_tip(
     __(
         'Search by any alphanumeric field in the trap.
@@ -542,7 +576,7 @@ $table->data[5][1] = html_print_input_text('time_from_trap', $time_from_trap, fa
 $table->data[5][2] = '<strong>'.__('To (Time)').'</strong>';
 $table->data[5][3] = html_print_input_text('time_to_trap', $time_to_trap, false, 15, 10, true);
 
-// Type filter (ColdStart, WarmStart, LinkDown, LinkUp, authenticationFailure, Other)
+// Type filter (ColdStart, WarmStart, LinkDown, LinkUp, authenticationFailure, Other).
 $table->data[6][1] = '<strong>'.__('Trap type').'</strong>'.ui_print_help_tip(__('Search by trap type'), true);
 $trap_types = [
     -1 => __('None'),
@@ -565,14 +599,14 @@ $table->data[6][2] = html_print_select(
     false
 );
 
-// Disable this feature (time will decide if temporarily) in Oracle cause the group by is very confictive
+// Disable this feature (time will decide if temporarily) in Oracle cause the group by is very confictive.
 if ($config['dbtype'] != 'oracle') {
     $table->data[3][3] = '<strong>'.__('Group by Enterprise String/IP').'</strong>';
     $table->data[3][4] = __('Yes').'&nbsp;'.html_print_radio_button('group_by', 1, '', $group_by, true).'&nbsp;&nbsp;';
     $table->data[3][4] .= __('No').'&nbsp;'.html_print_radio_button('group_by', 0, '', $group_by, true);
 }
 
-$filter = '<form method="POST" action="index.php?'.'sec=snmpconsole&'.'sec2=operation/snmpconsole/snmp_view&'.'refresh='.((int) get_parameter('refresh', 0)).'&'.'pure='.$config['pure'].'">';
+$filter = '<form method="POST" action="index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&refresh='.((int) get_parameter('refresh', 0)).'&pure='.$config['pure'].'">';
 $filter .= html_print_table($table, true);
 $filter .= '<div style="width: '.$table->width.'; text-align: right;">';
 $filter .= html_print_submit_button(__('Update'), 'search', false, 'class="sub upd"', true);
@@ -595,9 +629,9 @@ $filter_resume['trap_type'] = $trap_types[$trap_type];
 $traps = db_get_all_rows_sql($sql);
 $trapcount = (int) db_get_value_sql($sql_count);
 
-// No traps
+// No traps.
 if (empty($traps)) {
-    // Header
+    // Header.
     ui_print_page_header(
         __('SNMP Console'),
         'images/op_snmp.png',
@@ -638,24 +672,24 @@ if (empty($traps)) {
 
         echo '<div id="menu_tab">';
         echo '<ul class="mn">';
-        // Normal view button
+        // Normal view button.
         echo '<li class="nomn">';
-        $normal_url = 'index.php?'.'sec=snmpconsole&'.'sec2=operation/snmpconsole/snmp_view&'.'filter_severity='.$filter_severity.'&'.'filter_fired='.$filter_fired.'&'.'filter_status='.$filter_status.'&'.'refresh='.((int) get_parameter('refresh', 0)).'&'.'pure=0&'.'trap_type='.$trap_type.'&'.'group_by='.$group_by.'&'.'free_search_string='.$free_search_string.'&'.'date_from_trap='.$date_from_trap.'&'.'date_to_trap='.$date_to_trap.'&'.'time_from_trap='.$time_from_trap.'&'.'time_to_trap='.$time_to_trap;
+        $normal_url = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&filter_severity='.$filter_severity.'&filter_fired='.$filter_fired.'&filter_status='.$filter_status.'&refresh='.((int) get_parameter('refresh', 0)).'&pure=0&trap_type='.$trap_type.'&group_by='.$group_by.'&free_search_string='.$free_search_string.'&date_from_trap='.$date_from_trap.'&date_to_trap='.$date_to_trap.'&time_from_trap='.$time_from_trap.'&time_to_trap='.$time_to_trap;
 
-        $urlPagination = $normal_url.'&'.'pagination='.$pagination.'&'.'offset='.$offset;
+        $urlPagination = $normal_url.'&pagination='.$pagination.'&offset='.$offset;
 
         echo '<a href="'.$urlPagination.'">';
         echo html_print_image('images/normal_screen.png', true, ['title' => __('Exit fullscreen')]);
         echo '</a>';
         echo '</li>';
 
-        // Auto refresh control
+        // Auto refresh control.
         echo '<li class="nomn">';
         echo '<div class="dashboard-refr" style="margin-top: 6px;">';
         echo '<div class="dashboard-countdown" style="display: inline;"></div>';
-        $normal_url = 'index.php?'.'sec=snmpconsole&'.'sec2=operation/snmpconsole/snmp_view&'.'filter_severity='.$filter_severity.'&'.'filter_fired='.$filter_fired.'&'.'filter_status='.$filter_status.'&'.'refresh='.((int) get_parameter('refresh', 0)).'&'.'pure=1&'.'trap_type='.$trap_type.'&'.'group_by='.$group_by.'&'.'free_search_string='.$free_search_string.'&'.'date_from_trap='.$date_from_trap.'&'.'date_to_trap='.$date_to_trap.'&'.'time_from_trap='.$time_from_trap.'&'.'time_to_trap='.$time_to_trap;
+        $normal_url = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&filter_severity='.$filter_severity.'&filter_fired='.$filter_fired.'&filter_status='.$filter_status.'&refresh='.((int) get_parameter('refresh', 0)).'&pure=1&trap_type='.$trap_type.'&group_by='.$group_by.'&free_search_string='.$free_search_string.'&date_from_trap='.$date_from_trap.'&date_to_trap='.$date_to_trap.'&time_from_trap='.$time_from_trap.'&time_to_trap='.$time_to_trap;
 
-        $urlPagination = $normal_url.'&'.'pagination='.$pagination.'&'.'offset='.$offset;
+        $urlPagination = $normal_url.'&pagination='.$pagination.'&offset='.$offset;
 
 
         echo '<form id="refr-form" method="get" action="'.$urlPagination.'" style="display: inline;">';
@@ -669,7 +703,7 @@ if (empty($traps)) {
         html_print_input_hidden('pure', 1);
         html_print_input_hidden('refresh', ($refr > 0 ? $refr : $default_refr));
 
-        // Dashboard name
+        // Dashboard name.
         echo '<li class="nomn">';
         echo '<div class="dashboard-title">'.__('SNMP Traps').'</div>';
         echo '</li>';
@@ -688,7 +722,7 @@ if (empty($traps)) {
         ui_require_javascript_file('wz_jsgraphics');
         ui_require_javascript_file('pandora_visual_console');
     } else {
-        // Header
+        // Header.
         ui_print_page_header(
             __('SNMP Console'),
             'images/op_snmp.png',
@@ -710,18 +744,19 @@ unset($table);
 print_snmp_tags_active_filters($filter_resume);
 
 if (($config['dbtype'] == 'oracle') && ($traps !== false)) {
-    for ($i = 0; $i < count($traps); $i++) {
+    $traps_size = count($traps);
+    for ($i = 0; $i < $traps_size; $i++) {
         unset($traps[$i]['rnum']);
     }
 }
 
-$url_snmp = 'index.php?'.'sec=snmpconsole&'.'sec2=operation/snmpconsole/snmp_view&'.'filter_severity='.$filter_severity.'&'.'filter_fired='.$filter_fired.'&'.'filter_status='.$filter_status.'&'.'refresh='.((int) get_parameter('refresh', 0)).'&'.'pure='.$config['pure'].'&'.'trap_type='.$trap_type.'&'.'group_by='.$group_by.'&'.'free_search_string='.$free_search_string.'&'.'date_from_trap='.$date_from_trap.'&'.'date_to_trap='.$date_to_trap.'&'.'time_from_trap='.$time_from_trap.'&'.'time_to_trap='.$time_to_trap;
+$url_snmp = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&filter_severity='.$filter_severity.'&filter_fired='.$filter_fired.'&filter_status='.$filter_status.'&refresh='.((int) get_parameter('refresh', 0)).'&pure='.$config['pure'].'&trap_type='.$trap_type.'&group_by='.$group_by.'&free_search_string='.$free_search_string.'&date_from_trap='.$date_from_trap.'&date_to_trap='.$date_to_trap.'&time_from_trap='.$time_from_trap.'&time_to_trap='.$time_to_trap;
 
-$urlPagination = $url_snmp.'&'.'pagination='.$pagination.'&'.'offset='.$offset;
+$urlPagination = $url_snmp.'&pagination='.$pagination.'&offset='.$offset;
 
 ui_pagination($trapcount, $urlPagination, $offset, $pagination);
 
-echo '<form name="eventtable" method="POST" action="'.$url_snmp.'">';
+echo '<form name="eventtable" method="POST" action="'.$urlPagination.'">';
 
 $table->cellpadding = 0;
 $table->cellspacing = 0;
@@ -795,7 +830,7 @@ $table->headstyle[9] = 'text-align: center';
 
 $table->style[8] = 'background: #F3F3F3; color: #111 !important;';
 
-// Skip offset records
+// Skip offset records.
 $idx = 0;
 if ($traps !== false) {
     foreach ($traps as $trap) {
@@ -809,7 +844,7 @@ if ($traps !== false) {
             $severity = $trap['alerted'] == 1 ? $trap['priority'] : 1;
         }
 
-        // Status
+        // Status.
         if ($trap['status'] == 0) {
             $data[0] = html_print_image(
                 'images/pixel_red.png',
@@ -832,7 +867,7 @@ if ($traps !== false) {
             );
         }
 
-        // Agent matching source address
+        // Agent matching source address.
         $table->cellclass[$idx][1] = get_priority_class($severity);
         $agent = agents_get_agent_with_ip($trap['source']);
         if ($agent === false) {
@@ -851,7 +886,7 @@ if ($traps !== false) {
             '</strong></a>';
         }
 
-        // OID
+        // OID.
         $table->cellclass[$idx][2] = get_priority_class($severity);
         if (! empty($trap['text'])) {
             $enterprise_string = $trap['text'];
@@ -863,7 +898,7 @@ if ($traps !== false) {
 
         $data[2] = '<a href="javascript: toggleVisibleExtendedInfo('.$trap['id_trap'].');">'.$enterprise_string.'</a>';
 
-        // Count
+        // Count.
         if ($group_by) {
             $sql = "SELECT * FROM ttrap WHERE 1=1 
 					$where_without_group
@@ -875,7 +910,7 @@ if ($traps !== false) {
             $data[3] = '<strong>'.$count_group_traps.'</strong></a>';
         }
 
-        // Value
+        // Value.
         $table->cellclass[$idx][4] = get_priority_class($severity);
         if (empty($trap['value'])) {
             $data[4] = __('N/A');
@@ -883,7 +918,7 @@ if ($traps !== false) {
             $data[4] = ui_print_truncate_text($trap['value'], GENERIC_SIZE_TEXT, false);
         }
 
-        // User
+        // User.
         $table->cellclass[$idx][5] = get_priority_class($severity);
         if (!empty($trap['status'])) {
             $data[5] = '<a href="index.php?sec=workspace&sec2=operation/users/user_edit&ver='.$trap['id_usuario'].'">'.substr($trap['id_usuario'], 0, 8).'</a>';
@@ -894,35 +929,35 @@ if ($traps !== false) {
             $data[5] = '--';
         }
 
-        // Timestamp
+        // Timestamp.
         $table->cellclass[$idx][6] = get_priority_class($severity);
         $data[6] = '<span title="'.$trap['timestamp'].'">';
         $data[6] .= ui_print_timestamp($trap['timestamp'], true);
         $data[6] .= '</span>';
 
-        // Use alert severity if fired
+        // Use alert severity if fired.
         if (!empty($trap['alerted'])) {
             $data[7] = html_print_image('images/pixel_yellow.png', true, ['width' => '20', 'height' => '20', 'border' => '0', 'title' => __('Alert fired')]);
         } else {
             $data[7] = html_print_image('images/pixel_gray.png', true, ['width' => '20', 'height' => '20', 'border' => '0', 'title' => __('Alert not fired')]);
         }
 
-        // Actions
+        // Actions.
         $data[8] = '';
 
         if (empty($trap['status']) && check_acl($config['id_user'], 0, 'IW')) {
-            $data[8] .= '<a href="'.$url_snmp.'&check='.$trap['id_trap'].'">'.html_print_image('images/ok.png', true, ['border' => '0', 'title' => __('Validate')]).'</a> ';
+            $data[8] .= '<a href="'.$urlPagination.'&check='.$trap['id_trap'].'">'.html_print_image('images/ok.png', true, ['border' => '0', 'title' => __('Validate')]).'</a> ';
         }
 
         if ($trap['source'] == '') {
             $is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']);
             if ($is_admin) {
-                $data[8] .= '<a href="'.$url_snmp.'&delete='.$trap['id_trap'].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image('images/cross.png', true, ['border' => '0', 'title' => __('Delete')]).'</a> ';
+                $data[8] .= '<a href="'.$urlPagination.'&delete='.$trap['id_trap'].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image('images/cross.png', true, ['border' => '0', 'title' => __('Delete')]).'</a> ';
             }
         } else {
             $agent_trap_group = db_get_value('id_grupo', 'tagente', 'nombre', $trap['source']);
             if ((check_acl($config['id_user'], $agent_trap_group, 'AW'))) {
-                $data[8] .= '<a href="'.$url_snmp.'&delete='.$trap['id_trap'].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image('images/cross.png', true, ['border' => '0', 'title' => __('Delete')]).'</a> ';
+                $data[8] .= '<a href="'.$urlPagination.'&delete='.$trap['id_trap'].'&offset='.$offset.'" onClick="javascript:return confirm(\''.__('Are you sure?').'\')">'.html_print_image('images/cross.png', true, ['border' => '0', 'title' => __('Delete')]).'</a> ';
             }
         }
 
@@ -934,18 +969,18 @@ if ($traps !== false) {
 
         array_push($table->data, $data);
 
-        // Hiden file for description
+        // Hiden file for description.
         $string = '<table style="border:solid 1px #D3D3D3;" width="90%" class="toggle">
 			<tr>
 				<td align="left" valign="top" width="15%">'.'<b>'.__('Variable bindings:').'</b></td>
 				<td align="left" >';
 
         if ($group_by) {
-            $new_url = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&'.'filter_severity='.$filter_severity.'&'.'filter_fired='.$filter_fired.'&'.'filter_status='.$filter_status.'&'.'refresh='.((int) get_parameter('refresh', 0)).'&'.'pure='.$config['pure'].'&'.'group_by=0&'.'free_search_string='.$free_search_string.'&'.'date_from_trap='.$date_from_trap.'&'.'date_to_trap='.$date_to_trap.'&'.'time_from_trap='.$time_from_trap.'&'.'time_to_trap='.$time_to_trap;
+            $new_url = 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_view&filter_severity='.$filter_severity.'&filter_fired='.$filter_fired.'&filter_status='.$filter_status.'&refresh='.((int) get_parameter('refresh', 0)).'&pure='.$config['pure'].'&group_by=0&free_search_string='.$free_search_string.'&date_from_trap='.$date_from_trap.'&date_to_trap='.$date_to_trap.'&time_from_trap='.$time_from_trap.'&time_to_trap='.$time_to_trap;
 
             $string .= '<a href='.$new_url.'>'.__('See more details').'</a>';
         } else {
-            // Print binding vars separately
+            // Print binding vars separately.
             $binding_vars = explode("\t", $trap['oid_custom']);
             foreach ($binding_vars as $var) {
                 $string .= $var.'<br/>';
@@ -1007,7 +1042,7 @@ if ($traps !== false) {
                 break;
             }
 
-            $string .= '<tr><td align="left" valign="top">'.'<b>'.__('Trap type:').'</b>'.'</td>'.'<td align="left">'.$desc_trap_type.'</td></tr>';
+            $string .= '<tr><td align="left" valign="top"><b>'.__('Trap type:').'</b></td><td align="left">'.$desc_trap_type.'</td></tr>';
         }
 
         if ($group_by) {
@@ -1060,7 +1095,7 @@ if ($traps !== false) {
     }
 }
 
-// No matching traps
+// No matching traps.
 if ($idx == 0) {
     echo '<div class="nf">'.__('No matching traps found').'</div>';
 } else {
diff --git a/pandora_console/operation/users/webchat.php b/pandora_console/operation/users/webchat.php
index 7e6e58712c..de59c5d3e8 100644
--- a/pandora_console/operation/users/webchat.php
+++ b/pandora_console/operation/users/webchat.php
@@ -115,16 +115,16 @@ echo "<div style='width:100%'>".html_print_button(
             //Enter key.
             if (e.keyCode == 13) {
                 send_message();
+                check_users();
             }
         });
         
         init_webchat();
     });
-    
-    $(window).unload(function () {
+    $(window).on("beforeunload",function () {
         exit_webchat();
     });
-    
+
     function init_webchat() {
         send_login_message();
         long_polling_check_messages();
diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php
index 18d8e2ca55..ab6def4f70 100644
--- a/pandora_console/operation/visual_console/legacy_public_view.php
+++ b/pandora_console/operation/visual_console/legacy_public_view.php
@@ -40,6 +40,9 @@ ob_start('ui_process_page_head');
 // Enterprise main
 enterprise_include('index.php');
 
+$url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false);
+echo '<link rel="stylesheet" href="'.$url_css.'" type="text/css" />';
+
 require_once 'include/functions_visual_map.php';
 
 $hash = get_parameter('hash');
@@ -96,31 +99,41 @@ if ($layout) {
     echo '<div id="vc-container"></div>';
 }
 
-// Floating menu - Start
+// Floating menu - Start.
 echo '<div id="vc-controls" style="z-index:300;">';
 
 echo '<div id="menu_tab">';
-echo '<ul class="mn">';
+echo '<ul class="mn white-box-content box-shadow flex-row">';
 
-// QR code
+// QR code.
 echo '<li class="nomn">';
 echo '<a href="javascript: show_dialog_qrcode();">';
 echo '<img class="vc-qr" src="../../images/qrcode_icon_2.jpg"/>';
 echo '</a>';
 echo '</li>';
 
-// Countdown
+// Countdown.
 echo '<li class="nomn">';
 echo '<div class="vc-refr">';
-echo '<div class="vc-countdown"></div>';
+echo '<div class="vc-countdown style="display: inline;"></div>';
 echo '<div id="vc-refr-form">';
 echo __('Refresh').':';
-echo html_print_select(get_refresh_time_array(), 'refr', $refr, '', '', 0, true, false, false);
+echo html_print_select(
+    get_refresh_time_array(),
+    'vc-refr',
+    $refr,
+    '',
+    '',
+    0,
+    true,
+    false,
+    false
+);
 echo '</div>';
 echo '</div>';
 echo '</li>';
 
-// Console name
+// Console name.
 echo '<li class="nomn">';
 echo '<div class="vc-title">'.$layout_name.'</div>';
 echo '</li>';
@@ -129,15 +142,15 @@ echo '</ul>';
 echo '</div>';
 
 echo '</div>';
-// Floating menu - End
-// QR code dialog
+
+// QR code dialog.
 echo '<div style="display: none;" id="qrcode_container" title="'.__('QR code of the page').'">';
 echo '<div id="qrcode_container_image"></div>';
 echo '</div>';
 
-ui_require_jquery_file('countdown');
-ui_require_javascript_file('wz_jsgraphics');
-ui_require_javascript_file('pandora_visual_console');
+ui_require_jquery_file('countdown', 'include/javascript/', true);
+ui_require_javascript_file('wz_jsgraphics', 'include/javascript/', true);
+ui_require_javascript_file('pandora_visual_console', 'include/javascript/', true);
 $ignored_params['refr'] = '';
 ?>
 
@@ -175,7 +188,7 @@ $ignored_params['refr'] = '';
         var controls = document.getElementById('vc-controls');
         autoHideElement(controls, 1000);
         
-        $('select#refr').change(function (event) {
+        $('#vc-controls').change(function (event) {
             refr = Number.parseInt(event.target.value, 10);
             startCountDown(refr, false);
         });
diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php
index 029ef9eb25..e31d6f9ed5 100644
--- a/pandora_console/operation/visual_console/public_view.php
+++ b/pandora_console/operation/visual_console/public_view.php
@@ -42,6 +42,9 @@ ob_start('ui_process_page_head');
 // Enterprise main.
 enterprise_include('index.php');
 
+$url_css = ui_get_full_url('include/styles/visual_maps.css', false, false, false);
+echo '<link rel="stylesheet" href="'.$url_css.'" type="text/css" />';
+
 require_once 'include/functions_visual_map.php';
 
 $hash = (string) get_parameter('hash');
@@ -134,7 +137,7 @@ if (!users_can_manage_group_all('AR')) {
 }
 
 $ignored_params['refr'] = '';
-ui_require_javascript_file('pandora_visual_console');
+ui_require_javascript_file('pandora_visual_console', 'include/javascript/', true);
 include_javascript_d3();
 visual_map_load_client_resources();
 
@@ -157,6 +160,10 @@ $visualConsoleItems = VisualConsole::getItemsFromDB(
     var props = <?php echo (string) $visualConsole; ?>;
     var items = <?php echo '['.implode($visualConsoleItems, ',').']'; ?>;
     var baseUrl = "<?php echo ui_get_full_url('/', false, false, false); ?>";
+
+    var controls = document.getElementById('vc-controls');
+    autoHideElement(controls, 1000);
+
     var handleUpdate = function (prevProps, newProps) {
         if (!newProps) return;
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index e25982eca0..09db43ca49 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.736
-%define release     190712
+%define version     7.0NG.738
+%define release     190916
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 86190dc5dc..a1e0dda629 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.736
-%define release     190712
+%define version     7.0NG.738
+%define release     190916
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 47a76c7e05..240c3d7ff7 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.736
-%define release     190712
+%define version     7.0NG.738
+%define release     190916
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandora_console_install b/pandora_console/pandora_console_install
index f7e9ac25ba..bda06177d6 100644
--- a/pandora_console/pandora_console_install
+++ b/pandora_console/pandora_console_install
@@ -9,7 +9,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.736"
+PI_VERSION="7.0NG.738"
 FORCE=0
 DESTDIR=""
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 9f9020990e..13aac100e9 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1402,8 +1402,8 @@ CREATE TABLE IF NOT EXISTS `treport_content` (
 	`type` varchar(30) default 'simple_graph',
 	`period` int(11) NOT NULL default 0,
 	`order` int (11) NOT NULL default 0,
-	`name` varchar(150) NULL,
-	`description` mediumtext, 
+	`name` varchar(300) NULL,
+	`description` mediumtext,
 	`id_agent` int(10) unsigned NOT NULL default 0,
 	`text` TEXT,
 	`external_source` Text,
@@ -3612,3 +3612,44 @@ CREATE TABLE IF NOT EXISTS `tvisual_console_elements_cache` (
         ON DELETE CASCADE
         ON UPDATE CASCADE
 ) engine=InnoDB DEFAULT CHARSET=utf8;
+
+-- ---------------------------------------------------------------------
+-- Table `tagent_repository`
+-- ---------------------------------------------------------------------
+CREATE TABLE `tagent_repository` (
+  `id` SERIAL,
+  `id_os` INT(10) UNSIGNED DEFAULT 0,
+  `arch` ENUM('x64', 'x86') DEFAULT 'x64',
+  `version` VARCHAR(10) DEFAULT '',
+  `path` text,
+  `uploaded_by` VARCHAR(100) DEFAULT '',
+  `uploaded` bigint(20) NOT NULL DEFAULT 0 COMMENT "When it was uploaded",
+  `last_err` text,
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`id_os`) REFERENCES `tconfig_os`(`id_os`)
+    ON UPDATE CASCADE ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- ----------------------------------------------------------------------
+-- Table `tdeployment_hosts`
+-- ----------------------------------------------------------------------
+CREATE TABLE `tdeployment_hosts` (
+  `id` SERIAL,
+  `id_cs` VARCHAR(100),
+  `ip` VARCHAR(100) NOT NULL UNIQUE,
+  `id_os` INT(10) UNSIGNED DEFAULT 0,
+  `os_version` VARCHAR(100) DEFAULT '' COMMENT "OS version in STR format",
+  `arch` ENUM('x64', 'x86') DEFAULT 'x64',
+  `current_agent_version` VARCHAR(100) DEFAULT '' COMMENT "String latest installed agent",
+  `target_agent_version_id` BIGINT UNSIGNED,
+  `deployed` bigint(20) NOT NULL DEFAULT 0 COMMENT "When it was deployed",
+  `server_ip` varchar(100) default NULL COMMENT "Where to point target agent",
+  `last_err` text,
+  PRIMARY KEY (`id`),
+  FOREIGN KEY (`id_cs`) REFERENCES `tcredential_store`(`identifier`)
+    ON UPDATE CASCADE ON DELETE SET NULL,
+  FOREIGN KEY (`id_os`) REFERENCES `tconfig_os`(`id_os`)
+    ON UPDATE CASCADE ON DELETE CASCADE,
+  FOREIGN KEY (`target_agent_version_id`) REFERENCES  `tagent_repository`(`id`)
+    ON UPDATE CASCADE ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 6c8811bf22..a02f88fe5f 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -22,7 +22,6 @@ INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (8,'Jabber&#x20;Alert','echo&#x20;_field3_&#x20;|&#x20;sendxmpp&#x20;-r&#x20;_field1_&#x20;--chatroom&#x20;_field2_','Send&#x20;jabber&#x20;alert&#x20;to&#x20;chat&#x20;room&#x20;in&#x20;a&#x20;predefined&#x20;server&#x20;&#40;configure&#x20;first&#x20;.sendxmpprc&#x20;file&#41;.&#x20;Uses&#x20;field3&#x20;as&#x20;text&#x20;message,&#x20;field1&#x20;as&#x20;useralias&#x20;for&#x20;source&#x20;message,&#x20;and&#x20;field2&#x20;for&#x20;chatroom&#x20;name',0,'[\"User&#x20;alias\",\"Chatroom&#x20;name\",\"Message\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (9,'SMS','sendsms&#x20;_field1_&#x20;_field2_','Send&#x20;SMS&#x20;using&#x20;the&#x20;standard&#x20;SMS&#x20;device,&#x20;using&#x20;smstools.&#x20;&#x20;Uses&#x20;field2&#x20;as&#x20;text&#x20;message,&#x20;field1&#x20;as&#x20;destination&#x20;phone&#x20;&#40;include&#x20;international&#x20;prefix!&#41;',0,'[\"Destination&#x20;number\",\"Message\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (10,'Validate&#x20;Event','Internal&#x20;type','This&#x20;alert&#x20;validate&#x20;the&#x20;events&#x20;matched&#x20;with&#x20;a&#x20;module&#x20;given&#x20;the&#x20;agent&#x20;name&#x20;&#40;_field1_&#41;&#x20;and&#x20;module&#x20;name&#x20;&#40;_field2_&#41;',1,'[\"Agent&#x20;name\",\"Module&#x20;name\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
-INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (11,'Integria&#x20;IMS&#x20;Ticket','Internal&#x20;type','This&#x20;alert&#x20;create&#x20;a&#x20;ticket&#x20;into&#x20;your&#x20;Integria&#x20;IMS.',1,'[\"Integria&#x20;IMS&#x20;API&#x20;path\",\"Integria&#x20;IMS&#x20;API&#x20;pass\",\"Integria&#x20;IMS&#x20;user\",\"Integria&#x20;IMS&#x20;user&#x20;pass\",\"Ticket&#x20;title\",\"Ticket&#x20;group&#x20;ID\",\"Ticket&#x20;priority\",\"Email&#x20;copy\",\"Ticket&#x20;owner\",\"Ticket&#x20;description\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"10,Maintenance;0,Informative;1,Low;2,Medium;3,Serious;4,Very&#x20;Serious\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (12,'Remote&#x20;agent&#x20;control','/usr/share/pandora_server/util/udp_client.pl&#x20;_address_&#x20;41122&#x20;&quot;_field1_&quot;','This&#x20;command&#x20;is&#x20;used&#x20;to&#x20;send&#x20;commands&#x20;to&#x20;the&#x20;agents&#x20;with&#x20;the&#x20;UDP&#x20;server&#x20;enabled.&#x20;The&#x20;UDP&#x20;server&#x20;is&#x20;used&#x20;to&#x20;order&#x20;agents&#x20;&#40;Windows&#x20;and&#x20;UNIX&#41;&#x20;to&#x20;&quot;refresh&quot;&#x20;the&#x20;agent&#x20;execution:&#x20;that&#x20;means,&#x20;to&#x20;force&#x20;the&#x20;agent&#x20;to&#x20;execute&#x20;and&#x20;send&#x20;data',0,'[\"Command\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 INSERT INTO `talert_commands` (`id`, `name`, `command`, `description`, `internal`, `fields_descriptions`, `fields_values`) VALUES (13,'Generate&#x20;Notification','Internal&#x20;type','This&#x20;command&#x20;allows&#x20;you&#x20;to&#x20;send&#x20;an&#x20;internal&#x20;notification&#x20;to&#x20;any&#x20;user&#x20;or&#x20;group.',1,'[\"Destination&#x20;user\",\"Destination&#x20;group\",\"Title\",\"Message\",\"Link\",\"Criticity\",\"\",\"\",\"\",\"\",\"\"]','[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]');
 --
@@ -80,15 +79,11 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('sound_alert', 'include/sounds/air_shock_alarm.wav'),
 ('sound_critical', 'include/sounds/Star_Trek_emergency_simulation.wav'),
 ('sound_warning', 'include/sounds/negativebeep.wav'),
-('integria_enabled', '0'),
-('integria_api_password', ''),
-('integria_inventory', '0'),
-('integria_url', ''),
 ('netflow_interval', '3600'),
 ('netflow_daemon', '/usr/bin/nfcapd'),
 ('netflow_nfdump', '/usr/bin/nfdump'),
 ('netflow_max_resolution', '50'),
-('event_fields', 'evento,id_agente,estado,timestamp'),
+('event_fields', 'mini_severity,evento,id_agente,estado,timestamp'),
 ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'),
 ('list_ACL_IPs_for_API', '127.0.0.1'),
 ('enable_pass_policy', 0),
@@ -114,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', 30),
+('MR', 31),
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
-('current_package_enterprise', '737'),
+('current_package_enterprise', '738'),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
 ('custom_docs_logo', 'default_docs.png'),
 ('custom_support_logo', 'default_support.png'),
@@ -1114,8 +1109,6 @@ INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field
 (2,'Restart&#x20;agent',12,'REFRESH AGENT *','','','','','','','','','',0,0,'','','','','','','','','','');
 INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES
 (3,'Monitoring&#x20;Event',3,'_agent_&#x20;_module_&#x20;generated&#x20;an&#x20;event&#x20;alert&#x20;&#40;_data_&#41;','alert_fired','pandora','','4','','','','','',0,0,'RECOVERED:&#x20;_agent_&#x20;_module_&#x20;generated&#x20;event&#x20;alert&#x20;&#40;_data_&#41;','alert_ceased','pandora','','4','','','','','');
-INSERT INTO `talert_actions` (`id`, `name`, `id_alert_command`, `field1`, `field2`, `field3`, `field4`, `field5`, `field6`, `field7`, `field8`, `field9`, `field10`, `id_group`, `action_threshold`, `field1_recovery`, `field2_recovery`, `field3_recovery`, `field4_recovery`, `field5_recovery`, `field6_recovery`, `field7_recovery`, `field8_recovery`, `field9_recovery`, `field10_recovery`) VALUES
-(4,'Create&#x20;a&#x20;ticket&#x20;in&#x20;Integria&#x20;IMS',11,'http://localhost/integria/include/api.php','1234','admin','integria','_agent_:&#x20;_alert_name_','1','3','copy@dom.com','admin','_alert_description_',0,0,'','','','','','','','','','');
 
 -- alert templates (default)
 
@@ -1317,4 +1310,115 @@ INSERT INTO `tnotification_source_user` (`id_source`, `id_user`, `enabled`, `als
   ((SELECT `id` FROM `tnotification_source` WHERE `description`="Official&#x20;communication"), "admin", 1, 0);
 
 UPDATE `tnotification_source` SET `enabled`=1 WHERE `description` = 'System&#x20;status' OR `description` = 'Official&#x20;communication';
-  
+
+
+-- 
+-- Dumping data for table `tlayout`
+-- 
+INSERT INTO `tlayout`
+VALUES
+    (1, 'Demo&#x20;visual console', 0, 'fondo.jpg', 1080, 1920, 'white', 0);
+
+-- 
+-- Dumping data for table `tlayout_data`
+-- 
+INSERT INTO `tlayout_data`
+VALUES
+  (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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,'&lt;p&#x20;style=&quot;text-align:&#x20;center;&#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;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Office&#x20;8&#x20;-&amp;nbsp;&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Rack&#x20;2&lt;/span&gt;&lt;/p&gt;','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,'&lt;p&#x20;style=&quot;text-align:&#x20;center;&#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;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Office&#x20;8&#x20;-&amp;nbsp;&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Rack&#x20;1&lt;/span&gt;&lt;/p&gt;','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,'&lt;p&#x20;style=&quot;text-align:&#x20;center;&#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;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Office&#x20;7&#x20;-&amp;nbsp;&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Rack&#x20;2&lt;/span&gt;&lt;/p&gt;','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,'&lt;p&#x20;style=&quot;text-align:&#x20;center;&#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;&lt;strong&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Office&#x20;7&#x20;-&amp;nbsp;&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;span&#x20;class=&quot;visual_font_size_28pt&quot;&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;Rack&#x20;1&lt;/span&gt;&lt;/p&gt;','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,'&lt;p&#x20;style=&quot;overflow:&#x20;hidden;&quot;&gt;&lt;span&#x20;class=&quot;visual_font_size_48pt&quot;&gt;&lt;strong&gt;&lt;span&#x20;style=&quot;color:&#x20;#ffffff;&#x20;font-family:&#x20;opensans;&quot;&gt;OFFICE&#x20;RACKS&lt;/span&gt;&lt;/strong&gt;&lt;/span&gt;&lt;/p&gt;','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,0,0,0,0,'line','down','','',0,0,'default',0,'0.000','0.000',0,0,'analogic_1','time','Europe/Madrid',0,60)
+;
\ No newline at end of file
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 4a356c6403..5fe8b7e2e2 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.736-190712
+Version: 7.0NG.738-190916
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 5282a8f9eb..cdd59f8df4 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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.736-190712"
+pandora_version="7.0NG.738-190916"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index b81f956577..33d34082c0 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -1,7 +1,7 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 7.0NG.736
+# Version 7.0NG.738
 # Licensed under GPL license v2,
 # (c) 2003-2017 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
@@ -304,6 +304,11 @@ fsnmp /usr/bin/pandorafsnmp
 
 autocreate_group 10
 
+# If set to 1, new agents will be added to the group specified by autocreate_group (the group specified by the agent will be used as fallback).
+# If set to 0, new agents will be added to the group specified by the agent (the group specified by autocreate_group will be used as fallback).
+
+autocreate_group_force 1
+
 # Set to 1 if want to autocreate agents with Pandora FMS Data Server, 
 # set to 0 to disable (for security purposes, for example).
 
@@ -424,6 +429,10 @@ eventserver 0
 
 event_window 3600
 
+# If set to 1, an alert will not be fired if the last event it generated is in 'in-process' status.
+
+event_inhibit_alerts 0
+
 # Enable (1) or disable (0) Pandora FMS Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
 # You need nmap 5.20 or higher in order to use this !
 
@@ -601,6 +610,9 @@ syslog_threads 2
 # Maximum number of lines queued by the Syslog Server's producer on each run (PANDORA FMS ENTERPRISE ONLY).
 syslog_max 65535
 
+# Sync Server
+#syncserver
+
 # Port tentacle server
 #sync_port 41121
 
@@ -619,7 +631,7 @@ syslog_max 65535
 # Sync timeout
 #sync_timeout 10
 
-# Address 
+# Address
 # sync_address
 
 # Target LogStash server, to allow Dataserver and SyslogServer store log information in ElasticSearch
diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows
index c78fbc86c7..a602f7abc4 100644
--- a/pandora_server/conf/pandora_server.conf.windows
+++ b/pandora_server/conf/pandora_server.conf.windows
@@ -261,6 +261,11 @@ dataserver_threads 2
 
 autocreate_group 10
 
+# If set to 1, new agents will be added to the group specified by autocreate_group (the group specified by the agent will be used as fallback).
+# If set to 0, new agents will be added to the group specified by the agent (the group specified by autocreate_group will be used as fallback).
+
+autocreate_group_force 1
+
 # Set to 1 if want to autocreate agents with Pandora FMS Data Server, 
 # set to 0 to disable
 
@@ -374,6 +379,10 @@ eventserver 0
 
 event_window 3600
 
+# If set to 1, an alert will not be fired if the last event it generated is in 'in-process' status.
+
+event_inhibit_alerts 0
+
 # Enable (1) or disable (0) Pandora FMS Enterprise ICMP Server (PANDORA FMS ENTERPRISE ONLY).
 # You need nmap 5.20 or higher in order to use this !
 
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 0f1a845400..429df2c9b7 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -44,8 +44,8 @@ our @EXPORT = qw(
 	);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.736";
-my $pandora_build = "190712";
+my $pandora_version = "7.0NG.738";
+my $pandora_build = "190916";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -333,6 +333,7 @@ sub pandora_load_config {
 	$pa_config->{"snmpget"} = "/usr/bin/snmpget";
 	
 	$pa_config->{'autocreate_group'} = -1;
+	$pa_config->{'autocreate_group_force'} = 1;
 	$pa_config->{'autocreate'} = 1;
 
 	# max log size (bytes)
@@ -494,6 +495,8 @@ sub pandora_load_config {
 
 	$pa_config->{"fsnmp"} = "/usr/bin/pandorafsnmp"; # 7.0 732
 
+	$pa_config->{"event_inhibit_alerts"} = 0; # 7.0 737
+
 	# Check for UID0
 	if ($pa_config->{"quiet"} != 0){
 		if ($> == 0){
@@ -811,6 +814,9 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^autocreate_group\s+([0-9*]*)/i) {
 			$pa_config->{'autocreate_group'}= clean_blank($1); 
 		}
+		elsif ($parametro =~ m/^autocreate_group_force\s+([0-1])/i) {
+			$pa_config->{'autocreate_group_force'}= clean_blank($1); 
+		}
 		elsif ($parametro =~ m/^discovery_threads\s+([0-9]*)/i) {
 			$pa_config->{'discovery_threads'}= clean_blank($1);
 		}
@@ -917,6 +923,9 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^event_file\s+(.*)/i) {
 			$pa_config->{'event_file'}= clean_blank($1);
 		}
+		elsif ($parametro =~ m/^event_inhibit_alerts\s+([0-1])/i) {
+			$pa_config->{'event_inhibit_alerts'}= clean_blank($1);
+		}
 		elsif ($parametro =~ m/^text_going_down_normal\s+(.*)/i) {
 			$pa_config->{'text_going_down_normal'} = safe_input ($1);
 		}
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 1c8fa4c784..e1556d74b6 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -130,7 +130,17 @@ use Text::ParseWords;
 # due a bug processing some XML with blank spaces.
 # See http://www.perlmonks.org/?node_id=706838
 
-$XML::Simple::PREFERRED_PARSER='XML::Parser';
+eval {
+	local $SIG{__DIE__};
+	eval "use XML::SAX::ExpatXS;1" or die "XML::SAX::ExpatXS not available";
+};
+if (!$@) {
+	# Force best option available.
+	$XML::Simple::PREFERRED_PARSER='XML::SAX::ExpatXS';
+} else {
+	# Use classic parser.
+	$XML::Simple::PREFERRED_PARSER='XML::Parser';
+}
 
 # Default lib dir for RPM and DEB packages
 use lib '/usr/lib/perl5';
@@ -184,6 +194,7 @@ our @EXPORT = qw(
 	pandora_execute_action
 	pandora_exec_forced_alerts
 	pandora_generate_alerts
+	pandora_get_agent_group
 	pandora_get_config_value
 	pandora_get_credential
 	pandora_get_module_tags
@@ -725,6 +736,15 @@ sub pandora_execute_alert ($$$$$$$$$;$) {
 	my ($pa_config, $data, $agent, $module,
 		$alert, $alert_mode, $dbh, $timestamp, $forced_alert, $extra_macros) = @_;
 	
+	# 'in-process' events can inhibit alers too.
+	if ($pa_config->{'event_inhibit_alerts'} == 1 && $alert_mode != RECOVERED_ALERT) {
+		my $status = get_db_value($dbh, 'SELECT estado FROM tevento WHERE id_alert_am = ? ORDER BY utimestamp DESC LIMIT 1', $alert->{'id_template_module'});
+		if (defined($status) && $status == 2) {
+			logger ($pa_config, "Alert '" . safe_output($alert->{'name'}) . "' inhibited by in-process events.", 10);
+			return;
+		}
+	}
+	
 	# Alerts in stand-by are not executed
 	if ($alert->{'standby'} == 1) {
 		if (defined ($module)) {
@@ -1185,13 +1205,13 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 
 
 		# Address
-		$field1 = subst_alert_macros ($field1, \%macros, $pa_config, $dbh, $agent, $module);
+		$field1 = subst_alert_macros ($field1, \%macros, $pa_config, $dbh, $agent, $module, $alert);
 		# Subject
-		$field2 = subst_alert_macros ($field2, \%macros, $pa_config, $dbh, $agent, $module);
+		$field2 = subst_alert_macros ($field2, \%macros, $pa_config, $dbh, $agent, $module, $alert);
 		# Message
-		$field3 = subst_alert_macros ($field3, \%macros, $pa_config, $dbh, $agent, $module);
+		$field3 = subst_alert_macros ($field3, \%macros, $pa_config, $dbh, $agent, $module, $alert);
 		# Content
-		$field4 = subst_alert_macros ($field4, \%macros, $pa_config, $dbh, $agent, $module);
+		$field4 = subst_alert_macros ($field4, \%macros, $pa_config, $dbh, $agent, $module, $alert);
 
 		if($field4 eq ""){
 			$field4 = "text/html";
@@ -1596,6 +1616,31 @@ sub pandora_process_module ($$$$$$$$$;$) {
 	my $ff_start_utimestamp = $agent_status->{'ff_start_utimestamp'};
 	my $mark_for_update = 0;
 	
+	# tagente_estado.last_try defaults to NULL, should default to '1970-01-01 00:00:00'
+	$agent_status->{'last_try'} = '1970-01-01 00:00:00' unless defined ($agent_status->{'last_try'});
+	$agent_status->{'datos'} = "" unless defined($agent_status->{'datos'});
+	
+	# Do we have to save module data?
+	if ($agent_status->{'last_try'} !~ /(\d+)\-(\d+)\-(\d+) +(\d+):(\d+):(\d+)/) {
+		logger($pa_config, "Invalid last try timestamp '" . $agent_status->{'last_try'} . "' for agent '" . $agent->{'nombre'} . "' not found while processing module '" . $module->{'nombre'} . "'.", 3);
+		pandora_update_module_on_error ($pa_config, $module, $dbh);
+		return;
+	}
+	my $last_try = ($1 == 0) ? 0 : timelocal($6, $5, $4, $3, $2 - 1, $1 - 1900);
+	my $save = ($module->{'history_data'} == 1 && ($agent_status->{'datos'} ne $processed_data || $last_try < ($utimestamp - 86400))) ? 1 : 0;
+	
+	# Received stale data. Save module data if needed and return.
+	if ($pa_config->{'dataserver_lifo'} == 1 && $utimestamp <= $agent_status->{'utimestamp'}) {
+		logger($pa_config, "Received stale data from agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 10);
+		
+		# Save module data. Async and log4x modules are not compressed.
+		if ($module_type =~ m/(async)|(log4x)/ || $save == 1) {
+			save_module_data ($data_object, $module, $module_type, $utimestamp, $dbh);
+		}
+
+		return;
+	}
+
 	# Get new status
 	my $new_status = get_module_status ($processed_data, $module, $module_type);
 	
@@ -1744,23 +1789,6 @@ sub pandora_process_module ($$$$$$$$$;$) {
 		$mark_for_update = 1;
 	}
 		
-	# tagente_estado.last_try defaults to NULL, should default to '1970-01-01 00:00:00'
-	$agent_status->{'last_try'} = '1970-01-01 00:00:00' unless defined ($agent_status->{'last_try'});
-	
-	# Do we have to save module data?
-	if ($agent_status->{'last_try'} !~ /(\d+)\-(\d+)\-(\d+) +(\d+):(\d+):(\d+)/) {
-		logger($pa_config, "Invalid last try timestamp '" . $agent_status->{'last_try'} . "' for agent '" . $agent->{'nombre'} . "' not found while processing module '" . $module->{'nombre'} . "'.", 3);
-		pandora_update_module_on_error ($pa_config, $module, $dbh);
-		return;
-	}
-	
-	my $last_try = ($1 == 0) ? 0 : timelocal($6, $5, $4, $3, $2 - 1, $1 - 1900);
-
-	if (!defined($agent_status->{'datos'})){
-		$agent_status->{'datos'} = "";
-	}
-
-	my $save = ($module->{'history_data'} == 1 && ($agent_status->{'datos'} ne $processed_data || $last_try < ($utimestamp - 86400))) ? 1 : 0;
 	
 	# Never update tagente_estado when processing out-of-order data.
 	if ($utimestamp >= $last_try) {
@@ -3182,9 +3210,9 @@ sub pandora_create_agent ($$$$$$$$$$;$$$$$$$$$$) {
 	logger ($pa_config, "Server '$server_name' creating agent '$agent_name' address '$address'.", 10);
 	
 	if (!defined($group_id)) {
-		$group_id = $pa_config->{'autocreate_group'};
-		if (! defined (get_group_name ($dbh, $group_id))) {
-			logger($pa_config, "Group id $group_id does not exist (check autocreate_group config token)", 3);
+		$group_id = pandora_get_agent_group($pa_config, $dbh, $agent_name);
+		if ($group_id <= 0) {
+			logger($pa_config, "Unable to create agent '" . safe_output($agent_name) . "': No valid group found.", 3);
 			return;
 		}
 	}
@@ -3434,6 +3462,47 @@ sub pandora_extended_event($$$$) {
 	);
 }
 
+##########################################################################
+# Returns a valid group ID to place an agent on success, -1 on error.
+##########################################################################
+sub pandora_get_agent_group {
+	my ($pa_config, $dbh, $agent_name, $agent_group, $agent_group_password) = @_;
+
+	my $group_id;
+	my @groups = $pa_config->{'autocreate_group_force'} == 1 ? ($pa_config->{'autocreate_group'}, $agent_group) : ($agent_group, $pa_config->{'autocreate_group'});
+	foreach my $group (@groups) {
+		next unless defined($group);
+
+		# Does the group exist?
+		if ($group eq $pa_config->{'autocreate_group'}) {
+			next if ($group <= 0);
+			$group_id = $group;
+			if (!defined(get_group_name ($dbh, $group_id))) {
+				logger($pa_config, "Group ID " . $group_id . " does not exist.", 10);
+				next;
+			}
+		} else {
+			next if ($group eq '');
+			$group_id = get_group_id ($dbh, $group);
+			if ($group_id <= 0) {
+				logger($pa_config, "Group " . $group . " does not exist.", 10);
+				next;
+			}
+		}
+
+		# Check the group password.
+		my $rc = enterprise_hook('check_group_password', [$dbh, $group_id, $agent_group_password]);
+		if (defined($rc) && $rc != 1) {
+			logger($pa_config, "Agent " . safe_output($agent_name) . " did not send a valid password for group ID $group_id.", 10);
+			next;
+		}
+
+		return $group_id;
+	}
+
+	return -1;
+}
+
 ##########################################################################
 =head2 C<< pandora_update_module_on_error (I<$pa_config>, I<$id_agent_module>, I<$dbh>) >> 
 
@@ -3874,8 +3943,8 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
 ##########################################################################
 # Search string for macros and substitutes them with their values.
 ##########################################################################
-sub subst_alert_macros ($$;$$$$) {
-	my ($string, $macros, $pa_config, $dbh, $agent, $module) = @_;
+sub subst_alert_macros ($$;$$$$$) {
+	my ($string, $macros, $pa_config, $dbh, $agent, $module, $alert) = @_;
 
 	my $macro_regexp = join('|', keys %{$macros});
 
@@ -3883,14 +3952,14 @@ sub subst_alert_macros ($$;$$$$) {
 	if (defined($string) && $string =~ m/^(?:(")(?:.*)"|(')(?:.*)')$/) {
 		my $quote = $1 ? $1 : $2;
 		$subst_func = sub {
-			my $macro = on_demand_macro($pa_config, $dbh, shift, $macros, $agent, $module);
+			my $macro = on_demand_macro($pa_config, $dbh, shift, $macros, $agent, $module,$alert);
 			$macro =~ s/'/'\\''/g; # close, escape, open
 			return decode_entities($quote . "'" . $macro . "'" . $quote); # close, quote, open
 		};
 	}
 	else {
 		$subst_func = sub {
-			my $macro = on_demand_macro($pa_config, $dbh, shift, $macros, $agent, $module);
+			my $macro = on_demand_macro($pa_config, $dbh, shift, $macros, $agent, $module, $alert);
 			return decode_entities($macro);
 		};
 	}
@@ -3924,8 +3993,8 @@ sub subst_column_macros ($$;$$$$) {
 ##########################################################################
 # Load macros that access the database on demand.
 ##########################################################################
-sub on_demand_macro($$$$$$) {
-	my ($pa_config, $dbh, $macro, $macros, $agent, $module) = @_;
+sub on_demand_macro($$$$$$;$) {
+	my ($pa_config, $dbh, $macro, $macros, $agent, $module,$alert) = @_;
 
 	# Static macro.
 	return $macros->{$macro} if (defined($macros->{$macro}));
@@ -3941,7 +4010,7 @@ sub on_demand_macro($$$$$$) {
 	} elsif ($macro eq '_moduletags_') {
 		return (defined ($module)) ? pandora_get_module_url_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : '';
 	} elsif ($macro eq '_policy_') {
-		return (defined ($module)) ? enterprise_hook('get_policy_name', [$dbh, $module->{'id_policy_module'}]) : '';
+		return (defined ($alert)) ? enterprise_hook('get_policy_name_policy_alerts_id', [$dbh, $alert->{'id_policy_alerts'}]) : '';
 	} elsif ($macro eq '_email_tag_') {
 		return (defined ($module)) ? pandora_get_module_email_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : '';
 	} elsif ($macro eq '_phone_tag_') {
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 8e08a7d482..b7beb919a3 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -58,6 +58,7 @@ my %Agents :shared;
 my $Sem :shared;
 my $TaskSem :shared;
 my $AgentSem :shared;
+my $XMLinSem :shared;
 
 ########################################################################################
 # Data Server class constructor.
@@ -74,6 +75,7 @@ sub new ($$;$) {
 	$Sem = Thread::Semaphore->new;
 	$TaskSem = Thread::Semaphore->new (0);
 	$AgentSem = Thread::Semaphore->new (1);
+	$XMLinSem = Thread::Semaphore->new (1);
 	
 	# Call the constructor of the parent class
 	my $self = $class->SUPER::new($config, DATASERVER, \&PandoraFMS::DataServer::data_producer, \&PandoraFMS::DataServer::data_consumer, $dbh);
@@ -83,6 +85,13 @@ sub new ($$;$) {
 		push(@XML::Parser::Expat::Encoding_Path, $config->{'enc_dir'});
 	}
 
+	if ($config->{'autocreate_group'} > 0 && !defined(get_group_name ($dbh, $config->{'autocreate_group'}))) {
+		my $msg = "Group id " . $config->{'autocreate_group'} . " does not exist (check autocreate_group config token).";
+		logger($config, $msg, 3);
+		print_message($config, $msg, 1);
+		pandora_event ($config, $msg, 0, 0, 0, 0, 0, 'error', 0, $dbh);
+	}
+
 	bless $self, $class;
 	return $self;
 }
@@ -149,14 +158,8 @@ sub data_producer ($) {
 		next if ($file !~ /^(.*)[\._]\d+\.data$/);
 		my $agent_name = $1;
 
-		$AgentSem->down ();
-		if (defined ($Agents{$agent_name})) {
-			$AgentSem->up ();
-			next;
-		}
-		$Agents{$agent_name} = 1;
-		$AgentSem->up ();
-
+		next if (agent_lock($pa_config, $agent_name) == 0);
+			
 		push (@tasks, $file);
 	}
 
@@ -174,6 +177,7 @@ sub data_consumer ($$) {
 	my $agent_name = $1;		
 	my $file_name = $pa_config->{'incomingdir'};
 	my $xml_err;
+	my $error;
 	
 	# Fix path
 	$file_name .= "/" unless (substr ($file_name, -1, 1) eq '/');	
@@ -181,9 +185,7 @@ sub data_consumer ($$) {
 
 	# Double check that the file exists
 	if (! -f $file_name) {
-		$AgentSem->down ();
-		delete ($Agents{$agent_name});
-		$AgentSem->up ();
+		agent_unlock($pa_config, $agent_name);
 		return;
 	}
 
@@ -192,18 +194,37 @@ sub data_consumer ($$) {
 
 	for (0..1) {
 		eval {
+			local $SIG{__DIE__};
 			threads->yield;
+			# XML::SAX::ExpatXS is not thread safe.
+			if ($XML::Simple::PREFERRED_PARSER eq 'XML::SAX::ExpatXS') {
+				$XMLinSem->down();
+			}
 
 			$xml_data = XMLin ($file_name, forcearray => 'module');
+
+			if ($XML::Simple::PREFERRED_PARSER eq 'XML::SAX::ExpatXS') {
+				$XMLinSem->up();
+			}
 		};
 	
 		# Invalid XML
-		if ($@ || ref($xml_data) ne 'HASH') {
+		if ($@) {
+			$error = 1;
+			if ($XML::Simple::PREFERRED_PARSER eq 'XML::SAX::ExpatXS') {
+				$XMLinSem->up();
+			}
+		}
+
+		if ($error || ref($xml_data) ne 'HASH') {
+			
 			if ($@) {
 				$xml_err = $@;
 			} else {
 				$xml_err = "Invalid XML format.";
 			}
+
+			logger($pa_config, "Failed to parse $file_name $xml_err", 3);
 			sleep (2);
 			next;
 		}
@@ -213,9 +234,7 @@ sub data_consumer ($$) {
 
 		# Double check that the file exists
 		if (! -f $file_name) {
-			$AgentSem->down ();
-			delete ($Agents{$agent_name});
-			$AgentSem->up ();
+			agent_unlock($pa_config, $agent_name);
 			return;
 		}
 
@@ -231,17 +250,13 @@ sub data_consumer ($$) {
 		} else {
 			process_xml_data ($self->getConfig (), $file_name, $xml_data, $self->getServerID (), $self->getDBH ());
 		}
-		$AgentSem->down ();
-		delete ($Agents{$agent_name});
-		$AgentSem->up ();
+		agent_unlock($pa_config, $agent_name);
 		return;	
 	}
 
 	rename($file_name, $file_name . '_BADXML');
 	pandora_event ($pa_config, "Unable to process XML data file '$file_name': $xml_err", 0, 0, 0, 0, 0, 'error', 0, $dbh);
-	$AgentSem->down ();
-	delete ($Agents{$agent_name});
-	$AgentSem->up ();
+	agent_unlock($pa_config, $agent_name);
 }
 
 ###############################################################################
@@ -341,33 +356,10 @@ sub process_xml_data ($$$$$) {
 		
 		# Get OS, group and description
 		my $os = pandora_get_os ($dbh, $data->{'os_name'});
-		$group_id = $pa_config->{'autocreate_group'};
-		if (! defined (get_group_name ($dbh, $group_id))) {
-			if (defined ($data->{'group_id'}) && $data->{'group_id'} ne '') {
-				$group_id = $data->{'group_id'};
-				if (! defined (get_group_name ($dbh, $group_id))) {
-					pandora_event ($pa_config, "Unable to create agent '" . safe_output($agent_name) . "': group ID '" . $group_id . "' does not exist.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
-					logger($pa_config, "Group ID " . $group_id . " does not exist.", 3);
-					return;
-				}
-			} elsif (defined ($data->{'group'}) && $data->{'group'} ne '') {
-				$group_id = get_group_id ($dbh, $data->{'group'});
-				if (! defined (get_group_name ($dbh, $group_id))) {
-					pandora_event ($pa_config, "Unable to create agent '" . safe_output($agent_name) . "': group '" . safe_output($data->{'group'}) . "' does not exist.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
-					logger($pa_config, "Group " . $data->{'group'} . " does not exist.", 3);
-					return;
-				}
-			} else {
-					pandora_event ($pa_config, "Unable to create agent '" . safe_output($agent_name) . "': autocreate_group $group_id does not exist. Edit the server configuration file and change it.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
-					logger($pa_config, "Group id $group_id does not exist (check autocreate_group config token).", 3);
-					return;
-			}
-		}
-
-		# Check the group password.
-		my $rc = enterprise_hook('check_group_password', [$dbh, $group_id, $data->{'group_password'}]);
-		if (defined($rc) && $rc != 1) {
-			logger($pa_config, "Agent $agent_name did not send a valid password for group id $group_id.", 10);
+		$group_id = pandora_get_agent_group($pa_config, $dbh, $agent_name, $data->{'group'}, $data->{'group_password'});
+		if ($group_id <= 0) {
+			pandora_event ($pa_config, "Unable to create agent '" . safe_output($agent_name) . "': No valid group found.", 0, 0, 0, 0, 0, 'error', 0, $dbh);
+			logger($pa_config, "Unable to create agent '" . safe_output($agent_name) . "': No valid group found.", 3);
 			return;
 		}
 
@@ -1059,5 +1051,37 @@ sub process_xml_matrix_network {
 	return;
 }
 
+##########################################################################
+# Get a lock on the given agent. Return 1 on success, 0 otherwise.
+##########################################################################
+sub agent_lock {
+	my ($pa_config, $agent_name) = @_;
+
+	return 1 if ($pa_config->{'dataserver_lifo'} == 1);
+
+	$AgentSem->down ();
+	if (defined ($Agents{$agent_name})) {
+		$AgentSem->up ();
+		return 0;
+	}
+	$Agents{$agent_name} = 1;
+	$AgentSem->up ();
+
+	return 1;
+}
+
+##########################################################################
+# Remove the lock on the given agent.
+##########################################################################
+sub agent_unlock {
+	my ($pa_config, $agent_name) = @_;
+
+	return if ($pa_config->{'dataserver_lifo'} == 1);
+
+	$AgentSem->down ();
+	delete ($Agents{$agent_name});
+	$AgentSem->up ();
+}
+
 1;
 __END__
diff --git a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
index e91b580498..6f7eab4c68 100644
--- a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
+++ b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
@@ -65,7 +65,8 @@ use constant {
 sub new ($$$$$$) {
     my ($class, $config, $dbh) = @_;
     
-    return undef unless $config->{'reconserver'} == 1 || $config->{'discoveryserver'} == 1;
+    return undef unless (defined($config->{'reconserver'}) && $config->{'reconserver'} == 1)
+     || (defined($config->{'discoveryserver'}) && $config->{'discoveryserver'} == 1);
     
     if (! -e $config->{'nmap'}) {
         logger ($config, ' [E] ' . $config->{'nmap'} . " needed by " . $config->{'rb_product_name'} . " Discovery Server not found.", 1);
@@ -227,6 +228,7 @@ sub data_consumer ($$) {
             server_id => $server_id,
             %{$pa_config},
             task_data => $task,
+            public_url => PandoraFMS::Config::pandora_get_tconfig_token($dbh, 'public_url', ''),
             %cnf_extra
         );
 
@@ -237,6 +239,12 @@ sub data_consumer ($$) {
         && -f $cnf_extra{'creds_file'}) {
 			unlink($cnf_extra{'creds_file'});
 		}
+
+
+        # Clean one shot tasks
+        if ($task->{'type'} eq DISCOVERY_DEPLOY_AGENTS) {
+            db_delete_limit($dbh, ' trecon_task ', ' id_rt = ? ', 1, $task->{'id_rt'});   
+        }
     };
     if ($@) {
         logger(
@@ -347,9 +355,10 @@ sub PandoraFMS::Recon::Base::guess_os($$) {
 
     # Use xprobe2 if available
     if (-e $self->{pa_config}->{xprobe2}) {
-            my $output = `"$self->{pa_config}->{xprobe2}" $device 2>$DEVNULL | grep 'Running OS' | head -1`;
-            return OS_OTHER if ($? != 0);
+        my $output = `"$self->{pa_config}->{xprobe2}" $device 2>$DEVNULL | grep 'Running OS' | head -1`;
+        if ($? == 0) {
             return pandora_get_os($self->{'dbh'}, $output);
+        }
     }
     
     # Use nmap by default
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index de1a363293..7f428e3d82 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,8 +31,8 @@ use base 'Exporter';
 our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.736";
-my $pandora_build = "190712";
+my $pandora_version = "7.0NG.738";
+my $pandora_build = "190916";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/lib/PandoraFMS/Recon/Base.pm b/pandora_server/lib/PandoraFMS/Recon/Base.pm
index 23532d843b..223c36f248 100644
--- a/pandora_server/lib/PandoraFMS/Recon/Base.pm
+++ b/pandora_server/lib/PandoraFMS/Recon/Base.pm
@@ -31,7 +31,9 @@ use constant {
 	DISCOVERY_APP_MYSQL => 4,
 	DISCOVERY_APP_ORACLE => 5,
 	DISCOVERY_CLOUD_AWS_EC2 => 6,
-	DISCOVERY_CLOUD_AWS_RDS => 7
+	DISCOVERY_CLOUD_AWS_RDS => 7,
+	DISCOVERY_CLOUD_AZURE_COMPUTE => 8,
+	DISCOVERY_DEPLOY_AGENTS => 9,
 };
 
 # /dev/null
@@ -1632,6 +1634,41 @@ sub app_scan($) {
 
 }
 
+
+##########################################################################
+# Perform a deployment scan.
+##########################################################################
+sub deploy_scan($) {
+	my $self = shift;
+	my ($progress, $step);
+
+	my $type = '';
+
+	# Initialize deployer object.
+	my $deployer = PandoraFMS::Recon::Util::enterprise_new(
+		'PandoraFMS::Recon::Deployer',
+		[
+			task_data => $self->{'task_data'},
+			parent => $self
+		]
+
+	);
+
+	if (!$deployer) {
+		# Failed to initialize, check Cloud credentials or anything.
+		call('message', 'Unable to initialize PandoraFMS::Recon::Deployer', 3);
+	} else {
+		# Let deployer object manage scan.
+		$deployer->scan();
+	}
+
+	# Update progress.
+	# Done!
+	$self->{'step'} = '';
+	$self->call('update_progress', -1);
+}
+
+
 ##########################################################################
 # Perform a network scan.
 ##########################################################################
@@ -1653,6 +1690,10 @@ sub scan($) {
 			# Cloud scan.
 			return $self->cloud_scan();
 		}
+
+		if($self->{'task_data'}->{'type'} == DISCOVERY_DEPLOY_AGENTS) {
+			return $self->deploy_scan();
+		}
 	}
 
 	# Find devices.
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 4a96c5851d..36050e4275 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -81,6 +81,7 @@ our @EXPORT = qw(
 	DISCOVERY_CLOUD_AWS_EC2
 	DISCOVERY_CLOUD_AWS_RDS
 	DISCOVERY_CLOUD_AZURE_COMPUTE
+	DISCOVERY_DEPLOY_AGENTS
 	$DEVNULL
 	$OS
 	$OS_VERSION
@@ -191,6 +192,7 @@ use constant DISCOVERY_APP_ORACLE => 5;
 use constant DISCOVERY_CLOUD_AWS_EC2 => 6;
 use constant DISCOVERY_CLOUD_AWS_RDS => 7;
 use constant DISCOVERY_CLOUD_AZURE_COMPUTE => 8;
+use constant DISCOVERY_DEPLOY_AGENTS => 9;
 
 # Set OS, OS version and /dev/null
 our $OS = $^O;
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 388fabbd14..49646f1c6a 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.736
-%define release     190712
+%define version     7.0NG.738
+%define release     190916
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 20093a9ea4..d5e6b4bc70 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.736
-%define release     190712
+%define version     7.0NG.738
+%define release     190916
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 48dd2eaa41..c79790daca 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -8,8 +8,8 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.736"
-PI_BUILD="190712"
+PI_VERSION="7.0NG.738"
+PI_BUILD="190916"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index e040b6ea7e..70a1628e97 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.736 PS190712";
+my $version = "7.0NG.738 PS190916";
 
 # Pandora server configuration
 my %conf;
@@ -136,7 +136,7 @@ sub pandora_purgedb ($$) {
 		pandora_delete_old_export_data ($dbh, $ulimit_timestamp);
 		
 		# Delete sessions data
-		pandora_delete_old_session_data ($dbh, $ulimit_timestamp);
+		pandora_delete_old_session_data (\%conf, $dbh, $ulimit_timestamp);
 	
 		# Delete old inventory data
 		
@@ -678,6 +678,7 @@ sub pandora_load_config_pdb ($) {
 	$conf->{'_netflow_nfexpire'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'netflow_nfexpire'");
    	$conf->{'_netflow_path'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'netflow_path'");
 	$conf->{'_delete_notinit'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'delete_notinit'");
+	$conf->{'_session_timeout'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'session_timeout'");
 
 	$conf->{'_big_operation_step_datos_purge'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'big_operation_step_datos_purge'");
 	$conf->{'_small_operation_step_datos_purge'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'small_operation_step_datos_purge'");
@@ -990,12 +991,28 @@ sub pandora_delete_old_export_data {
 # Delete old session data.
 ##############################################################################
 sub pandora_delete_old_session_data {
-	my ($dbh, $ulimit_timestamp) = @_;
+    my ($conf, $dbh, $ulimit_timestamp) = @_;
+
+    my $session_timeout = $conf->{'_session_timeout'};
+
+	if ($session_timeout ne '') {
+		if ($session_timeout == -1) {
+			# The session expires in 10 years
+			$session_timeout = 315576000;
+		} else {
+			$session_timeout *= 60;
+		}
+
+		$ulimit_timestamp = time() - $session_timeout;
+	}
 
 	log_message ('PURGE', "Deleting old session data from tsessions_php\n");
 	while(db_delete_limit ($dbh, 'tsessions_php', 'last_active < ?', $SMALL_OPERATION_STEP, $ulimit_timestamp) ne '0E0') {
 		usleep (10000);
 	};
+
+	db_do ($dbh, "DELETE FROM tsessions_php WHERE
+	data IS NULL OR id_session REGEXP '^cron-'");
 }
 
 ###############################################################################
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
old mode 100644
new mode 100755
index 172c7ee278..04b3ab222c
--- a/pandora_server/util/pandora_manage.pl
+++ b/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.736 PS190712";
+my $version = "7.0NG.738 PS190916";
 
 # save program name for logging
 my $progname = basename($0);
@@ -284,19 +284,94 @@ sub api_call($$$;$$$$) {
 	return $content;
 }
 
+
+###############################################################################
+# Update token conf file agent
+###############################################################################
+sub update_conf_txt ($$$$) {
+	my ($conf, $agent_name, $token, $value) = @_;
+
+	# Read the conf of each agent.
+	my $conf_file_txt = enterprise_hook(
+		'read_agent_conf_file',
+		[
+			$conf,
+			$agent_name
+		]
+	);
+
+	# Check if there is agent conf.
+	if(!$conf_file_txt){
+		return 0;
+	}
+
+	my $updated = 0;
+	my $txt_content = "";
+
+	my @lines = split /\n/, $conf_file_txt;
+
+	foreach my $line (@lines) {
+		if ($line =~ /^\s*$token\s/ || $line =~ /^#$token\s/ || $line =~ /^#\s$token\s/) {
+			$txt_content .= $token.' '.$value."\n";
+			$updated = 1;
+		} else {
+			$txt_content .= $line."\n";
+		}
+	}
+
+	if ($updated == 0) {
+		$txt_content .= "\n$token $value\n";
+	}
+
+	# Write the conf.
+	my $result = enterprise_hook(
+		'write_agent_conf_file',
+		[
+			$conf,
+			$agent_name,
+			$txt_content
+		]
+	);
+
+	return $result;
+}
+
+
 ###############################################################################
 # Disable a entire group
 ###############################################################################
 sub pandora_disable_group ($$$) {
     my ($conf, $dbh, $group) = @_;
 
+	my @agents_bd = [];
+	my $result = 0;
+
 	if ($group == 0){
+		# Extract all the names of the pandora agents if it is for all = 0.
+		@agents_bd = get_db_rows ($dbh, 'SELECT nombre FROM tagente');
+
+		# Update bbdd.
 		db_do ($dbh, "UPDATE tagente SET disabled = 1");
 	}
 	else {
+		# Extract all the names of the pandora agents if it is for group.
+		@agents_bd = get_db_rows ($dbh, 'SELECT nombre FROM tagente WHERE id_grupo = ?', $group);
+
+		# Update bbdd.
 		db_do ($dbh, "UPDATE tagente SET disabled = 1 WHERE id_grupo = $group");
 	}
-    exit;
+
+	foreach my $name_agent (@agents_bd) {
+		# Check the standby field I put it to 0.
+		my $new_conf = update_conf_txt(
+			$conf,
+			$name_agent->{'nombre'},
+			'standby',
+			'1'
+		);
+	}
+
+    return $result;
 }
 
 ###############################################################################
@@ -305,13 +380,35 @@ sub pandora_disable_group ($$$) {
 sub pandora_enable_group ($$$) {
     my ($conf, $dbh, $group) = @_;
 
+	my @agents_bd = [];
+	my $result = 0;
+
 	if ($group == 0){
-			db_do ($dbh, "UPDATE tagente SET disabled = 0");
+		# Extract all the names of the pandora agents if it is for all = 0.
+		@agents_bd = get_db_rows ($dbh, 'SELECT nombre FROM tagente');
+
+		# Update bbdd.
+		$result = db_do ($dbh, "UPDATE tagente SET disabled = 0");
 	}
 	else {
-			db_do ($dbh, "UPDATE tagente SET disabled = 0 WHERE id_grupo = $group");
+		# Extract all the names of the pandora agents if it is for group.
+		@agents_bd = get_db_rows ($dbh, 'SELECT nombre FROM tagente WHERE id_grupo = ?', $group);
+
+		# Update bbdd.
+		$result = db_do ($dbh, "UPDATE tagente SET disabled = 0 WHERE id_grupo = $group");
 	}
-    exit;
+
+	foreach my $name_agent (@agents_bd) {
+		# Check the standby field I put it to 0.
+		my $new_conf = update_conf_txt(
+			$conf,
+			$name_agent->{'nombre'},
+			'standby',
+			'0'
+		);
+	}
+
+    return $result;
 }
 
 ##############################################################################