diff --git a/extras/chrome_extension/js/background.js b/extras/chrome_extension/js/background.js
index 521ecc19eb..037c01a472 100644
--- a/extras/chrome_extension/js/background.js
+++ b/extras/chrome_extension/js/background.js
@@ -3,309 +3,321 @@ var isFetching = null;
 var storedEvents = new Array();
 var notVisited = {};
 
-$(window).on('load', function() {
-	initilise();
-	// Wait some ms to throw main function
-	var delay = setTimeout(main, 100);
-	resetInterval();
+$(window).on("load", function() {
+  initilise();
+  // Wait some ms to throw main function
+  var delay = setTimeout(main, 100);
+  resetInterval();
 });
 
 function fetchEvents() {
-	return storedEvents;
+  return storedEvents;
 }
 
 function fetchNotVisited() {
-	return notVisited;
+  return notVisited;
 }
 
 function removeNotVisited(eventId) {
-	if (notVisited[eventId] === true) delete notVisited[eventId];
+  if (notVisited[eventId] === true) delete notVisited[eventId];
 }
 
 function main() {
+  chrome.runtime.sendMessage({ text: "FETCH_EVENTS" });
+  // Do not fetch if is fetching now
+  if (isFetching) return;
+  isFetching = true;
 
-	chrome.runtime.sendMessage({text: "FETCH_EVENTS"});
-	// Do not fetch if is fetching now
-	if (isFetching) return;
-	isFetching = true;
+  var url =
+    localStorage["ip_address"] +
+    "/include/api.php?op=get&op2=events&return_type=json";
+  var feedUrl = url;
+  var data = new FormData();
 
-	var feedUrl = localStorage["ip_address"]+'/include/api.php?op=get&op2=events&return_type=json&apipass='+localStorage["api_pass"]+'&user='+localStorage["user_name"]+'&pass='+localStorage["pass"];
+  data.append("apipass", localStorage["api_pass"]);
+  data.append("user", localStorage["user_name"]);
+  data.append("pass", localStorage["pass"]);
 
-	req = new XMLHttpRequest();
-	req.onload = handleResponse;
-	req.onerror = handleError;
-	req.open("GET", feedUrl, true);
-	req.withCredentials = true
-	req.send(null);
+  req = new XMLHttpRequest();
+  req.onload = handleResponse;
+  req.onerror = handleError;
+  req.open("POST", feedUrl, true);
+  req.withCredentials = true;
+  req.send(data);
 }
 
 function handleError() {
-	chrome.runtime.sendMessage({text: "FETCH_EVENTS_URL_ERROR"});
-	isFetching = false;
+  chrome.runtime.sendMessage({ text: "FETCH_EVENTS_URL_ERROR" });
+  isFetching = false;
 }
 
 function handleResponse() {
-	var doc = req.responseText;
-	if (doc=="auth error") {
-		chrome.runtime.sendMessage({text: "FETCH_EVENTS_URL_ERROR"});
-	} else {
-		var n = doc.search("404 Not Found");
-		if (n>0) {
-			chrome.runtime.sendMessage({text: "FETCH_EVENTS_DATA_ERROR"});
-		} else {
-			getEvents(doc);
-			chrome.runtime.sendMessage({text: "FETCH_EVENTS_SUCCESS"});
-		}
-	}
-	isFetching = false;
+  var doc = req.responseText;
+  if (doc == "auth error") {
+    chrome.runtime.sendMessage({ text: "FETCH_EVENTS_URL_ERROR" });
+  } else {
+    var n = doc.search("404 Not Found");
+    if (n > 0) {
+      chrome.runtime.sendMessage({ text: "FETCH_EVENTS_DATA_ERROR" });
+    } else {
+      getEvents(doc);
+      chrome.runtime.sendMessage({ text: "FETCH_EVENTS_SUCCESS" });
+    }
+  }
+  isFetching = false;
 }
 
-function getEvents(reply){
-	var fetchedEvents = parseReplyEvents(reply);
+function getEvents(reply) {
+  var fetchedEvents = parseReplyEvents(reply);
 
-	// If there is no events requested, mark all as visited
-	if (storedEvents.length == 0) {
-		notVisited = {};
-		storedEvents = fetchedEvents;
-		return;
-	}
+  // If there is no events requested, mark all as visited
+  if (typeof storedEvents != "undefined" && storedEvents.length == 0) {
+    notVisited = {};
+    storedEvents = fetchedEvents;
+    return;
+  }
 
-	// Discriminate the new events
-	newEvents=fetchNewEvents(fetchedEvents,storedEvents);
-	var newNotVisited = {};
-	var notVisitedCount = 0;
-	
-	// Check if popup is displayed to make some actions
-	var views = chrome.extension.getViews({ type: "popup" });
-	for(var k=0;k<newEvents.length;k++){
-		newNotVisited[newEvents[k]['id']] = true;
-		if (views.length == 0) {
-			notVisitedCount++;
-			displayNotification (newEvents[k])
-			alertsSound(newEvents[k]);
-		}
-	}
+  // Discriminate the new events
+  newEvents = fetchNewEvents(fetchedEvents, storedEvents);
+  var newNotVisited = {};
+  var notVisitedCount = 0;
 
-	// Make that the old events marked as not visited remains with the
-	// same status
-	for(var k=0;k<fetchedEvents.length;k++){
-		if (notVisited[fetchedEvents[k]['id']] === true) {
-			newNotVisited[fetchedEvents[k]['id']] = true;
-			notVisitedCount++;
-		}
-	}
-	notVisited = newNotVisited;
+  // Check if popup is displayed to make some actions
+  var views = chrome.extension.getViews({ type: "popup" });
+  for (var k = 0; k < newEvents.length; k++) {
+    newNotVisited[newEvents[k]["id"]] = true;
+    if (views.length == 0) {
+      notVisitedCount++;
+      displayNotification(newEvents[k]);
+      alertsSound(newEvents[k]);
+    }
+  }
 
-	// Update the number
-	localStorage["new_events"] = (views.length == 0) ? notVisitedCount : 0;
-	updateBadge();
+  // Make that the old events marked as not visited remains with the
+  // same status
+  for (var k = 0; k < fetchedEvents.length; k++) {
+    if (notVisited[fetchedEvents[k]["id"]] === true) {
+      newNotVisited[fetchedEvents[k]["id"]] = true;
+      notVisitedCount++;
+    }
+  }
+  notVisited = newNotVisited;
 
-	// Store the requested events
-	storedEvents = fetchedEvents;
+  // Update the number
+  localStorage["new_events"] = views.length == 0 ? notVisitedCount : 0;
+  updateBadge();
+
+  // Store the requested events
+  storedEvents = fetchedEvents;
 }
 
 function updateBadge() {
-	if (localStorage["new_events"] != 0) {
-		chrome.browserAction.setBadgeBackgroundColor({color:[0,200,0,255]});
-		chrome.browserAction.setBadgeText({ text: localStorage["new_events"] });
-	} else {
-		chrome.browserAction.setBadgeText({ text: "" });
-	}
+  if (localStorage["new_events"] != 0) {
+    chrome.browserAction.setBadgeBackgroundColor({ color: [0, 200, 0, 255] });
+    chrome.browserAction.setBadgeText({ text: localStorage["new_events"] });
+  } else {
+    chrome.browserAction.setBadgeText({ text: "" });
+  }
 }
 
-function fetchNewEvents(A,B){
-	var arrDiff = new Array();
-	for(var i = 0; i < A.length; i++) {
-		var id = false;
-		for(var j = 0; j < B.length; j++) {
-			if(A[i]['id'] == B[j]['id']) {
-				id = true;
-				break;
-			}
-		}
-		if(!id) {
-			arrDiff.push(A[i]);
-		}
-	}
-	return arrDiff;
+function fetchNewEvents(A, B) {
+  var arrDiff = new Array();
+  for (var i = 0; i < A.length; i++) {
+    var id = false;
+    for (var j = 0; j < B.length; j++) {
+      if (A[i]["id"] == B[j]["id"]) {
+        id = true;
+        break;
+      }
+    }
+    if (!id) {
+      arrDiff.push(A[i]);
+    }
+  }
+  return arrDiff;
 }
 
+function parseReplyEvents(reply) {
+  // Split the API response
+  var data;
+  try {
+    data = JSON.parse(reply);
+  } catch (error) {
+    console.log(error);
+    return [];
+  }
+  var e_array = JSON.parse(reply).data;
 
-function parseReplyEvents (reply) {
-
-	// Split the API response
-	var data = JSON.parse(reply)
-	var e_array = JSON.parse(reply).data;
-
-	// Form a properly object
-	var fetchedEvents=new Array();
-	for(var i=0;i<e_array.length;i++){
-		var event=e_array[i];
-		fetchedEvents.push({
-			'id' : event.id_evento,
-			'agent_name' : event.agent_name,
-			'agent' : event.id_agente,
-			'date' : event.timestamp,
-			'title' : event.evento,
-			'module' : event.id_agentmodule,
-			'type' : event.event_type,
-			'source' : event.source,
-			'severity' : event.criticity_name,
-			'visited' : false
-		});
-	}
-	// Return the events
-	return fetchedEvents;
+  // Form a properly object
+  var fetchedEvents = new Array();
+  for (var i = 0; i < e_array.length; i++) {
+    var event = e_array[i];
+    fetchedEvents.push({
+      id: event.id_evento,
+      agent_name: event.agent_name,
+      agent: event.id_agente,
+      date: event.timestamp,
+      title: event.evento,
+      module: event.id_agentmodule,
+      type: event.event_type,
+      source: event.source,
+      severity: event.criticity_name,
+      visited: false
+    });
+  }
+  // Return the events
+  return fetchedEvents;
 }
 
-function alertsSound(pEvent){
-	if(localStorage["sound_alert"]!="on"){
-		return;
-	}
+function alertsSound(pEvent) {
+  if (localStorage["sound_alert"] != "on") {
+    return;
+  }
 
-	switch (pEvent['severity']) {
-		case "Critical":
-			playSound(localStorage["critical"]);
-			break;
-		case "Informational":
-			playSound(localStorage["informational"]);
-			break;
-		case "Maintenance":
-			playSound(localStorage["maintenance"]);
-			break;
-		case "Normal":
-			playSound(localStorage["normal"]);
-			break;
-		case "Warning":
-			playSound(localStorage["warning"]);
-			break;
-	}
+  switch (pEvent["severity"]) {
+    case "Critical":
+      playSound(localStorage["critical"]);
+      break;
+    case "Informational":
+      playSound(localStorage["informational"]);
+      break;
+    case "Maintenance":
+      playSound(localStorage["maintenance"]);
+      break;
+    case "Normal":
+      playSound(localStorage["normal"]);
+      break;
+    case "Warning":
+      playSound(localStorage["warning"]);
+      break;
+  }
 }
 
-function displayNotification (pEvent) {
+function displayNotification(pEvent) {
+  // Check if the user is okay to get some notification
+  if (Notification.permission === "granted") {
+    // If it's okay create a notification
+    getNotification(pEvent);
+  }
 
-	// Check if the user is okay to get some notification
-	if (Notification.permission === "granted") {
-		// If it's okay create a notification
-		getNotification(pEvent);
-	}
-	
-	// Otherwise, we need to ask the user for permission
-	// Note, Chrome does not implement the permission static property
-	// So we have to check for NOT 'denied' instead of 'default'
-	else if (Notification.permission !== 'denied') {
-		Notification.requestPermission(function (permission) {
-			// Whatever the user answers, we make sure we store the information
-			if(!('permission' in Notification)) {
-				Notification.permission = permission;
-			}
-	
-			// If the user is okay, let's create a notification
-			if (permission === "granted") getNotification(pEvent);
-		});
-	}
+  // Otherwise, we need to ask the user for permission
+  // Note, Chrome does not implement the permission static property
+  // So we have to check for NOT 'denied' instead of 'default'
+  else if (Notification.permission !== "denied") {
+    Notification.requestPermission(function(permission) {
+      // Whatever the user answers, we make sure we store the information
+      if (!("permission" in Notification)) {
+        Notification.permission = permission;
+      }
+
+      // If the user is okay, let's create a notification
+      if (permission === "granted") getNotification(pEvent);
+    });
+  }
 }
 
-function getNotification(pEvent){
-	
-	// Build the event text
-	var even = pEvent['type'];
-	if (pEvent['source'] != '')	even += " : " + pEvent['source'];
-	even += ". Event occured at " + pEvent['date'];
-	if(pEvent['module'] != 0) even += " in the module with Id "+ pEvent['module'];
-	even += ".";
+function getNotification(pEvent) {
+  // Build the event text
+  var even = pEvent["type"];
+  if (pEvent["source"] != "") even += " : " + pEvent["source"];
+  even += ". Event occured at " + pEvent["date"];
+  if (pEvent["module"] != 0)
+    even += " in the module with Id " + pEvent["module"];
+  even += ".";
 
-	var url = (pEvent['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=" + pEvent['agent'];
+  var url =
+    pEvent["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=" +
+        pEvent["agent"];
 
-	var notification = new Notification(
-		pEvent['title'],
-		{
-			body: even,
-			icon: "images/icon.png"
-		}
-	);
+  var notification = new Notification(pEvent["title"], {
+    body: even,
+    icon: "images/icon.png"
+  });
 
-	// Add the link
-	notification.onclick = function (event) {
-		event.preventDefault();
-		window.open(url, '_blank');
-	}
+  // Add the link
+  notification.onclick = function(event) {
+    event.preventDefault();
+    window.open(url, "_blank");
+  };
 
-	// Close notification after 10 secs
-	setTimeout(function() {notification.close()}, 10000);
+  // Close notification after 10 secs
+  setTimeout(function() {
+    notification.close();
+  }, 10000);
 }
 
-function resetInterval () {
-	if (refreshTimer) clearInterval(refreshTimer);
-	refreshTimer = setInterval(main, localStorage["refresh"]*1000);
+function resetInterval() {
+  if (refreshTimer) clearInterval(refreshTimer);
+  refreshTimer = setInterval(main, localStorage["refresh"] * 1000);
 }
 
-function initilise(){
+function initilise() {
+  if (isFetching == null) isFetching = false;
+  if (localStorage["ip_address"] == undefined) {
+    localStorage["ip_address"] = "http://firefly.artica.es/pandora_demo";
+  }
 
-	if (isFetching == null) isFetching = false;
-	if(localStorage["ip_address"]==undefined){
-		localStorage["ip_address"]="http://firefly.artica.es/pandora_demo";
-	}
-	
-	if(localStorage["api_pass"]==undefined){
-		localStorage["api_pass"]="doreik0";
-	}
-	
-	if(localStorage["user_name"]==undefined){
-		localStorage["user_name"]="demo";
-	}
-	
-	if(localStorage["pass"]==undefined){
-		localStorage["pass"]="demo";
-	}
-	if(localStorage["critical"]==null){
-		localStorage["critical"]="11";
-	}
-	if(localStorage["informational"]==null){
-		localStorage["informational"]="1";
-	}
-	if(localStorage["maintenance"]==null){
-		localStorage["maintenance"]="10";
-	}
-	if(localStorage["normal"]==null){
-		localStorage["normal"]="6";
-	}
-	if(localStorage["warning"]==null){
-		localStorage["warning"]="2";
-	}
-	if(localStorage["events"]==null){
-		localStorage["events"]=20;
-	}
-	if(localStorage["refresh"]==null){
-		localStorage["refresh"]="10";
-	}
-	if(localStorage["ip_address"]==null){
-		localStorage["ip_address"]="http://firefly.artica.es/pandora_demo";
-	}
-	
-	if(localStorage["api_pass"]==null){
-		localStorage["api_pass"]="doreik0";
-	}
-	
-	if(localStorage["user_name"]==null){
-		localStorage["user_name"]="demo";
-	}
-	
-	if(localStorage["pass"]==null){
-		localStorage["pass"]="demo";
-	}
-	if(localStorage["sound_alert"]==null){
-		localStorage["sound_alert"]="on";
-	}
-	if(localStorage["changed"]==null){
-		localStorage["changed"]="false";
-	}
-	if(localStorage["new_events"]==null){
-		localStorage["new_events"]=parseInt(localStorage["events"]);
-	}
-	if(localStorage["error"]==null) {
-		localStorage["error"] = true;
-	}
+  if (localStorage["api_pass"] == undefined) {
+    localStorage["api_pass"] = "doreik0";
+  }
+
+  if (localStorage["user_name"] == undefined) {
+    localStorage["user_name"] = "demo";
+  }
+
+  if (localStorage["pass"] == undefined) {
+    localStorage["pass"] = "demo";
+  }
+  if (localStorage["critical"] == null) {
+    localStorage["critical"] = "11";
+  }
+  if (localStorage["informational"] == null) {
+    localStorage["informational"] = "1";
+  }
+  if (localStorage["maintenance"] == null) {
+    localStorage["maintenance"] = "10";
+  }
+  if (localStorage["normal"] == null) {
+    localStorage["normal"] = "6";
+  }
+  if (localStorage["warning"] == null) {
+    localStorage["warning"] = "2";
+  }
+  if (localStorage["events"] == null) {
+    localStorage["events"] = 20;
+  }
+  if (localStorage["refresh"] == null) {
+    localStorage["refresh"] = "10";
+  }
+  if (localStorage["ip_address"] == null) {
+    localStorage["ip_address"] = "http://firefly.artica.es/pandora_demo";
+  }
+
+  if (localStorage["api_pass"] == null) {
+    localStorage["api_pass"] = "doreik0";
+  }
+
+  if (localStorage["user_name"] == null) {
+    localStorage["user_name"] = "demo";
+  }
+
+  if (localStorage["pass"] == null) {
+    localStorage["pass"] = "demo";
+  }
+  if (localStorage["sound_alert"] == null) {
+    localStorage["sound_alert"] = "on";
+  }
+  if (localStorage["changed"] == null) {
+    localStorage["changed"] = "false";
+  }
+  if (localStorage["new_events"] == null) {
+    localStorage["new_events"] = parseInt(localStorage["events"]);
+  }
+  if (localStorage["error"] == null) {
+    localStorage["error"] = true;
+  }
 }
diff --git a/extras/chrome_extension/js/popup.js b/extras/chrome_extension/js/popup.js
index e323a9b12b..b799a244be 100644
--- a/extras/chrome_extension/js/popup.js
+++ b/extras/chrome_extension/js/popup.js
@@ -8,7 +8,10 @@ $(document).ready(function() {
   bg = chrome.extension.getBackgroundPage();
 
   // Display the information
-  if (bg.fetchEvents().length == 0) {
+  var events = bg.fetchEvents();
+  if (!events) {
+    showError("Failed to retrieve events, please retry");
+  } else if (events.length == 0) {
     showError("No events");
   } else {
     showEvents();
diff --git a/extras/chrome_extension/manifest.json b/extras/chrome_extension/manifest.json
index bff5586f0c..1dcefd58ef 100644
--- a/extras/chrome_extension/manifest.json
+++ b/extras/chrome_extension/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "__MSG_name__",
-  "version": "2.2",
+  "version": "2.3",
   "manifest_version": 2,
   "description": "Pandora FMS Event viewer Chrome extension",
   "homepage_url": "http://pandorafms.com",
diff --git a/extras/docker/centos8/README.MD b/extras/docker/centos8/README.MD
new file mode 100644
index 0000000000..0c5dc9a2a1
--- /dev/null
+++ b/extras/docker/centos8/README.MD
@@ -0,0 +1,145 @@
+![Image of Pandora FMS](https://pandorafms.org/wp-content/uploads/2016/06/logo_pandora_community.png)
+
+
+Pandora FMS is a __monitoring solution__ that provides unparalleled flexibility for IT to address both immediate and unforeseen operational issues, including infrastructure and IT processes.
+
+It uniquely enables business and IT to adapt to changing needs through a flexible and rapid approach to IT and business deployment. 
+
+For community support you can visit our forums at [forums.pandorafms.org](http://forums.pandorafms.org). Check out our community website at [pandorafms.org](http://pandorafms.org), and if you need sales information or/and professional support, visit [pandorafms.com](http://pandorafms.com).
+
+# Pandora FMS full stack based on Centos 8
+
+## Try it
+
+You can try it on a cloud env for 4 hours using play with docker just click in the icon bellow, wait for the pulling image and the containers will be up and running automatically
+
+If you want to open the console just click on the port 8080 on the upside and will be redirected to the pandora consola.
+
+[![Try in PWD](https://raw.githubusercontent.com/play-with-docker/stacks/master/assets/images/button.png)](https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/rafaelameijeiras/PandoraFMS/master/pandorafms_community/docker-compose-official.yml)
+
+
+https://www.youtube.com/watch?v=Hw2P6hHQpeI
+
+Note: could take a couple of minutes for the console to be ready so if you click in the 8080 port and nothing and have a blank page wait a little and reload the page
+
+## Usage
+```
+docker run --name Pandora_new %container_name% --rm \
+-p %local_httpd_port%:80 \
+-p %local_tentacle_port%:41121 \
+-e DBHOST=%Mysql_Server_IP% \
+-e DBNAME=%database_name% \
+-e DBUSER=%Mysql_user% \
+-e DBPASS=%Mysql_pass% \
+-e DBPORT=%Mysql_port% \
+-e INSTANCE_NAME=%server name% \
+-ti pandorafms-open-stack-el8
+```
+Example:
+```
+docker run --name Pandora_new --rm \
+-p 8081:80 \
+-p 41125:41121 \
+-e DBHOST=192.168.80.45 \
+-e DBNAME=pandora_demos_1 \
+-e DBUSER=pandora \
+-e DBPASS=pandora \
+-e DBPORT=3306 \
+-e INSTANCE_NAME=pandora201 \
+-ti pandorafms-open-stack-el8
+```
+
+### Integrated database for PandoraFMS container
+There is a preconfigured database image in this repo to connect the Pandora environment  so you can up the database and then point the pandora container to the database.
+
+Example:
+```
+docker run --name Pandora_DB \
+-p 3306:3306 \
+-e MYSQL_ROOT_PASSWORD=pandora \
+-e MYSQL_DATABASE=pandora \
+-e MYSQL_USER=pandora \
+-e MYSQL_PASSWORD=pandora \
+-d pandorafms/pandorafms-percona-base
+```
+
+This creates a Percona mysql docker and a database called Pandora with grants to the pandora user (optional) and the credentials for root user. 
+
+In this example we expose the 3306 for database connection. 
+
+Using this configuration (getting the container ip from DB container ip) you can execute the next container Pandora pointing to it:
+
+```
+docker run --name Pandora_new --rm \
+-p 8081:80 \
+-p 41125:41121 \
+-e DBHOST=<percona container ip> \
+-e DBNAME=pandora \
+-e DBUSER=pandora \
+-e DBPASS=pandora \
+-e DBPORT=3306 \
+-e INSTANCE_NAME=pandora_inst \
+-ti pandorafms/pandorafms-open-stack-el8
+```
+
+### Docker Compose Stack
+
+if you want to run an easy to deploy stack you may use the docker-compose.yml file
+
+```
+version: '3.1'
+services:
+  db:
+    image: pandorafms/pandorafms-percona-base
+    restart: always
+    #command: ["mysqld", "--innodb-buffer-pool-size=900M"]
+    environment:
+      MYSQL_ROOT_PASSWORD: pandora
+      MYSQL_DATABASE: pandora
+      MYSQL_USER: pandora
+      MYSQL_PASSWORD: pandora
+    networks:
+     - pandora
+
+  pandora:
+    image: pandorafms/pandorafms-open-stack-el8:latest
+    restart: always
+    depends_on:
+      - db
+    environment:
+      MYSQL_ROOT_PASSWORD: pandora
+      DBHOST: db
+      DBNAME: pandora
+      DBUSER: pandora
+      DBPASS: pandora
+      DBPORT: 3306
+      INSTANCE_NAME: pandora01
+      PUBLICURL: ""
+      SLEEP: 5
+      RETRIES: 10
+    networks:
+     - pandora
+    ports:
+      - "8080:80"
+      - "41121:41121"
+      - "162:162/udp"
+      - "9995:9995/udp"
+networks:
+  pandora:
+```
+just by running: `docker-compose -f <docker-compose-file> up`
+
+## Important Parameters:
+
+* __INSTANCE_NAME__: Pandora Server name
+* __DBHOST__: DB host IP  to MySQL engine
+* __DBNAME__: The name of the database. If your user have enough permissions to create databases, the container will create it in case automatically if didn't exist
+* __DBUSER__: The user to connect MySQL engine.
+* __DBPASS__: User password to connect MySQL engine.
+* __DBPORT__: The port to connect MySQL engine. by default 33306
+* __PUBLICURL__: Define a public URL. Useful when Pandora is used behind a reverse proxy
+* __SLEEP__: Time to wait between retries
+* __RETRIES__: How many times Pandora will try to connect to MySQL engine before fail.
+
+Note1: the SLEEP and RETRIES variables will be used to wait for database container to fully start, if you are in a slower system maybe you will need to increase these variables values, in this example will wait 5 seconds for the database container to be up and retries 3 times.
+
diff --git a/extras/docker/centos8/base/Dockerfile b/extras/docker/centos8/base/Dockerfile
new file mode 100644
index 0000000000..285f2f7ef8
--- /dev/null
+++ b/extras/docker/centos8/base/Dockerfile
@@ -0,0 +1,257 @@
+#docker build -t pandorafms/pandorafms-open-base-el8 -f $HOME/code/pandorafms/extras/docker/centos8/base/Dockerfile $HOME/code/pandorafms/extras/docker/centos8/base/
+#docker push pandorafms/pandorafms-open-base-el8
+
+FROM centos:8
+
+RUN dnf install -y --setopt=tsflags=nodocs \
+        epel-release \
+	dnf-utils \
+        http://rpms.remirepo.net/enterprise/remi-release-8.rpm
+		
+RUN dnf module reset -y php && dnf module install -y php:remi-7.3
+RUN dnf config-manager --set-enabled PowerTools
+
+# Install console
+RUN dnf install -y --setopt=tsflags=nodocs \
+        php \
+        php-mcrypt \php-cli \
+        php-gd \
+        php-curl \
+        php-session \
+        php-mysqlnd \
+        php-ldap \
+        php-zip \
+        php-zlib \
+        php-fileinfo \
+        php-gettext \
+        php-snmp \
+        php-mbstring \
+        php-pecl-zip \
+        php-xmlrpc \
+        libxslt \
+        wget \
+        php-xml \
+        httpd \
+        mod_php \
+        atk \
+        avahi-libs \
+        cairo \
+        cups-libs \
+        fribidi \
+        gd \
+        gdk-pixbuf2 \
+        ghostscript \
+        graphite2 \
+        graphviz \
+        gtk2 \
+        harfbuzz \
+        hicolor-icon-theme \
+        hwdata \
+        jasper-libs \
+        lcms2 \
+        libICE \
+        libSM \
+        libXaw \
+        libXcomposite \
+        libXcursor \
+        libXdamage \
+        libXext \
+        libXfixes \
+        libXft \
+        libXi \
+        libXinerama \
+        libXmu \
+        libXrandr \
+        libXrender \
+        libXt \
+        libXxf86vm \
+        libcroco \
+        libdrm \
+        libfontenc \
+        libglvnd \
+        libglvnd-egl \
+        libglvnd-glx \
+        libpciaccess \
+        librsvg2 \
+        libthai \
+        libtool-ltdl \
+        libwayland-client \
+        libwayland-server \
+        libxshmfence \
+        mesa-libEGL \
+        mesa-libGL \
+        mesa-libgbm \
+        mesa-libglapi \
+        pango \
+        pixman \
+        nfdump \
+        xorg-x11-fonts-75dpi \
+        xorg-x11-fonts-misc \
+        poppler-data \
+        php-yaml; yum clean all
+
+RUN mkdir -p /run/php-fpm/ ; chown -R root:apache /run/php-fpm/
+# not installed perl-Net-Telnet gtk-update-icon-cach ghostscript-fonts
+
+# Install server
+
+RUN dnf install -y  --setopt=tsflags=nodocs \
+        GeoIP \
+        GeoIP-GeoLite-data \
+        dwz \
+        efi-srpm-macros \
+        ghc-srpm-macros \
+        go-srpm-macros \
+        ocaml-srpm-macros \
+        openblas-srpm-macros \
+        perl \
+        perl-Algorithm-Diff \
+        perl-Archive-Tar \
+        perl-Archive-Zip \
+        perl-Attribute-Handlers \
+        perl-B-Debug \
+        perl-CPAN \
+        perl-CPAN-Meta \
+        perl-CPAN-Meta-Requirements \
+        perl-CPAN-Meta-YAML \
+        perl-Compress-Bzip2 \
+        perl-Config-Perl-V \
+        perl-DBD-MySQL \
+        perl-DBI \
+        perl-DB_File \
+        perl-Data-Dump \
+        perl-Data-OptList \
+        perl-Data-Section \
+        perl-Devel-PPPort \
+        perl-Devel-Peek \
+        perl-Devel-SelfStubber \
+        perl-Devel-Size \
+        perl-Digest-HMAC \
+        perl-Digest-SHA \
+        perl-Encode-Locale \
+        perl-Encode-devel \
+        perl-Env \
+        perl-ExtUtils-CBuilder \
+        perl-ExtUtils-Command \
+        perl-ExtUtils-Embed \
+        perl-ExtUtils-Install \
+        perl-ExtUtils-MM-Utils \
+        perl-ExtUtils-MakeMaker \
+        perl-ExtUtils-Manifest \
+        perl-ExtUtils-Miniperl \
+        perl-ExtUtils-ParseXS \
+        perl-File-Fetch \
+        perl-File-HomeDir \
+        perl-File-Listing \
+        perl-File-Which \
+        perl-Filter \
+        perl-Filter-Simple \
+        perl-Geo-IP \
+        perl-HTML-Parser \
+        perl-HTML-Tagset \
+        perl-HTML-Tree \
+        perl-HTTP-Cookies \
+        perl-HTTP-Date \
+        perl-HTTP-Message \
+        perl-HTTP-Negotiate \
+        perl-IO-HTML \
+        perl-IO-Socket-INET6 \
+        perl-IO-Zlib \
+        perl-IO-stringy \
+        perl-IPC-Cmd \
+        perl-IPC-SysV \
+        perl-IPC-System-Simple \
+        perl-JSON \
+        perl-JSON-PP \
+        perl-LWP-MediaTypes \
+        perl-Locale-Codes \
+        perl-Locale-Maketext \
+        perl-Locale-Maketext-Simple \
+        perl-MRO-Compat \
+        perl-Math-BigInt \
+        perl-Math-BigInt-FastCalc \
+        perl-Math-BigRat \
+        perl-Memoize \
+        perl-Module-Build \
+        perl-Module-CoreList \
+        perl-Module-CoreList-tools \
+        perl-Module-Load \
+        perl-Module-Load-Conditional \
+        perl-Module-Loaded \
+        perl-Module-Metadata \
+        perl-NTLM \
+        perl-Net-HTTP \
+        perl-Net-Ping \
+        perl-NetAddr-IP \
+        perl-Package-Generator \
+        perl-Params-Check \
+        perl-Params-Util \
+        perl-Perl-OSType \
+        perl-PerlIO-via-QuotedPrint \
+        perl-Pod-Checker \
+        perl-Pod-Html \
+        perl-Pod-Parser \
+        perl-SelfLoader \
+        perl-Socket6 \
+        perl-Software-License \
+        perl-Sub-Exporter \
+        perl-Sub-Install \
+        perl-Sys-Syslog \
+        perl-Test \
+        perl-Test-Harness \
+        perl-Test-Simple \
+        perl-Text-Balanced \
+        perl-Text-Diff \
+        perl-Text-Glob \
+        perl-Text-Template \
+        perl-Thread-Queue \
+        perl-Time-Piece \
+        perl-TimeDate \
+        perl-Try-Tiny \
+        perl-Unicode-Collate \
+        perl-WWW-RobotRules \
+        perl-XML-NamespaceSupport \
+        perl-XML-Parser \
+        perl-XML-SAX \
+        perl-XML-SAX-Base \
+        perl-XML-Simple \
+        perl-XML-Twig \
+        perl-autodie \
+        perl-bignum \
+        perl-devel \
+        perl-encoding \
+        perl-experimental \
+        perl-inc-latest \
+        perl-libnetcfg \
+        perl-libwww-perl \
+        perl-local-lib \
+        perl-open \
+        perl-perlfaq \
+        perl-srpm-macros \
+        perl-utils \
+        perl-version \
+        python-srpm-macros \
+        python3-pyparsing \
+        python3-rpm-macros \
+        qt5-srpm-macros \
+        redhat-rpm-config \
+        rust-srpm-macros \
+        systemtap-sdt-devel \
+        perl-TermReadKey \
+        perl \
+        perl-DBD-MySQL \
+        perl-DBI \
+        initscripts \
+        net-tools \
+        nmap-ncat \
+        nmap \
+        net-snmp-utils \
+        sudo \
+        http://firefly.artica.es/centos8/perl-Net-Telnet-3.04-1.el8.noarch.rpm \
+        http://www6.atomicorp.com/channels/atomic/centos/7/x86_64/RPMS/wmi-1.3.14-4.el7.art.x86_64.rpm 
+
+
+RUN dnf install -y supervisor crontabs mysql http://firefly.artica.es/centos8/phantomjs-2.1.1-1.el7.x86_64.rpm --setopt=tsflags=nodocs
+
+
+EXPOSE 80 443 41121 162/udp
diff --git a/extras/docker/centos8/build_image_el8.sh b/extras/docker/centos8/build_image_el8.sh
new file mode 100755
index 0000000000..00c50f6ff2
--- /dev/null
+++ b/extras/docker/centos8/build_image_el8.sh
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+VERSION=$1
+ENT="$HOME/code/pandora_enterprise"
+OPEN="$HOME/code/pandorafms"
+OS="Centos"
+ARCH="x86_64"
+EL="el7"
+EXT="demo"
+TARGET_URL="http://atlantis.artica.es"
+DOCKER_PATH="$OPEN/extras/docker/centos8/"
+OSTACK_IMAGE="pandorafms/pandorafms-open-stack-el8"
+OBASE_IMAGE="pandorafms/pandorafms-open-base-el8"
+PERCONA_IMAGE="pandorafms/pandorafms-percona-base"
+
+
+function help {
+	echo "To excute the builder you must declare 4 parameters: the version image, upload (push) tokens, build base (rebuild centos base image), build percona (rebuild percona base image)"
+	echo ""
+	echo "$0 <version> [ <push 0|1> ] [<build base 0|1>] [<build percona 0|1>]"
+    echo "Ex creates a local image from 749 packages : $0 749 0 1 1" 
+}
+
+if [ "$1" == "" ] || [ "$1" == "-h" ] ; then
+	help
+    exit
+fi
+
+if [ "$2" == "1" ]; then
+	UPDATE="1"
+fi
+
+if [ "$3" == "1" ]; then
+	BASEBUILD="1"
+fi
+
+if [ "$4" == "1" ]; then
+	DBBUILD="1"
+fi
+
+#Defining packages urls
+
+oconsoleurl=$TARGET_URL/Releases/7.0NG.$VERSION/$OS/noarch/pandorafms_console-7.0NG.$VERSION.noarch.rpm
+oserverurl=$TARGET_URL/Releases/7.0NG.$VERSION/$OS/noarch/pandorafms_server-7.0NG.$VERSION.noarch.rpm
+url=$(curl -I -s $TARGET_URL/Releases/7.0NG.$VERSION/ 2> /dev/null | grep "200 OK" | wc -l)
+
+# log in into docker acount to acces private repo.
+
+# docker login -u $DOCKERUSER -p$DOCKERPASS
+
+Check athlantis is reachable
+if [ "$url" -lt 1 ] ; then
+    echo "$url Athlantis unreachable ..."
+    exit
+fi
+
+echo "Start"
+# Removing old packages
+cd $DOCKER_PATH/pandora-stack/sources
+rm -rf ./pandorafms_*
+
+# Downloading new packages
+wget $oconsoleurl
+wget $oserverurl
+
+if [ "$BASEBUILD" == 1 ] ; then
+	# Open Base image
+	echo "building Base el8 image"
+	cd $DOCKER_PATH/base
+	docker build -t $OBASE_IMAGE:$VERSION -f $DOCKER_PATH/base/Dockerfile $DOCKER_PATH/base
+	echo "Taging Open stack el8 latest image before upload"	
+	docker tag $OBASE_IMAGE:$VERSION  $OBASE_IMAGE:latest
+	echo -e ">>>> \n"
+fi
+
+if [ "$DBBUILD" == 1 ] ; then
+	# Percona image
+	echo "building Percona image"
+	cd $OPEN/extras/docker/percona
+	docker build -t $PERCONA_IMAGE:latest -f $OPEN/extras/docker/percona/Dockerfile $OPEN/extras/docker/percona
+	echo -e ">>>> \n"
+fi
+
+#Open Stack image
+echo "building Open el8 image"
+cd $DOCKER_PATH/pandora-stack
+docker build -t $OSTACK_IMAGE:$VERSION -f $DOCKER_PATH/pandora-stack/Dockerfile $DOCKER_PATH/pandora-stack
+echo "Taging Open base latest image before upload"	
+docker tag $OSTACK_IMAGE:$VERSION  $OSTACK_IMAGE:latest
+echo -e ">>>> \n"
+
+# Upload images
+
+if [ "$UPDATE" == 1 ] ; then
+	if [ "$BASEBUILD" == 1 ] ; then
+	#Open base Images
+		echo "Uploading Open $OBASE_IMAGE:$VERSION . . ."
+		docker push $OBASE_IMAGE:$VERSION
+		docker push $OBASE_IMAGE:latest
+	fi
+
+	if [ "$DBBUILD" == 1 ] ; then
+		#Open base Images		
+		echo "Uploading percona $PERCONA_IMAGE:latest . . ."
+		docker push $PERCONA_IMAGE:latest
+	fi
+
+	#Open Stack Images
+	echo "Uploading Open $OSTACK_IMAGE:$VERSION . . ."
+	docker push $OSTACK_IMAGE:$VERSION
+	docker push $OSTACK_IMAGE:latest
+fi
diff --git a/extras/docker/centos8/docker-compose.yml b/extras/docker/centos8/docker-compose.yml
new file mode 100644
index 0000000000..5ac5385133
--- /dev/null
+++ b/extras/docker/centos8/docker-compose.yml
@@ -0,0 +1,43 @@
+# Use root/example as user/password credentials
+# este compose incluye la base de datos en otro docker y levanta aplicacion y DB juntos
+version: '3.1'
+
+services:
+
+  db:
+    image: pandorafms/pandorafms-percona-base
+    restart: always
+    #command: ["mysqld", "--innodb-buffer-pool-size=900M"] 
+    environment:
+      MYSQL_ROOT_PASSWORD: pandora
+      MYSQL_DATABASE: pandora
+      MYSQL_USER: pandora
+      MYSQL_PASSWORD: pandora
+    networks:
+     - pandora
+
+  pandora:
+    image: pandorafms/pandorafms-open-stack-el8:latest
+    restart: always
+    depends_on:
+      - db
+    environment:
+      MYSQL_ROOT_PASSWORD: pandora
+      DBHOST: db
+      DBNAME: pandora
+      DBUSER: pandora
+      DBPASS: pandora
+      DBPORT: 3306
+      INSTANCE_NAME: pandora01
+      PUBLICURL: ""
+      SLEEP: 5
+      RETRIES: 10
+    networks:
+     - pandora
+    ports:
+      - "8080:80"
+      - "41121:41121"
+      - "162:162/udp"
+      - "9995:9995/udp"
+networks:
+  pandora:
diff --git a/extras/docker/centos8/pandora-stack/Dockerfile b/extras/docker/centos8/pandora-stack/Dockerfile
new file mode 100644
index 0000000000..59728b37d6
--- /dev/null
+++ b/extras/docker/centos8/pandora-stack/Dockerfile
@@ -0,0 +1,24 @@
+#docker build -t pandorafms/pandorafms-open-stack-el8:$VERSION -f $HOME/code/pandorafms/extras/docker/centos8/pandora-stack/Dockerfile $HOME/code/pandorafms/extras/docker/centos8/pandora-stack/
+
+FROM pandorafms/pandorafms-open-base-el8
+
+ENV DBNAME=pandora
+ENV DBUSER=pandora
+ENV DBPASS=pandora
+ENV DBHOST=pandora
+ENV DBPORT=3306
+ENV SLEEP=5
+ENV RETRIES=1
+ENV OPEN=1
+
+ENV LC_ALL=C
+
+RUN	rm -rf /etc/localtime ; ln -s /usr/share/zoneinfo/Europe/Madrid /etc/localtime 
+
+COPY ./sources /opt/pandora
+# Install the Pandora console
+RUN dnf install -y /opt/pandora/pandorafms_console-*.rpm /opt/pandora/pandorafms_server-*.rpm ; yum clean all
+
+EXPOSE 80 443 41121 162/udp 9995/udp
+
+CMD sh /opt/pandora/init_pandora.sh
diff --git a/extras/docker/centos8/pandora-stack/sources/.gitignore b/extras/docker/centos8/pandora-stack/sources/.gitignore
new file mode 100644
index 0000000000..9e870cb2e3
--- /dev/null
+++ b/extras/docker/centos8/pandora-stack/sources/.gitignore
@@ -0,0 +1,5 @@
+# exclude packages
+demos/
+*.tar*
+*.rpm
+phantomjs
diff --git a/extras/docker/centos8/pandora-stack/sources/init_pandora.sh b/extras/docker/centos8/pandora-stack/sources/init_pandora.sh
new file mode 100755
index 0000000000..56424e6cb9
--- /dev/null
+++ b/extras/docker/centos8/pandora-stack/sources/init_pandora.sh
@@ -0,0 +1,336 @@
+#!/bin/bash
+#
+#  Prepares environment and launchs Pandora FMS
+#
+# Global vars
+#
+PANDORA_CONSOLE=/var/www/html/pandora_console
+PANDORA_SERVER_CONF=/etc/pandora/pandora_server.conf
+PANDORA_SERVER_BIN=/usr/bin/pandora_server
+PANDORA_HA_BIN=/usr/bin/pandora_ha
+PANDORA_TABLES_MIN=160
+#
+# Check database
+#
+function db_check {
+	# Check DB
+	echo -n ">> Checking dbengine connection: "
+
+	for i in `seq $RETRIES`; do 
+		r=`echo 'select 1' | mysql -u$DBUSER -p$DBPASS -P$DBPORT -h$DBHOST -A`
+		if [ $? -ne 0 ]; then
+			echo -n "retriying DB conection in $SLEEP seconds: " 
+			sleep $SLEEP
+		else
+			break
+		fi
+	done
+
+	r=`echo 'select 1' | mysql -u$DBUSER -p$DBPASS -P$DBPORT -h$DBHOST -A`
+	if [ $? -eq 0 ]; then
+		echo "OK"
+		echo -n ">> Checking database connection: "
+		r=`echo 'select 1' | mysql -u$DBUSER -p$DBPASS -P$DBPORT -h$DBHOST -A $DBNAME`
+		if [ $? -eq 0 ]; then
+			echo "OK"
+			return 0
+		fi
+		echo -n ">> Cannot connect to $DBNAME, trying to create: "
+		r=`echo "create database $DBNAME" | mysql -u$DBUSER -p$DBPASS -P$DBPORT -h$DBHOST`
+		if [ $? -eq 0 ]; then
+			echo "OK"
+			return 0
+		fi
+		echo "Cannot create database $DBNAME on $DBUSER@$DBHOST:$DBPORT"
+
+		return 1
+	fi
+
+	if [ "$DEBUG" == "1" ]; then
+		echo "Command: [echo 'select 1' | mysql -u$DBUSER -p$DBPASS -P$DBPORT -h$DBHOST -A $DBNAME]"
+		echo "Output: [$r]"
+
+		traceroute $DBHOST
+		nmap $DBHOST -v -v -p $DBPORT
+	fi
+
+
+	return 1
+}
+
+# Load database
+#
+function db_load {
+	# Load DB
+	echo -n ">> Checking database state:"
+	r=`mysql -u$DBUSER -p$DBPASS -P$DBPORT -h$DBHOST -A $DBNAME -s -e 'show tables'| wc -l`
+	if [ "$DEBUG" == "1" ]; then
+		echo "Command: [mysql -u$DBUSER -p$DBPASS -P$DBPORT -h$DBHOST -A $DBNAME -s -e 'show tables'| wc -l]"
+		echo "Output: [$r]"
+	fi
+
+	if [ "$r" -ge "$PANDORA_TABLES_MIN" ]; then
+		echo 'OK. Already exists, '$r' tables detected'
+		return 0
+	fi
+	echo 'Empty database detected';
+
+	# Needs to be loaded.
+	echo -n "- Loading database schema: "
+	r=`mysql -u$DBUSER -p$DBPASS -P$DBPORT -h$DBHOST $DBNAME < $PANDORA_CONSOLE/pandoradb.sql`
+	if [ $? -ne 0 ]; then
+		echo "mysql -u$DBUSER -p$DBPASS -P$DBPORT -h$DBHOST $DBNAME < $PANDORA_CONSOLE/pandoradb.sql"
+		echo "ERROR"
+		echo "$r"
+		return 1;
+	fi
+	echo "OK"
+
+	echo -n "- Loading database data: "
+	r=`mysql -u$DBUSER -p$DBPASS -P$DBPORT -h$DBHOST $DBNAME < $PANDORA_CONSOLE/pandoradb_data.sql`
+	if [ $? -ne 0 ]; then
+		echo "ERROR"
+		echo $r
+		return 2;
+	fi
+	echo "OK"
+
+	# Loaded.
+	return 0
+}
+
+#
+# Prepare & start Pandora FMS Console
+#
+function console_prepare {
+	CONSOLE_PATH=/var/www/html/pandora_console
+
+	echo ">> Preparing console"
+	# Delete install and license files.
+	mv $CONSOLE_PATH/install.php $CONSOLE_PATH/install.done
+	rm -f $CONSOLE_PATH/enterprise/PandoraFMS_Enteprise_Licence.txt
+
+	# Configure console.
+	cat > $CONSOLE_PATH/include/config.php << EO_CONFIG_F
+<?php
+\$config["dbtype"] = "mysql";
+\$config["dbname"]="$DBNAME";
+\$config["dbuser"]="$DBUSER";
+\$config["dbpass"]="$DBPASS";
+\$config["dbhost"]="$DBHOST";
+\$config["homedir"]="/var/www/html/pandora_console";
+\$config["homeurl"]="/pandora_console";	
+error_reporting(0); 
+\$ownDir = dirname(__FILE__) . '/';
+include (\$ownDir . "config_process.php");
+
+EO_CONFIG_F
+
+	# enable allow override 
+	cat > /etc/httpd/conf.d/pandora.conf << EO_CONFIG_F
+<Directory "/var/www/html">
+    Options Indexes FollowSymLinks
+    AllowOverride All
+    Require all granted
+</Directory>
+
+EO_CONFIG_F
+
+	cat > /var/www/html/index.html << EOF_INDEX
+<meta HTTP-EQUIV="REFRESH" content="0; url=/pandora_console/">
+EOF_INDEX
+	
+	echo "- Fixing permissions"
+	chmod 600 $CONSOLE_PATH/include/config.php	
+	chown -R apache. $CONSOLE_PATH
+
+	# prepare php.ini
+	sed -i -e "s/^max_input_time.*/max_input_time = -1/g" /etc/php.ini
+	sed -i -e "s/^max_execution_time.*/max_execution_time = 0/g" /etc/php.ini
+	sed -i -e "s/^upload_max_filesize.*/upload_max_filesize = 800M/g" /etc/php.ini
+	sed -i -e "s/^memory_limit.*/memory_limit = 500M/g" /etc/php.ini
+
+ 	echo "- Setting Public URL: $PUBLICURL"
+ 	q=$(mysql -u$DBUSER -p$DBPASS $DBNAME -h$DBHOST -sNe "select token from tconfig;" | grep public_url)
+	[[ ! "$q" ]] && mysql -u $DBUSER -p$DBPASS $DBNAME -P$DBPORT -h$DBHOST -sNe  "INSERT INTO tconfig (token,value) VALUES ('public_url',\"$PUBLICURL\");"
+	mysql -u$DBUSER -p$DBPASS $DBNAME -h$DBHOST -sNe "UPDATE tconfig SET value=\"$PUBLICURL\" WHERE token=\"public_url\";"
+
+#touch $CONSOLE_PATH/pandora_console.log 
+#chown apache. $CONSOLE_PATH/pandora_console.log
+
+}
+
+function check_mr {
+		## geting MR + Package
+		CMR=$(mysql -u$DBUSER -p$DBPASS $DBNAME -h$DBHOST -sNe "select value from tconfig where token = 'MR'")
+		CPK=$(mysql -u$DBUSER -p$DBPASS $DBNAME -h$DBHOST -sNe "select value from tconfig where token = 'current_package_enterprise'")
+
+		DPK=$(grep pandora_version $PANDORA_CONSOLE/include/config_process.php | awk '{print $3}' | tr -d "'" | tr -d ";" | cut -d . -f 3)
+		DMR=$(ls $PANDORA_CONSOLE/extras/mr/ | sort -n | tail -1 | cut -d . -f 1)
+		
+		if [[ $DMR -gt $CMR ]]; then
+			echo ">> Fixing DB: MR: $CMR Current Package: $CPK Desired MR: $DMR"
+			cd  $PANDORA_CONSOLE/extras/mr/
+            for i in $(ls | sort -n); do
+                    cat $i | mysql -u$DBUSER -p$DBPASS $DBNAME -h$DBHOST
+                done
+        	cd -
+			
+			echo ">> Updating DB: MR: $CMR Current Package: $CPK Desired MR: $DMR"
+
+            mysql -u $DBUSER -p$DBPASS $DBNAME -h$DBHOST -sNe "update tconfig set value = $DMR where token = 'MR';"
+            mysql -u $DBUSER -p$DBPASS $DBNAME -h$DBHOST -sNe "update tconfig set value = $DPK where token = 'current_package_enterprise';"
+        fi
+
+
+}
+
+function server_prepare {
+	sed -i -e "s/^dbhost.*/dbhost $DBHOST/g" $PANDORA_SERVER_CONF
+	sed -i -e "s/^dbname.*/dbname $DBNAME/g" $PANDORA_SERVER_CONF
+	sed -i -e "s/^dbuser.*/dbuser $DBUSER/g" $PANDORA_SERVER_CONF
+	sed -i -e "s|^dbpass.*|dbpass $DBPASS|g" $PANDORA_SERVER_CONF
+	sed -i -e "s/^dbport.*/dbport $DBPORT/g" $PANDORA_SERVER_CONF
+	sed -i -e "s/^#servername.*/servername $INSTANCE_NAME/g" $PANDORA_SERVER_CONF
+	echo "pandora_service_cmd /etc/init.d/pandora_server" >> $PANDORA_SERVER_CONF
+
+	# prepare snmptrapd
+	cat > /etc/snmp/snmptrapd.conf << EOF
+authCommunity log public
+disableAuthorization yes
+EOF
+
+	## Enable WUX
+	if [ "$WUX_SERVER" == "1" ] && [ "$WUX_HOST" ]; then
+		if [ ! $WUX_PORT ]; then
+			WUX_PORT=4444
+		fi
+		echo "Enabling WUX server HOST=$WUX_HOST PORT=$WUX_PORT"
+		sed -i -r "s/#?wuxserver.*/wuxserver 1/g" $PANDORA_SERVER_CONF
+		sed -i -r "s/#?wux_host.*/wux_host $WUX_HOST/g" $PANDORA_SERVER_CONF
+		sed -i -r "s/#?wux_port.*/wux_port $WUX_PORT/g" $PANDORA_SERVER_CONF
+
+	fi
+}
+
+
+##
+## MAIN
+##
+
+if [ "$DBUSER" == "" ] || [ "$DBPASS" == "" ] || [ "$DBNAME" == "" ] || [ "$DBHOST" == "" ]; then
+	echo "Required environemntal variables DBUSER, DBPASS, DBNAME, DBHOST"
+	exit 1
+fi
+if [ "$DBPORT" == "" ]; then
+	DBPORT=3306
+fi
+
+echo "" > /opt/pandora/crontasks || touch /opt/pandora/crontasks
+
+
+#install pandora packages
+echo "-> Istalling pandorafms"
+cd /opt/pandora
+useradd pandora
+
+if [[ $OPEN != 1 ]]; then
+	# install enterprise
+	dnf install -y /opt/pandora/pandorafms_console*.rpm
+	tar xvfz /opt/pandora/pandorafms_server_*tar* && cd pandora_server  && ./pandora_server_installer --install ; rm -rf /opt/pandora/pandora_server
+	[[ -e /var/www/html/pandora_console/include/config.php ]] || yum reinstall -y /opt/pandora/pandorafms*.rpm
+	PANDORA_BIN="pandora_ha"
+	PANDORA_EXEC="/usr/bin/pandora_ha /etc/pandora/pandora_server.conf"
+else
+	install only open
+	dnf install -y /opt/pandora/pandorafms_console-*.rpm /opt/pandora/pandorafms_server-*.rpm
+	dnf reinstall -y /opt/pandora/pandorafms_server-*.rpm
+	[[ -e /var/www/html/pandora_console/include/config.php ]] || dnf reinstall -y /opt/pandora/pandorafms_console-*.rpm
+	PANDORA_BIN="pandora_server"
+	PANDORA_EXEC="/usr/bin/pandora_server /etc/pandora/pandora_server.conf"
+fi
+
+
+
+db_check && db_load
+
+# Sync to MC.
+if [ "$META_DBNAME" != "" ] && [ "$META_DBHOST" != "" ]; then
+	if [ "$META_DBPORT" == "" ]; then
+		META_DBPORT=3306
+	fi
+	register_mc
+fi
+
+check_mr 
+console_prepare 
+server_prepare
+
+echo  ">> Enable oracle env file cron: "
+cat > /etc/pandora/pandora_server.env << 'EOF_ENV'
+#!/bin/bash
+VERSION=19.8
+export PATH=$PATH:$HOME/bin:/usr/lib/oracle/$VERSION/client64/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/oracle/$VERSION/client64/lib
+export ORACLE_HOME=/usr/lib/oracle/$VERSION/client64
+EOF_ENV
+
+echo  ">> Enable discovery cron: "
+#while true ; do wget -q -O - --no-check-certificate http://localhost/pandora_console/enterprise/cron.php >> /var/www/html/pandora_console/pandora_console.log && sleep 60 ; done &
+echo "*/5 * * * * wget -q -O - --no-check-certificate http://localhost/pandora_console/enterprise/cron.php >> /var/www/html/pandora_console/log/cron.log" >> /opt/pandora/crontasks
+
+echo  ">> Enable pandora_db cron: "
+/usr/bin/perl /usr/share/pandora_server/util/pandora_db.pl /etc/pandora/pandora_server.conf
+#while true ; do sleep 1h && /usr/bin/pandora_db /etc/pandora/pandora_server.conf; done &
+echo "0 */1 * * * /usr/bin/pandora_db /etc/pandora/pandora_server.conf" >> /opt/pandora/crontasks
+
+echo ">> Loading crontab tasks"
+crontab -r
+crontab /opt/pandora/crontasks && crontab -l
+
+ip addr | grep -w "inet" | grep -v "127.0.0.1" | grep -v -e "172.1[0-9].0.1" | awk '{print $2}' | awk -F '/' '{print "-> Go to http://"$1"/pandora_console to manage this server"}'
+
+# Check and launch supervisord
+echo  ">> Starting process:  Running supervisord"
+# Create supervisor.conf
+
+cat > /etc/supervisord.conf << EOF_CON
+[unix_http_server]
+file=/tmp/supervisor.sock
+
+[supervisord]
+nodaemon=true
+loglevel = debug
+
+[program:php-fpm]
+command=/usr/sbin/php-fpm -F
+riredirect_stderr=true
+
+[program:httpd]
+command=/usr/sbin/apachectl -DFOREGROUND
+riredirect_stderr=true
+
+[program:tentacle]
+command=/etc/init.d/tentacle_serverd restart
+
+[program:$PANDORA_BIN]
+command=$PANDORA_EXEC
+riredirect_stderr=true
+
+[program:cron]
+command=crond -n
+
+[group:allservices]
+programs=httpd,cron,php-fpm,$PANDORA_BIN,tentacle
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///tmp/supervisor.sock
+
+EOF_CON
+
+# execute supervisor
+touch /var/log/pandora/pandora_server.log ; tail -F /var/log/pandora/* &
+su - -c supervisord
diff --git a/extras/docker/percona/Dockerfile b/extras/docker/percona/Dockerfile
new file mode 100644
index 0000000000..82b97401d6
--- /dev/null
+++ b/extras/docker/percona/Dockerfile
@@ -0,0 +1,31 @@
+
+#docker build -t pandorafms/pandorafms-percona-base -f $HOME/code/pandorafms/extras/docker/percona/Dockerfile $HOME/code/pandorafms/extras/docker/percona
+
+FROM percona:5.7
+
+RUN echo -e '#PandoraFMS configuration \n\ 
+[mysqld] \n\
+max_allowed_packet = 64M \n\
+innodb_buffer_pool_size = 500M \n\
+innodb_lock_wait_timeout = 90 \n\
+innodb_file_per_table \n\
+innodb_flush_log_at_trx_commit = 0 \n\
+innodb_flush_method = O_DIRECT \n\
+innodb_log_file_size = 64M \n\
+innodb_log_buffer_size = 16M \n\
+innodb_io_capacity = 100 \n\
+thread_cache_size = 8 \n\
+thread_stack    = 256K \n\
+max_connections = 100 \n \n\
+key_buffer_size=4M \n\
+read_buffer_size=128K \n\
+read_rnd_buffer_size=128K \n\
+sort_buffer_size=128K \n\
+join_buffer_size=4M \n\n\
+query_cache_type = 1 \n\
+query_cache_size = 64M \n\
+query_cache_min_res_unit = 2k \n\
+query_cache_limit = 256K \n\n\
+sql_mode="" ' > /etc/my.cnf.d/pandora.cnf
+
+EXPOSE 3306
diff --git a/extras/docker/percona/README.MD b/extras/docker/percona/README.MD
new file mode 100644
index 0000000000..036cf7e0f9
--- /dev/null
+++ b/extras/docker/percona/README.MD
@@ -0,0 +1,50 @@
+![Image of Pandora FMS](https://pandorafms.org/wp-content/uploads/2016/06/logo_pandora_community.png)
+
+# Pandora FMS database container
+
+This container image is designed for optimal performance using Pandora FMS.
+
+Is based on the official Percona database image turned to  get the maximum performance on PandoraFMS
+
+## Official Gitgub repo
+
+Dockerfiles and more info in our official repository: https://github.com/pandorafms/pandorafms/tree/develop/extras/docker/percona
+
+## USAGE
+
+Similar to the official percona image: 
+Example:
+```
+docker run --name Pandora_DB \
+-p 3306:3306 \
+-e MYSQL_ROOT_PASSWORD=pandora \
+-e MYSQL_DATABASE=pandora \
+-e MYSQL_USER=pandora \
+-e MYSQL_PASSWORD=pandora \
+-d pandorafms/pandorafms-percona-base
+```
+
+## Environment Variables
+When you start the percona image, you can adjust the configuration of the instance by passing one or more environment variables on the docker run command line. Do note that none of the variables below will have any effect if you start the container with a data directory that already contains a database: any pre-existing database will always be left untouched on container startup.
+
+__MYSQL_ROOT_PASSWORD__ : This variable is mandatory and specifies the password that will be set for the root superuser account. In the above example, it was set to my-secret-pw.
+
+__MYSQL_ROOT_HOST__ : By default, root can connect from anywhere. This option restricts root connections to be from the specified host only. Also localhost can be used here for the local-only root access.
+
+__MYSQL_DATABASE__ :
+This variable is optional and allows you to specify the name of a database to be created on image startup. If a user/password was supplied (see below) then that user will be granted superuser access (corresponding to GRANT ALL) to this database.
+
+__MYSQL_USER, MYSQL_PASSWORD__ :These variables are optional, used in conjunction to create a new user and to set that user's password. This user will be granted superuser permissions (see above) for the database specified by the MYSQL_DATABASE variable. Both variables are required for a user to be created.
+Do note that there is no need to use this mechanism to create the root superuser, that user gets created by default with the password specified by the MYSQL_ROOT_PASSWORD variable.
+
+__MYSQL_ALLOW_EMPTY_PASSWORD__ : This is an optional variable. Set to yes to allow the container to be started with a blank password for the root user. NOTE: Setting this variable to yes is not recommended unless you really know what you are doing, since this will leave your instance completely unprotected, allowing anyone to gain complete superuser access.
+
+__MYSQL_RANDOM_ROOT_PASSWORD__ : This is an optional variable. Set to yes to generate a random initial password for the root user (using pwgen). The generated root password will be printed to stdout (GENERATED ROOT PASSWORD: .....).
+
+__MYSQL_ONETIME_PASSWORD__ : Sets root (not the user specified in MYSQL_USER!) user as expired once init is complete, forcing a password change on first login. NOTE: This feature is supported on MySQL 5.6+ only. Using this option on MySQL 5.5 will throw an appropriate error during initialization.
+
+__MYSQL_INITDB_SKIP_TZINFO__ : At first run MySQL automatically loads from the local system the timezone information needed for the CONVERT_TZ() function. If it's is not what is intended, this option disables timezone loading.
+
+__INIT_TOKUDB__ : Tuns on TokuDB Engine. It can be activated only when transparent huge pages (THP) are disabled.
+
+__INIT_ROCKSDB__ : Tuns on RocksDB Engine.
\ No newline at end of file
diff --git a/extras/firefox_extension/chrome/content/js/main.js b/extras/firefox_extension/chrome/content/js/main.js
index a5452c5bf4..c9cd394197 100644
--- a/extras/firefox_extension/chrome/content/js/main.js
+++ b/extras/firefox_extension/chrome/content/js/main.js
@@ -1,245 +1,262 @@
-if ("undefined" == typeof(PandoraChrome)) {
-    var PandoraChrome = {};
-    var prefManager = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService).getBranch("pandora.");
+/* globals Components, req */
+if ("undefined" == typeof PandoraChrome) {
+  var PandoraChrome = {};
+  var prefManager = Components.classes["@mozilla.org/preferences-service;1"]
+    .getService(Components.interfaces.nsIPrefService)
+    .getBranch("pandora.");
 
-    var timer = null;
-    var allEvents=new Array();
-    var newEvents=new Array();
-    var oldEvents=new Array();
-    var api_div_numbers=21;
-};
- 
-    
-     
-        
-        
-PandoraChrome.fn = function(){
-    return {
-        displaySideBar: function(){
-            PandoraChrome.fn.hideNotification();
-            PandoraChrome.fn.hideBadge();
-            toggleSidebar('viewPandoraSidebar');
-        },
-        displayDialog : function(){
-            window.openDialog("chrome://pandorasidebar/content/options.xul", "","chrome, centerscreen, dialog, modal, resizable=no", null).focus();
-        },
-        handleClick: function(e){
-            if(e.button == 0){
-                toggleSidebar('viewPandoraSidebar'); 
-                PandoraChrome.fn.setIcon('icon16');
-            }
-        },
-                
-        Onloading: function () {
-            if(prefManager.getBoolPref("firstLoad")){
-                prefManager.setIntPref("new_events",prefManager.getIntPref("events"));
-                prefManager.setBoolPref("firstLoad",false);
-            }
+  var timer = null;
+  var allEvents = new Array();
+  var newEvents = new Array();
+  var oldEvents = new Array();
+  var api_div_numbers = 21;
+}
 
-            if(timer) {
-                clearTimeout(timer);
-            }
-            timer =setTimeout(PandoraChrome.fn.main , 100 );
-        },
+PandoraChrome.fn = (function() {
+  return {
+    displaySideBar: function() {
+      PandoraChrome.fn.hideNotification();
+      PandoraChrome.fn.hideBadge();
+      toggleSidebar("viewPandoraSidebar");
+    },
+    displayDialog: function() {
+      window
+        .openDialog(
+          "chrome://pandorasidebar/content/options.xul",
+          "",
+          "chrome, centerscreen, dialog, modal, resizable=no",
+          null
+        )
+        .focus();
+    },
+    handleClick: function(e) {
+      if (e.button == 0) {
+        toggleSidebar("viewPandoraSidebar");
+        PandoraChrome.fn.setIcon("icon16");
+      }
+    },
 
-        
+    Onloading: function() {
+      if (prefManager.getBoolPref("firstLoad")) {
+        prefManager.setIntPref("new_events", prefManager.getIntPref("events"));
+        prefManager.setBoolPref("firstLoad", false);
+      }
 
-        main: function() {
-           // alert('test_main');
-            var url=prefManager.getCharPref("ip_address")+'/include/api.php?op=get&op2=events&return_type=csv&apipass='+prefManager.getCharPref("api_pass")+'&user='+prefManager.getCharPref("user_name")+'&pass='+prefManager.getCharPref("pass");
-            var feedUrl = url;
-            prefManager.setBoolPref("data_check", true);
-            req = new XMLHttpRequest();
-            req.onload = PandoraChrome.fn.handleResponse;
-            req.onerror = PandoraChrome.fn.handleError;
-            req.open("GET", feedUrl, true);
-            req.send(null);
-        },
+      if (timer) {
+        clearTimeout(timer);
+      }
+      timer = setTimeout(PandoraChrome.fn.main, 100);
+    },
 
-        handleError: function() {
-            //alert("error");
-            prefManager.setCharPref("data",null);
-            prefManager.setBoolPref("data_check", false);
-            if(timer) {
-                clearTimeout(timer);
-            }
-            timer =setTimeout(PandoraChrome.fn.main , 1000);
-        },
+    main: function() {
+      // alert('test_main');
+      var url =
+        prefManager.getCharPref("ip_address") +
+        "/include/api.php?op=get&op2=events&return_type=json";
+      var feedUrl = url;
+      var data = new FormData();
 
-        handleResponse: function () {
-            var doc = req.responseText;
-            if (doc=="auth error") {
-                prefManager.setCharPref("data",null);
-                prefManager.setBoolPref("data_check", false);
-                if(timer) {
-                    clearTimeout(timer);
-                }
-                timer =setTimeout(PandoraChrome.fn.main , 1000);
+      data.append("apipass", prefManager.getCharPref("api_pass"));
+      data.append("user", prefManager.getCharPref("user_name"));
+      data.append("pass", prefManager.getCharPref("pass"));
 
-            }
-            else{
-                var n=doc.search("404 Not Found");
-                if(n>0){
+      prefManager.setBoolPref("data_check", true);
+      req = new XMLHttpRequest();
+      req.onload = PandoraChrome.fn.handleResponse;
+      req.onerror = PandoraChrome.fn.handleError;
+      req.open("POST", feedUrl, true);
+      req.send(data);
+    },
 
-                    prefManager.setCharPref("data",null);
-                    prefManager.setBoolPref("data_check", false);
-                    if(timer) {
-                        clearTimeout(timer);
-                    }
-                    timer =setTimeout(PandoraChrome.fn.main , 1000);
-                }
-                
-                else{
-                    prefManager.setBoolPref("data_check", true);
+    handleError: function() {
+      //alert("error");
+      prefManager.setCharPref("data", null);
+      prefManager.setBoolPref("data_check", false);
+      if (timer) {
+        clearTimeout(timer);
+      }
+      timer = setTimeout(PandoraChrome.fn.main, 1000);
+    },
 
-                    prefManager.setCharPref("data",doc);
-                    PandoraChrome.fn.getEvents(doc);
-                }
-            }
-        },
+    handleResponse: function() {
+      var doc = req.responseText;
+      if (doc == "auth error") {
+        prefManager.setCharPref("data", null);
+        prefManager.setBoolPref("data_check", false);
+        if (timer) {
+          clearTimeout(timer);
+        }
+        timer = setTimeout(PandoraChrome.fn.main, 1000);
+      } else {
+        var n = doc.search("404 Not Found");
+        if (n > 0) {
+          prefManager.setCharPref("data", null);
+          prefManager.setBoolPref("data_check", false);
+          if (timer) {
+            clearTimeout(timer);
+          }
+          timer = setTimeout(PandoraChrome.fn.main, 1000);
+        } else {
+          prefManager.setBoolPref("data_check", true);
 
-        getEvents: function (reply){
-            if(reply.length>100){
-                all_event_array=reply.split("\n");
-                allEvents=PandoraChrome.fn.divideArray(all_event_array);
-                if(oldEvents.length==0){
-                    oldEvents=allEvents;
-                }
+          prefManager.setCharPref("data", doc);
+          PandoraChrome.fn.getEvents(doc);
+        }
+      }
+    },
 
-
-                newEvents=PandoraChrome.fn.fetchNewEvents(allEvents,oldEvents);
-                 if(newEvents.length!=0){
-                    for(var k=0;k<newEvents.length;k++){
-                        var temp=prefManager.getIntPref("new_events")+1;
-                        prefManager.setIntPref("new_events",temp);
-                        PandoraChrome.fn.showNotification(k);
-                        PandoraChrome.fn.showBadge(prefManager.getIntPref("new_events"));
-
-                    }
-                }
-                oldEvents=allEvents;
-                if(prefManager.getIntPref("new_events")>0){
-                        PandoraChrome.fn.showBadge(prefManager.getIntPref("new_events"));
-                }
-                else{
-                        PandoraChrome.fn.hideBadge();
-                }
-
-                
-                
-                if(timer) {
-                    clearTimeout(timer);
-                }
-                timer =setTimeout(PandoraChrome.fn.main , prefManager.getIntPref("refresh")*1000 );
-            }
-        },
-
-        showNotification: function(eventId){
-            //alert("notify"+eventId);
-            if(prefManager.getBoolPref("sound_alert")){
-                if(newEvents[eventId][19]=="Critical"){
-                    Sounds.playSound(prefManager.getIntPref("critical"));
-                }
-                if(newEvents[eventId][19]=="Informational"){
-                    Sounds.playSound(prefManager.getIntPref("informational"));
-                }
-                if(newEvents[eventId][19]=="Maintenance"){
-                    Sounds.playSound(prefManager.getIntPref("maintenance"));
-                }
-                if(newEvents[eventId][19]=="Normal"){
-                    Sounds.playSound(prefManager.getIntPref("normal"));
-                }
-                if(newEvents[eventId][19]=="Warning"){
-                    Sounds.playSound(prefManager.getIntPref("warning"));
-                }
-
-            }
-
-            var newEve = document.getElementById('newEvent');
-            newEve.label="Last Event : "+newEvents[eventId][6];
-            var id;
-            if(newEvents[eventId][9]==0){
-                id=".";
-            }
-            else {
-                id= " in the module with Id "+ newEvents[eventId][9] + ".";
-            }
-
-            var event = newEvents[eventId][14]+" : "+newEvents[eventId][17]+". Event occured at "+ newEvents[eventId][5]+id;
-            newEve.tooltipText=event;
-            $('#newEvent').show();
-            return;
-        },
-
-
-        hideNotification:function(){
-            //alert("Hide Notif");
-            $('#newEvent').hide();
-        },
-
-        
-        showBadge: function (txt) {
-            //alert(txt);
-            var updateCount = document.getElementById('temp');
-            updateCount.setAttribute("style","cursor:pointer; font-size:11px; color:#123863; font-weight:bold; display:none;") ;
-            updateCount.label=txt;
-            $('#temp').show();
-        },
-
-        hideBadge: function () {
-            var updateCount = document.getElementById('temp');
-            //alert("hide B");
-            $('#temp').hide();
-        },
-
-        divideArray: function (e_array){
-            var Events=new Array();
-            for(var i=0;i<e_array.length;i++){
-                var event=e_array[i].split(";");
-                Events.push(event); 
-            }
-            return Events;
-        },
-       
-        
-        fetchNewEvents: function (A,B){
-            var arrDiff = new Array();
-            // alert(A.length);
-            //alert(B.length);
-            for(var i = 0; i < A.length; i++) {
-                var id = false;
-                for(var j = 0; j < B.length; j++) {
-                    if(A[i][0] == B[j][0]) {
-                        id = true;
-                        break;
-                    }
-                }
-                if(!id) {
-                    arrDiff.push(A[i]);
-                }
-            }
-            return arrDiff;
-        },
-    
-        
-        getNotification:function (eventId){
-            var title=newEvents[eventId][6];
-            var id;
-            if(newEvents[eventId][9]==0){
-                id=".";
-            }
-            else {
-                id= " in the module with Id "+ newEvents[eventId][9] + ".";
-            }
-                       
-            var event = newEvents[eventId][14]+" : "+newEvents[eventId][17]+". Event occured at "+ newEvents[eventId][5]+id;
-            //var event=newEvents[eventId][14]+' '+newEvents[eventId][17]+' Event occured at:'+ newEvents[eventId][5] +'in the module with Id '+ newEvents[eventId][9];
-            return '<a>' + title + '</a> <br/> <span style="font-size:80%">' + event + '</span>';
-            
+    getEvents: function(reply) {
+      if (reply.length > 100) {
+        all_event_array = reply.split("\n");
+        allEvents = PandoraChrome.fn.divideArray(all_event_array);
+        if (oldEvents.length == 0) {
+          oldEvents = allEvents;
         }
 
-    };
-}();
+        newEvents = PandoraChrome.fn.fetchNewEvents(allEvents, oldEvents);
+        if (newEvents.length != 0) {
+          for (var k = 0; k < newEvents.length; k++) {
+            var temp = prefManager.getIntPref("new_events") + 1;
+            prefManager.setIntPref("new_events", temp);
+            PandoraChrome.fn.showNotification(k);
+            PandoraChrome.fn.showBadge(prefManager.getIntPref("new_events"));
+          }
+        }
+        oldEvents = allEvents;
+        if (prefManager.getIntPref("new_events") > 0) {
+          PandoraChrome.fn.showBadge(prefManager.getIntPref("new_events"));
+        } else {
+          PandoraChrome.fn.hideBadge();
+        }
+
+        if (timer) {
+          clearTimeout(timer);
+        }
+        timer = setTimeout(
+          PandoraChrome.fn.main,
+          prefManager.getIntPref("refresh") * 1000
+        );
+      }
+    },
+
+    showNotification: function(eventId) {
+      //alert("notify"+eventId);
+      if (prefManager.getBoolPref("sound_alert")) {
+        if (newEvents[eventId][19] == "Critical") {
+          Sounds.playSound(prefManager.getIntPref("critical"));
+        }
+        if (newEvents[eventId][19] == "Informational") {
+          Sounds.playSound(prefManager.getIntPref("informational"));
+        }
+        if (newEvents[eventId][19] == "Maintenance") {
+          Sounds.playSound(prefManager.getIntPref("maintenance"));
+        }
+        if (newEvents[eventId][19] == "Normal") {
+          Sounds.playSound(prefManager.getIntPref("normal"));
+        }
+        if (newEvents[eventId][19] == "Warning") {
+          Sounds.playSound(prefManager.getIntPref("warning"));
+        }
+      }
+
+      var newEve = document.getElementById("newEvent");
+      newEve.label = "Last Event : " + newEvents[eventId][6];
+      var id;
+      if (newEvents[eventId][9] == 0) {
+        id = ".";
+      } else {
+        id = " in the module with Id " + newEvents[eventId][9] + ".";
+      }
+
+      var event =
+        newEvents[eventId][14] +
+        " : " +
+        newEvents[eventId][17] +
+        ". Event occured at " +
+        newEvents[eventId][5] +
+        id;
+      newEve.tooltipText = event;
+      $("#newEvent").show();
+      return;
+    },
+
+    hideNotification: function() {
+      //alert("Hide Notif");
+      $("#newEvent").hide();
+    },
+
+    showBadge: function(txt) {
+      //alert(txt);
+      var updateCount = document.getElementById("temp");
+      updateCount.setAttribute(
+        "style",
+        "cursor:pointer; font-size:11px; color:#123863; font-weight:bold; display:none;"
+      );
+      updateCount.label = txt;
+      $("#temp").show();
+    },
+
+    hideBadge: function() {
+      var updateCount = document.getElementById("temp");
+      //alert("hide B");
+      $("#temp").hide();
+    },
+
+    divideArray: function(e_array) {
+      var Events = new Array();
+      for (var i = 0; i < e_array.length; i++) {
+        var event = e_array[i].split(";");
+        Events.push(event);
+      }
+      return Events;
+    },
+
+    fetchNewEvents: function(A, B) {
+      var arrDiff = new Array();
+      // alert(A.length);
+      //alert(B.length);
+      for (var i = 0; i < A.length; i++) {
+        var id = false;
+        for (var j = 0; j < B.length; j++) {
+          if (A[i][0] == B[j][0]) {
+            id = true;
+            break;
+          }
+        }
+        if (!id) {
+          arrDiff.push(A[i]);
+        }
+      }
+      return arrDiff;
+    },
+
+    getNotification: function(eventId) {
+      var title = newEvents[eventId][6];
+      var id;
+      if (newEvents[eventId][9] == 0) {
+        id = ".";
+      } else {
+        id = " in the module with Id " + newEvents[eventId][9] + ".";
+      }
+
+      var event =
+        newEvents[eventId][14] +
+        " : " +
+        newEvents[eventId][17] +
+        ". Event occured at " +
+        newEvents[eventId][5] +
+        id;
+      //var event=newEvents[eventId][14]+' '+newEvents[eventId][17]+' Event occured at:'+ newEvents[eventId][5] +'in the module with Id '+ newEvents[eventId][9];
+      return (
+        "<a>" +
+        title +
+        '</a> <br/> <span style="font-size:80%">' +
+        event +
+        "</span>"
+      );
+    }
+  };
+})();
 
 /* Add Event Listener */
 window.addEventListener("load", PandoraChrome.fn.Onloading(), false);
diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh
index 8a16e8e18d..23ea7a4627 100755
--- a/extras/pandora_update_version.sh
+++ b/extras/pandora_update_version.sh
@@ -143,7 +143,7 @@ done
 
 # Darwin dmg installer files
 echo "Updating DARWIN DMG files..."
-sed -i -e "/VERSION/s/=.*/=\"$VERSION\"/" "$AGENT_DARWIN_BUILDER"
+sed -i -e "/VERSION/s/=\"7.0NG.*/=\"$VERSION\"/" "$AGENT_DARWIN_BUILDER"
 sed -i -r "s/(version=\").*(\"\s+onConclusion=)/\1$VERSION\2/g"  "$AGENT_DARWIN_DISTR"
 sed -i -r "s/(CFBundleVersion<\/key>\s*<string>).*(<\/string>)/\1$VERSION\2/g"  "$AGENT_DARWIN_PLIST"
 sed -i -r "s/(CFBundleShortVersionString<\/key>\s*<string>).*(<\/string>)/\1$VERSION\2/g"  "$AGENT_DARWIN_PLIST"
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 727847ab44..ab8076382f 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.750
+Version: 7.0NG.750-201202
 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 62105af82f..350aa46700 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.750"
+pandora_version="7.0NG.750-201202"
 
 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/dmg/build_darwin_dmg.sh b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
index 325d149578..95878467ab 100644
--- a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
+++ b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
@@ -22,7 +22,7 @@ fi
 
 # DMG package version
 if [ "$#" -ge 2 ]; then
-	VERSION="7.0NG.750"
+	VERSION="$2"
 else
 	VERSION="7.0NG.750"
 fi
@@ -37,7 +37,7 @@ fi
 BUILD_DMG="$BUILD_PATH/build"
 BUILD_TMP="$BUILD_PATH/buildtmp"
 
-FULLNAME="7.0NG.749"
+FULLNAME="$DMGNAME-$VERSION.dmg"
 echo "VERSION-"$VERSION" NAME-"$DMGNAME
 pushd .
 cd $LOCALINST
diff --git a/pandora_agents/unix/Darwin/dmg/scripts/postinstall b/pandora_agents/unix/Darwin/dmg/scripts/postinstall
index 2f76310fee..5b25222a37 100644
--- a/pandora_agents/unix/Darwin/dmg/scripts/postinstall
+++ b/pandora_agents/unix/Darwin/dmg/scripts/postinstall
@@ -26,11 +26,13 @@ else
 	`/usr/local/share/pandora_agent/inst_utilities/print_conf.pl /usr/local/share/pandora_agent/pandora_agent.conf remote_config $REMOTECFG`
 	
 	# Create agent directories and files
-	mkdir -p /usr/local/share/pandora_agent/collections
-	mkdir -p /usr/local/share/pandora_agent/commands
+	mkdir -p /usr/local/bin/
+	mkdir -p /usr/local/share/man/man1/
+	mkdir -p /usr/local/share/pandora_agent/collections/
+	mkdir -p /usr/local/share/pandora_agent/commands/
 	mkdir -p /etc/pandora/
-	mkdir -p /var/spool/pandora/data_out
-	mkdir -p /var/log/pandora
+	mkdir -p /var/spool/pandora/data_out/
+	mkdir -p /var/log/pandora/
 	mv pandora_agent.conf /etc/pandora/
 	touch /var/log/pandora/pandora_agent.log
 
@@ -70,9 +72,9 @@ ln -s /usr/local/share/pandora_agent/collections /etc/pandora/collections
 
 
 # Copy manuals
-cp -f man/man1/pandora_agent.1.gz /usr/local/share/man/man1
+cp -f man/man1/pandora_agent.1.gz /usr/local/share/man/man1/
 chmod 644 /usr/local/share/man/man1/pandora_agent.1.gz
-cp -f man/man1/tentacle_client.1.gz /usr/local/share/man/man1
+cp -f man/man1/tentacle_client.1.gz /usr/local/share/man/man1/
 chmod 644 /usr/local/share/man/man1/tentacle_client.1.gz
 
 # Create newsyslog entry
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 2734a367c0..e229ac10da 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -33,17 +33,8 @@ use IO::Socket;
 use Sys::Syslog;
 use Time::Local;
 
-my $YAML = 0;
-# Dynamic load. Avoid unwanted behaviour.
-eval {
-	eval 'require YAML::Tiny;1' or die('YAML::Tiny lib not found, commands feature won\'t be available');
-};
-if ($@) {
-	$YAML = 0;
-	print STDERR $@;
-} else {
-	$YAML = 1;
-}
+use lib '/usr/lib/perl5';
+use PandoraFMS::Omnishell;
 
 # Agent XML data
 my $Xml;
@@ -55,7 +46,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.750';
-use constant AGENT_BUILD => '201015';
+use constant AGENT_BUILD => '201202';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
@@ -285,20 +276,6 @@ sub error ($) {
 	exit 1;
 }
 
-################################################################################
-# Try to load extra libraries.c
-################################################################################
-sub load_libraries() {
-	# Dynamic load. Avoid unwanted behaviour.
-	eval {eval 'require YAML::Tiny;1' or die('YAML::Tiny lib not found, commands feature won\'t be available');};
-	if ($@) {
-		$YAML = 0;
-		print STDERR $@;
-	} else {
-		$YAML = 1;
-	}
-}
-
 ################################################################################
 # Erase blank spaces before and after the string
 ################################################################################
@@ -1084,8 +1061,6 @@ sub fix_directory ($) {
 	return $dir . $char;
 }
 
-
-
 ################################################################################
 # Sends a file to the server.
 ################################################################################
@@ -1488,336 +1463,6 @@ sub check_collections () {
 	}
 }
 
-################################################################################
-# Check for remote commands defined.
-################################################################################
-sub prepare_commands {
-	if ($YAML == 0) {
-		log_message(
-			'error',
-			'Cannot use commands without YAML dependency, please install it.'
-		);
-		return;
-	}
-
-	# Force configuration file read.
-	my @commands = read_config('cmd_file');
-
-	if (empty(\@commands)) {
-		$Conf{'commands'} = {};
-	} else {
-		foreach my $rcmd (@commands) {
-			$Conf{'commands'}->{trim($rcmd)} = {};
-		}
-	}
-
-	# Cleanup old commands. Not registered.
-	cleanup_old_commands();
-
-	foreach my $ref (keys %{$Conf{'commands'}}) {
-		my $file_content;
-		my $download = 0;
-		my $rcmd_file = $ConfDir.'/commands/'.$ref.'.rcmd';
-
-		# Check for local .rcmd.done files
-		if (-e $rcmd_file.'.done') {
-			# Ignore.
-			delete $Conf{'commands'}->{$ref};
-			next;
-		}
-
-		# Search for local .rcmd file
-		if (-e $rcmd_file) {
-			my $remote_md5_file = $Conf{'temporal'}.'/'.$ref.'.md5';
-
-			$file_content = read_file($rcmd_file);
-			if (recv_file($ref.'.md5', $remote_md5_file) != 0) {
-				# Remote file could not be retrieved, skip.
-				delete $Conf{'commands'}->{$ref};
-				next;
-			}
-
-			my $local_md5 = md5($file_content);
-			my $remote_md5 = md5(read_file($remote_md5_file));
-
-			if ($local_md5 ne $remote_md5) {
-				# Must be downloaded again.
-				$download = 1;
-			}
-		} else {
-			$download = 1;
-		}
-		
-		# Search for remote .rcmd file
-		if ($download == 1) {
-			# Download .rcmd file
-			if (recv_file($ref.'.rcmd') != 0) {
-				# Remote file could not be retrieved, skip.
-				delete $Conf{'commands'}->{$ref};
-				next;
-			} else {
-				# Success
-				move($Conf{'temporal'}.'/'.$ref.'.rcmd', $rcmd_file);
-			}
-		}
-		
-		# Parse and prepare in memory skel.
-		eval {
-			$Conf{'commands'}->{$ref} = YAML::Tiny->read($rcmd_file);
-		};
-		if ($@) {
-			# Failed.
-			log_message('error', 'Failed to decode command. ' . "\n".$@);
-			delete $Conf{'commands'}->{$ref};
-			next;
-		}
-
-	}
-}
-
-################################################################################
-# Command report.
-################################################################################
-sub report_command {
-	my ($ref, $err_level) = @_;
-
-  # Retrieve content from .stdout and .stderr
-	my $stdout_file = $Conf{'temporal'}.'/'.$ref.'.stdout';
-	my $stderr_file = $Conf{'temporal'}.'/'.$ref.'.stderr';
-
-	my $return;
-	eval {
-		$return = {
-			'error_level' => $err_level,
-			'stdout' => read_file($stdout_file),
-			'stderr' => read_file($stderr_file),
-		};
-
-		$return->{'name'} = $Conf{'commands'}->{$ref}->[0]->{'name'};
-	};
-	if ($@) {
-		log_message('error', 'Failed to report command output. ' . $@);
-	}
-
-	# Cleanup
-	unlink($stdout_file) if (-e $stdout_file);
-	unlink($stderr_file) if (-e $stderr_file);
-
-	# Mark command as done.
-	open (my $R_FILE, '> '.$ConfDir.'/commands/'.$ref.'.rcmd.done');
-	print $R_FILE $err_level;
-	close($R_FILE);
-
-
-	$return->{'stdout'} = '' unless defined ($return->{'stdout'});
-	$return->{'stderr'} = '' unless defined ($return->{'stderr'});
-
-	return $return;
-}
-
-################################################################################
-# Cleanup unreferenced rcmd and rcmd.done files.
-################################################################################
-sub cleanup_old_commands {
-	# Cleanup old .rcmd and .rcmd.done files.
-	my %registered = map { $_.'.rcmd' => 1 } keys %{$Conf{'commands'}};
-	if(opendir(my $dir, $ConfDir.'/commands/')) {
-		while (my $item = readdir($dir)) {
-
-			# Skip other files.
-			next if ($item !~ /\.rcmd$/);
-
-			# Clean .rcmd.done file if its command is not referenced in conf.
-			if (!defined($registered{$item})) {
-				if (-e $ConfDir.'/commands/'.$item) {
-					unlink($ConfDir.'/commands/'.$item);
-				}
-				if (-e $ConfDir.'/commands/'.$item.'.done') {
-					unlink($ConfDir.'/commands/'.$item.'.done');
-				}
-			}
-		}
-
-		# Close dir.
-		closedir($dir);
-	}
-
-}
-
-################################################################################
-# Executes a command using defined timeout.
-################################################################################
-sub execute_command_timeout {
-	my ($cmd, $timeout) = @_;
-
-	if (!defined($timeout)
-		|| !looks_like_number($timeout)
-		|| $timeout <= 0
-	) {
-		`$cmd`;
-		return $?>>8;
-	}
-
-	my $remaining_timeout = $timeout;
-
-	my $RET;
-	my $output;
-
-	my $pid = open ($RET, "-|");
-	if (!defined($pid)) {
-		# Failed to fork.
-		log_message('error', '[command] Failed to fork.');
-		return undef;
-	}
-	if ($pid == 0) {
-		# Child.
-		my $ret;
-		eval {
-			local $SIG{ALRM} = sub { die "timeout\n" };
-			alarm $timeout;
-			`$cmd`;
-			alarm 0;
-		};
-
-		my $result = ($?>>8);
-		return $result;
-
-		# Exit child.
-		# Child finishes.
-		exit;
-
-	} else {
-		# Parent waiting.
-		while( --$remaining_timeout > 0 ){
-			if (wait == -1) {
-				last;
-			}
-			# Wait child up to timeout seconds.
-			sleep 1;
-		}
-	}
-
-	if ($remaining_timeout > 0) {
-		# Retrieve output from child.
-		$output = do { local $/; <$RET> };
-		$output = $output>>8;
-	}
-	else {
-		# Timeout expired.
-		return 124;
-	}
-
-	close($RET);
-
-	return $output;
-}
-
-################################################################################
-# Executes a block of commands, returns error level, leaves output in 
-# redirection set by $std_files. E.g:
-# $std_files = ' >>  /tmp/stdout 2>> /tmp/stderr
-################################################################################
-sub execute_command_block {
-	my ($commands, $std_files, $timeout, $retry) = @_;
-
-	return 0 unless defined($commands);
-
-	my $retries = $retry;
-
-	$retries = 1 unless looks_like_number($retries) && $retries > 0;
-
-	my $err_level = 0;
-	$std_files = '' unless defined ($std_files);
-
-	if (ref($commands) ne "ARRAY") {
-		return 0 if $commands eq '';
-
-		do {
-			$err_level = execute_command_timeout(
-				"($commands) $std_files",
-				$timeout
-			);
-
-			# Do not retry if success.
-			last if looks_like_number($err_level) && $err_level == 0;
-		} while ((--$retries) > 0);
-
-	} else {
-		foreach my $comm (@{$commands}) {
-			next unless defined($comm);
-			$retries = $retry;
-			$retries = 1 unless looks_like_number($retries) && $retries > 0;
-
-			do {
-				$err_level = execute_command_timeout(
-					"($comm) $std_files",
-					$timeout
-				);
-
-				# Do not retry if success.
-				$retries = 0 if looks_like_number($err_level) && $err_level == 0;
-
-			} while ((--$retries) > 0);
-
-			# Do not continue evaluating block if failed.
-			last unless ($err_level == 0);
-		}
-	}
-
-	return $err_level;
-}
-
-################################################################################
-# Evalate given command.
-################################################################################
-sub evaluate_command {
-	my ($ref) = @_;
-
-	# Not found.
-	return unless defined $Conf{'commands'}->{$ref};
-
-	# Already completed.
-	return if (-e $ConfDir.'/commands/'.$ref.'.rcmd.done');
-
-	# [0] because how library works.
-	my $cmd = $Conf{'commands'}->{$ref}->[0];
-
-	my $std_files = ' >> '.$Conf{'temporal'}.'/'.$ref.'.stdout ';
-	$std_files .= ' 2>> '.$Conf{'temporal'}.'/'.$ref.'.stderr ';
-
-	# Check preconditions
-	my $err_level;
-	
-	$err_level = execute_command_block(
-		$cmd->{'preconditions'},
-		$std_files,
-		$cmd->{'timeout'}
-	);
-
-	# Precondition not satisfied.
-	return report_command($ref, $err_level) unless ($err_level == 0);
-
-	# Main run.
-	$err_level = execute_command_block(
-		$cmd->{'script'},
-		$std_files,
-		$cmd->{'timeout'}
-	);
-
-	# Script not success.
-	return report_command($ref, $err_level) unless ($err_level == 0);
-
-	# Check postconditions
-	$err_level = execute_command_block(
-		$cmd->{'postconditions'},
-		$std_files,
-		$cmd->{'timeout'}
-	);
-
-	# Return results.
-	return report_command($ref, $err_level);
-}
-
 ################################################################################
 # Sleep function
 ################################################################################
@@ -3435,9 +3080,10 @@ my $main_agent = -1;
 # base time to start eatch iteration with the same interval.
 my $iter_base_time = time();
 $LogFileIdx = -1;
+
 # Loop
 while (1) {
-	load_libraries();
+	my $omnishell;
 
 	if (-e $Conf{'logfile'} && (stat($Conf{'logfile'}))[7] > $Conf{'logsize'}) {
 		rotate_log();
@@ -3453,8 +3099,18 @@ while (1) {
 	# Check file collections
 	check_collections () unless ($Conf{'debug'} eq '1');
 
-	# Check scheduled commands
-	prepare_commands() unless ($Conf{'debug'} eq '1');
+	eval {
+		# Omnishell controller.
+		$omnishell = new PandoraFMS::Omnishell(
+			{
+				%Conf,
+				'ConfDir' => $ConfDir
+			}
+		);
+	};
+	if ($@) {
+		log_message('error', "Omnishell process error: ".$@);
+	}
 
 	# Launch broker agents
 	@BrokerPid = ();
@@ -3587,18 +3243,22 @@ while (1) {
 
 	if (ref ($Conf{'commands'}) eq "HASH") {
 		foreach my $command (keys %{$Conf{'commands'}}) {
-			my $result = evaluate_command($command);
-			if (ref($result) eq "HASH") {
-				# Process command result.
-				$Xml .= "<cmd_report>\n";
-				$Xml .= "  <cmd_response>\n";
-				$Xml .= "    <cmd_name><![CDATA[".$result->{'name'}."]]></cmd_name>\n";
-				$Xml .= "    <cmd_key><![CDATA[".$command."]]></cmd_key>\n";
-				$Xml .= "    <cmd_errorlevel><![CDATA[".$result->{'error_level'}."]]></cmd_errorlevel>\n";
-				$Xml .= "    <cmd_stdout><![CDATA[".$result->{'stdout'}."]]></cmd_stdout>\n";
-				$Xml .= "    <cmd_stderr><![CDATA[".$result->{'stderr'}."]]></cmd_stderr>\n";
-				$Xml .= "  </cmd_response>\n";
-				$Xml .= "</cmd_report>\n";
+			eval {
+				if ($Conf{'debug'} eq '1') {
+					log_message('debug', 'Running omnishell commmand ['.$command.']');
+				}
+
+				my $output = $omnishell->runCommand($command, 'xml');
+				if (!empty($output)) {
+					$Xml .= $output;
+				} else {
+					if ($Conf{'debug'} eq '1') {
+						log_message('error', 'Omnishell result: '.$omnishell->get_last_error());
+					}
+				}
+			};
+			if ($@) {
+				log_message('error', 'Omnishell error: '.$@);
 			}
 		}
 	}
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 817e89d6eb..aec512fb71 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.750
-%define release     1
+%define release     201202
 
 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 01265b910d..3f605ab943 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.750
-%define release     1
+%define release     201202
 
 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 f6cfadb186..3ebcd9f8b7 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201015"
+PI_BUILD="201202"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/bin/util/omnishell_client.exe b/pandora_agents/win32/bin/util/omnishell_client.exe
new file mode 100755
index 0000000000..f0420231e3
Binary files /dev/null and b/pandora_agents/win32/bin/util/omnishell_client.exe differ
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index cf61454766..b31ae50202 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201015}
+{201202}
 
 ViewReadme
 {Yes}
@@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-Setup<%Ext%>}
+{<%AppName%>-<%Version%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}
diff --git a/pandora_agents/win32/omnishell/omnishell_client.pl b/pandora_agents/win32/omnishell/omnishell_client.pl
new file mode 100644
index 0000000000..1a684e5448
--- /dev/null
+++ b/pandora_agents/win32/omnishell/omnishell_client.pl
@@ -0,0 +1,93 @@
+#!/usr/bin/perl
+################################################################################
+# Pandora FMS Omnishell client.
+#
+# (c) Fco de Borja Sánchez <fborja.sanchez@pandorafms.com>
+#
+# Usage: omnishell_client "C:\Program Files\pandora_agent\pandora_agent.conf"
+#
+################################################################################
+use strict;
+use warnings;
+
+use File::Basename;
+use lib '/usr/lib/perl5';
+use PandoraFMS::PluginTools;
+use PandoraFMS::Omnishell;
+
+################################################################################
+# Definitions
+################################################################################
+my $HELP=<<EO_H;
+Pandora FMS Omnishell client.
+
+Usage:
+
+  $0 <configuration_file> [-debug 1]
+
+  Where <configuration_file> is your Pandora FMS Agent configuration.
+  *Recommended: use full path.
+
+  Use -debug 1 to get information extra in STDERR
+
+EO_H
+
+################################################################################
+# Parse commands.
+################################################################################
+sub read_commands {
+  my ($config, $exp, $line, $file) = @_;
+
+  if (empty($config->{'commands'})) {
+    $config->{'commands'} = {};
+  }
+
+  my ($ref) = $line =~ /$exp\s+(.*)/;
+  $config->{'commands'}->{trim($ref)} = {};
+
+  return $config;
+}
+
+
+################################################################################
+# MAIN
+################################################################################
+my $ConfFile = $ARGV[0];
+
+my $config = read_configuration({},' ', [
+  {
+  	'exp'    => 'cmd_file',
+  	'target' => \&read_commands
+  },
+]);
+
+if (!defined($ConfFile) || !-e $ConfFile) {
+  print $HELP;
+  exit 1;
+}
+
+if(!-d dirname($ConfFile).'\commands') {
+	mkdir(dirname($ConfFile).'\commands');
+}
+
+eval {
+  # Check scheduled commands	
+  my $omnishell = new PandoraFMS::Omnishell(
+    {
+      %{$config},
+      'ConfDir' => dirname($ConfFile)
+    }
+  );
+
+  if (empty($omnishell->run('xml')) && is_enabled($config->{'debug'}) ) {
+    print STDERR $omnishell->get_last_error()."\n";
+  }
+};
+if ($@) {
+  if (is_enabled($config->{'debug'})) {
+    print STDERR $@."\n";
+  }
+  exit 1;
+}
+
+exit 0;
\ No newline at end of file
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 8f185cd0dc..a2caf79ae2 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.750(Build 201015)")
+#define PANDORA_VERSION ("7.0NG.750(Build 201202)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index 3dd80d2a15..360673363f 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -1704,7 +1704,7 @@ Pandora_Windows_Service::checkConfig (string file) {
 }
 
 int
-Pandora_Windows_Service::sendXml (Pandora_Module_List *modules) {
+Pandora_Windows_Service::sendXml (Pandora_Module_List *modules, string extra /* = ""*/) {
     int rc = 0, rc_sec = 0, xml_buffer;
     string            data_xml;
 	string            xml_filename, random_integer;
@@ -1785,10 +1785,13 @@ Pandora_Windows_Service::sendXml (Pandora_Module_List *modules) {
 			modules->goNext ();
 		}
 	}
-	
+
+	/* Write extra content (omnishell, for instance) */
+	data_xml += extra;
+
 	/* Close the XML header */
 	data_xml += "</agent_data>";
-	
+
 	/* Generate temporal filename */
 	random_integer = inttostr (rand());
 	tmp_filename = conf->getValue ("agent_name");
@@ -2018,7 +2021,7 @@ Pandora_Windows_Service::pandora_run () {
 void
 Pandora_Windows_Service::pandora_run (int forced_run) {
 	Pandora_Agent_Conf  *conf = NULL;
-	string server_addr, conf_file, *all_conf;
+	string server_addr, conf_file, *all_conf, omnishell_output, omnishell_path;
 	int startup_delay = 0;
 	int i, num;
 	static bool startup = true;
@@ -2055,6 +2058,15 @@ Pandora_Windows_Service::pandora_run (int forced_run) {
 		this->checkCollections ();
 	}
 
+	
+	/* Execute omnishell commands */
+	omnishell_path = '"'+Pandora::getPandoraInstallDir ();
+	omnishell_path += "util\\omnishell_client.exe\" \"" + conf_file+"\"";
+	if (getPandoraDebug () != false) {
+		pandoraLog ("Omnishell: Running");
+	}
+	omnishell_output = getValueFromCmdExec(omnishell_path.c_str(), 6000000);
+
 	server_addr = conf->getValue ("server_ip");
 
 	execution_number++;
@@ -2126,7 +2138,7 @@ Pandora_Windows_Service::pandora_run (int forced_run) {
 				
 		// Send the XML
 		if (!server_addr.empty ()) {
-		  this->sendXml (this->modules);
+		  this->sendXml (this->modules, omnishell_output);
 		}
 	}
 	
diff --git a/pandora_agents/win32/pandora_windows_service.h b/pandora_agents/win32/pandora_windows_service.h
index 3f9a89d685..aa5427ab8c 100644
--- a/pandora_agents/win32/pandora_windows_service.h
+++ b/pandora_agents/win32/pandora_windows_service.h
@@ -117,7 +117,7 @@ namespace Pandora {
 					     const char *svc_description);
 		
 		void           start        ();
-		int            sendXml      (Pandora_Module_List *modules);
+		int            sendXml      (Pandora_Module_List *modules, string extra = "");
         void           sendBufferedXml (string path, copy_func_p copy_func, bool secondary_buffer);
 		Pandora_Agent_Conf *getConf ();
 		string         getEHKey (string ehorus_conf);
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index a1ec2dc7bb..a8ff1c1cf5 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.750(Build 201015))"
+      VALUE "ProductVersion", "(7.0NG.750(Build 201202))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 1f12c293fb..a4c9c5a2be 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.750
+Version: 7.0NG.750-201202
 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 1f28341bb7..0dc958f481 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.750"
+pandora_version="7.0NG.750-201202"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php
index 4fd7be94ae..38f55cc623 100755
--- a/pandora_console/extensions/agents_alerts.php
+++ b/pandora_console/extensions/agents_alerts.php
@@ -1,651 +1,91 @@
 <?php
+/**
+ * Agents/Alerts Monitoring view.
+ *
+ * @category   Operations
+ * @package    Pandora FMS
+ * @subpackage Opensource
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2020 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.
-require_once $config['homedir'].'/include/functions_agents.php';
-require_once $config['homedir'].'/include/functions_modules.php';
-require_once $config['homedir'].'/include/functions_users.php';
+// Begin.
+global $config;
+// Require needed class.
+require_once $config['homedir'].'/include/class/AgentsAlerts.class.php';
+// Get the parameter.
+$sec2        = get_parameter_get('sec2');
+// Add operation menu option.
+extensions_add_operation_menu_option(
+    __('Agents/Alerts view'),
+    'estado',
+    null,
+    'v1r1',
+    'view'
+);
+
+// If sec2 parameter come with this page info.
+if ($sec2 === 'extensions/agents_alerts') {
+    extensions_add_main_function('mainAgentsAlerts');
+}
 
 
+/**
+ * Function for load the controller.
+ *
+ * @return void
+ */
 function mainAgentsAlerts()
 {
-    global $config;
-
-    // Load global vars
-    include_once 'include/config.php';
-    include_once 'include/functions_reporting.php';
-
-    check_login();
-    // ACL Check
-    if (! check_acl($config['id_user'], 0, 'AR')) {
-        db_pandora_audit(
-            'ACL Violation',
-            'Trying to access Agent view (Grouped)'
-        );
-        include 'general/noaccess.php';
-        exit;
-    }
-
-    // Update network modules for this group
-    // Check for Network FLAG change request
-    // Made it a subquery, much faster on both the database and server side
-    if (isset($_GET['update_netgroup'])) {
-        $group = get_parameter_get('update_netgroup', 0);
-        if (check_acl($config['id_user'], $group, 'AW')) {
-            $where = ['id_agente' => 'ANY(SELECT id_agente FROM tagente WHERE id_grupo = '.$group];
-
-            db_process_sql_update('tagente_modulo', ['flag' => 1], $where);
-        } else {
-            db_pandora_audit('ACL Violation', 'Trying to set flag for groups');
-            include 'general/noaccess.php';
+    // Ajax variables.
+    $pageName    = '[AgentsAlerts]';
+    // Control call flow.
+    try {
+        // User access and validation is being processed on class constructor.
+        $obj = new AgentsAlerts();
+    } catch (Exception $e) {
+        if (is_ajax() === true) {
+            echo json_encode(['error' => $pageName.$e->getMessage() ]);
             exit;
-        }
-    }
-
-    if ($config['realtimestats'] == 0) {
-        $updated_info = __('Last update').' : '.ui_print_timestamp(db_get_sql('SELECT min(utimestamp) FROM tgroup_stat'), true);
-    } else {
-        // $updated_info = __("Updated at realtime");
-        $updated_info = '';
-    }
-
-    $updated_time = $updated_info;
-    $create_alert = (int) get_parameter('create_alert', 0);
-
-    if ($create_alert) {
-        $template2 = get_parameter('template');
-        $module_action_threshold = get_parameter('module_action_threshold');
-
-        $id_alert = alerts_create_alert_agent_module($create_alert, $template2);
-
-        if ($id_alert !== false) {
-            $action_select = get_parameter('action_select', 0);
-
-            if ($action_select != 0) {
-                $values = [];
-                $values['fires_min'] = 0;
-                $values['fires_max'] = 0;
-                $values['module_action_threshold'] = (int) get_parameter('module_action_threshold');
-
-                alerts_add_alert_agent_module_action($id_alert, $action_select, $values);
-            }
-        }
-    }
-
-    $refr = (int) get_parameter('refr', 30);
-    // By default 30 seconds
-    $show_modules = (bool) get_parameter('show_modules', 0);
-    $group_id = get_parameter('group_id', 0);
-    $offset = get_parameter('offset', 0);
-    $hor_offset = get_parameter('hor_offset', 0);
-    $block = 20;
-
-    $groups = users_get_groups();
-
-    $filter_groups .= '<b>'.__('Group').'</b>';
-    $filter_groups .= '<div class="w250px inline margin-left-2">';
-    $filter_groups .= html_print_select_groups(false, 'AR', true, 'group_id', $group_id, false, '', '', true, false, true, '', false, 'margin-right: 10px; margin-top: 5px;');
-    $filter_groups .= '</div>';
-
-    $check = '<b>'.__('Show modules without alerts').'</b>';
-    $check .= html_print_checkbox('slides_ids[]', $d['id'], $show_modules, true, false, '', true);
-
-    $comborefr = '<form method="post" action="'.ui_get_url_refresh(['offset' => 0, 'hor_offset' => 0]).'">';
-    $comborefr .= '<b>'.__('Refresh').'</b>';
-    $comborefr .= html_print_select(
-        [
-            '30'                       => '30 '.__('seconds'),
-            (string) SECONDS_1MINUTE   => __('1 minute'),
-            (string) SECONDS_2MINUTES  => __('2 minutes'),
-            (string) SECONDS_5MINUTES  => __('5 minutes'),
-            (string) SECONDS_10MINUTES => __('10 minutes'),
-        ],
-        'refr',
-        (int) get_parameter('refr', 0),
-        $script = 'this.form.submit()',
-        '',
-        0,
-        true,
-        false,
-        false,
-        '',
-        false,
-        'width: 100px; margin-right: 10px; margin-top: 5px;'
-    );
-    $comborefr .= '</form>';
-
-    if ($config['pure'] == 0) {
-        $fullscreen['text'] = '<a href="'.ui_get_url_refresh(['pure' => 1]).'">'.html_print_image('images/full_screen.png', true, ['title' => __('Full screen mode')]).'</a>';
-    } else {
-        $fullscreen['text'] = '<a href="'.ui_get_url_refresh(['pure' => 0]).'">'.html_print_image('images/normal_screen.png', true, ['title' => __('Back to normal mode')]).'</a>';
-        $config['refr'] = $refr;
-    }
-
-    $onheader = [
-        'updated_time' => $updated_time,
-        'fullscreen'   => $fullscreen,
-        'combo_groups' => $filter_groups,
-    ];
-
-    if ($config['pure'] == 1) {
-        $onheader['combo_refr'] = $comborefr;
-    }
-
-    // Header.
-    ui_print_page_header(
-        __('Agents/Alerts'),
-        'images/op_alerts.png',
-        false,
-        '',
-        false,
-        $updated_time
-    );
-
-    // Old style table, we need a lot of special formatting,don't use table function
-    // Prepare old-style table
-    echo '<table class="databox filters" cellpadding="0" cellspacing="0" border="0" style="width:100%;">';
-    echo '<tr>';
-    echo '<td>'.$filter_groups.'</td>';
-    echo '<td>'.$check.'</td>';
-    if ($config['pure'] == 1) {
-        echo '<td>'.$comborefr.'</td>';
-    }
-
-    echo '<td> <strong>'.__('Full screen').'</strong>'.$fullscreen['text'].'</td>';
-    echo '</tr>';
-    echo '</table>';
-
-    if ($show_modules) {
-        if ($group_id > 0) {
-            $grupo = " AND tagente.id_grupo = $group_id";
         } else {
-            $grupo = '';
+            echo $pageName.$e->getMessage();
         }
 
-        $offset_modules = get_parameter('offset', 0);
-        $sql_count = "SELECT COUNT(tagente_modulo.nombre) FROM tagente_modulo 
-		INNER JOIN tagente ON tagente.id_agente = tagente_modulo.id_agente
-		WHERE id_agente_modulo NOT IN (SELECT id_agent_module FROM talert_template_modules) 
-		$grupo";
-        $count_agent_module = db_get_all_rows_sql($sql_count);
-
-        $sql = "SELECT tagente.alias, tagente_modulo.nombre, 
-		tagente_modulo.id_agente_modulo FROM tagente_modulo 
-		INNER JOIN tagente ON tagente.id_agente = tagente_modulo.id_agente
-		WHERE id_agente_modulo NOT IN (SELECT id_agent_module FROM talert_template_modules) 
-		$grupo LIMIT 20 OFFSET $offset_modules";
-        $agent_modules = db_get_all_rows_sql($sql);
-
-        ui_pagination(
-            $count_agent_module[0]['COUNT(tagente_modulo.nombre)'],
-            ui_get_url_refresh(),
-            0,
-            0,
-            false,
-            'offset',
-            true,
-            '',
-            '',
-            false,
-            'alerts_modules'
-        );
-
-        $table->width = '100%';
-        $table->class = 'databox data';
-        $table->id = 'table_agent_module';
-        $table->data = [];
-
-        $table->head[0] = __('Agents');
-        $table->head[1] = __('Modules');
-        $table->head[2] = __('Actions');
-
-        $table->style[0] = 'width: 25%;';
-        $table->style[1] = 'width: 33%;';
-        $table->style[2] = 'width: 33%;';
-
-        foreach ($agent_modules as $agent_module) {
-            $data[0] = io_safe_output($agent_module['alias']);
-            $data[1] = io_safe_output($agent_module['nombre']);
-            $uniqid = $agent_module['id_agente_modulo'];
-            $data[2] = "<a title='".__('Create alert')."' href='javascript:show_add_alerts(\"$uniqid\")'>".html_print_image('images/add_mc.png', true).'</a>';
-            array_push($table->data, $data);
-
-            $table2->width = '100%';
-            $table2->id = 'table_add_alert';
-            $table2->class = 'databox filters';
-            $table2->data = [];
-            // $data[0] =
-            $table2->data[0][0] = __('Actions');
-
-            $groups_user = users_get_groups($config['id_user']);
-            if (!empty($groups_user)) {
-                $groups = implode(',', array_keys($groups_user));
-                $sql = "SELECT id, name FROM talert_actions WHERE id_group IN ($groups)";
-                $actions = db_get_all_rows_sql($sql);
-            }
-
-            $table2->data[0][1] = html_print_select(
-                index_array($actions, 'id', 'name'),
-                'action_select',
-                '',
-                '',
-                __('Default action'),
-                '0',
-                true,
-                '',
-                true,
-                '',
-                false,
-                'width: 250px;'
-            );
-            $table2->data[0][1] .= '<span id="advanced_action" class="advanced_actions invisible"><br>';
-            $table2->data[0][1] .= __('Number of alerts match from').' ';
-            $table2->data[0][1] .= html_print_input_text('fires_min', '', '', 4, 10, true);
-            $table2->data[0][1] .= ' '.__('to').' ';
-            $table2->data[0][1] .= html_print_input_text('fires_max', '', '', 4, 10, true);
-            $table2->data[0][1] .= ui_print_help_icon(
-                'alert-matches',
-                true,
-                ui_get_full_url(false, false, false, false)
-            );
-            $table2->data[0][1] .= '</span>';
-            if (check_acl($config['id_user'], 0, 'LM')) {
-                $table2->data[0][1] .= '<a style="margin-left:5px;" href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_action&pure='.$pure.'">';
-                $table2->data[0][1] .= html_print_image('images/add.png', true);
-                $table2->data[0][1] .= '<span style="margin-left:5px;vertical-align:middle;">'.__('Create Action').'</span>';
-                $table2->data[0][1] .= '</a>';
-            }
-
-            $table2->data[1][0] = __('Template');
-            $own_info = get_user_info($config['id_user']);
-            if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
-                $templates = alerts_get_alert_templates(false, ['id', 'name']);
-            } else {
-                $usr_groups = users_get_groups($config['id_user'], 'LW', true);
-                $filter_groups = '';
-                $filter_groups = implode(',', array_keys($usr_groups));
-                $templates = alerts_get_alert_templates(['id_group IN ('.$filter_groups.')'], ['id', 'name']);
-            }
-
-            $table2->data[1][1] = html_print_select(
-                index_array($templates, 'id', 'name'),
-                'template',
-                '',
-                '',
-                __('Select'),
-                0,
-                true,
-                false,
-                true,
-                '',
-                false,
-                'width: 250px;'
-            );
-            $table2->data[1][1] .= ' <a class="template_details invisible" href="#">'.html_print_image('images/zoom.png', true, ['class' => 'img_help']).'</a>';
-            if (check_acl($config['id_user'], 0, 'LM')) {
-                $table2->data[1][1] .= '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&pure='.$pure.'">';
-                $table2->data[1][1] .= html_print_image('images/add.png', true);
-                $table2->data[1][1] .= '<span style="margin-left:5px;vertical-align:middle;">'.__('Create Template').'</span>';
-                $table2->data[1][1] .= '</a>';
-            }
-
-            $table2->data[2][0] = __('Threshold');
-            $table2->data[2][1] = html_print_input_text('module_action_threshold', '0', '', 5, 7, true);
-            $table2->data[2][1] .= ' '.__('seconds');
-
-            $content2 = '<form class="add_alert_form" method="post">';
-            $content2 .= html_print_table($table2, true);
-
-            $content2 .= '<div class="action-buttons" style="width: '.$table2->width.'">';
-            $content2 .= html_print_submit_button(__('Add alert'), 'add', false, 'class="sub wand"', true);
-            $content2 .= html_print_input_hidden('create_alert', $uniqid, true);
-            $content2 .= '</div></form>';
-
-            $module_name = ui_print_truncate_text(io_safe_output($agent_module['nombre']), 40, false, true, false, '&hellip;', false);
-            echo '<div id="add_alerts_dialog_'.$uniqid.'" title="'.__('Agent').': '.$agent_module['alias'].' / '.__('module').': '.$module_name.'" style="display:none">'.$content2.'</div>';
-        }
-
-        html_print_table($table);
-    } else {
-        $filter = [
-            'offset' => (int) $offset,
-            'limit'  => (int) $config['block_size'],
-        ];
-        $filter_count = [];
-
-        if ($group_id > 0) {
-            $filter['id_grupo'] = $group_id;
-            $filter_count['id_grupo'] = $group_id;
-        }
-
-        // Get the id of all agents with alerts
-        $sql = 'SELECT DISTINCT(id_agente)
-			FROM tagente_modulo
-			WHERE id_agente_modulo IN
-				(SELECT id_agent_module
-				FROM talert_template_modules)';
-        $agents_with_alerts_raw = db_get_all_rows_sql($sql);
-
-        if ($agents_with_alerts_raw === false) {
-            $agents_with_alerts_raw = [];
-        }
-
-        $agents_with_alerts = [];
-        foreach ($agents_with_alerts_raw as $awar) {
-            $agents_with_alerts[] = $awar['id_agente'];
-        }
-
-        $filter['id_agente'] = $agents_with_alerts;
-        $filter_count['id_agente'] = $agents_with_alerts;
-
-        $agents = agents_get_agents($filter);
-
-        $nagents = count(agents_get_agents($filter_count));
-
-        if ($agents == false) {
-            ui_print_info_message(['no_close' => true, 'message' => __('There are no agents with alerts') ]);
-            return;
-        }
-
-        $all_alerts = agents_get_alerts_simple();
-
-        if ($config['pure'] == 1) {
-            $block = count($all_alerts);
-        }
-
-        $templates = [];
-        $agent_alerts = [];
-        foreach ($all_alerts as $alert) {
-            $templates[$alert['id_alert_template']] = '';
-            $agent_alerts[$alert['agent_name']][$alert['id_alert_template']][] = $alert;
-        }
-
-        // Prepare pagination
-        ui_pagination(
-            $nagents,
-            false,
-            0,
-            0,
-            false,
-            'offset',
-            true,
-            '',
-            '',
-            [
-                'count'  => '',
-                'offset' => 'offset_param',
-            ],
-            'alerts_agents'
-        );
-
-        echo '<table class="info_table" cellpadding="0" cellspacing="0" border="0" width=100%>';
-        echo '<thead><tr>';
-        echo "<th width='140px' >".__('Agents').' / '.__('Alert templates').'</th>';
-
-        if ($hor_offset > 0) {
-            $new_hor_offset = ($hor_offset - $block);
-            echo "<th width='20px' style='' rowspan='".($nagents + 1)."'>
-					<a href='index.php?sec=extensions&sec2=extensions/agents_alerts&refr=0&hor_offset=".$new_hor_offset.'&offset='.$offset.'&group_id='.$group_id."'>".html_print_image('images/darrowleft.png', true, ['title' => __('Previous templates')]).'</a> </th>';
-        }
-
-        $templates_raw = [];
-        if (!empty($templates)) {
-            $sql = sprintf(
-                'SELECT id, name
-				FROM talert_templates
-				WHERE id IN (%s)',
-                implode(',', array_keys($templates))
-            );
-
-            $templates_raw = db_get_all_rows_sql($sql);
-        }
-
-        if (empty($templates_raw)) {
-            $templates_raw = [];
-        }
-
-        $alerts = [];
-        $ntemplates = 0;
-        foreach ($templates_raw as $temp) {
-            if (isset($templates[$temp['id']]) && $templates[$temp['id']] == '') {
-                $ntemplates++;
-                if ($ntemplates <= $hor_offset || $ntemplates > ($hor_offset + $block)) {
-                    continue;
-                }
-
-                $templates[$temp['id']] = $temp['name'];
-            }
-        }
-
-        foreach ($templates as $tid => $tname) {
-            if ($tname == '') {
-                continue;
-            }
-
-            echo '<th width="20px" >'.io_safe_output($tname).'</th>';
-        }
-
-        echo '</tr></thead>';
-        if (($hor_offset + $block) < $ntemplates) {
-            $new_hor_offset = ($hor_offset + $block);
-            echo "<th width='20px' style='' rowspan='".($nagents + 1)."'>
-				<a href='index.php?sec=extensions&sec2=extensions/agents_alerts&hor_offset=".$new_hor_offset.'&offset='.$offset.'&group_id='.$group_id."'>".html_print_image('images/darrowright.png', true, ['title' => __('More templates')]).'</a> </th>';
-        }
-
-        foreach ($agents as $agent) {
-            $alias = db_get_row('tagente', 'id_agente', $agent['id_agente']);
-            echo '<tr>';
-            // Name of the agent
-            echo '<td style="font-weight:bold;">'.$alias['alias'].'</td>';
-
-            // Alerts of the agent
-            $anyfired = false;
-            foreach ($templates as $tid => $tname) {
-                if ($tname == '') {
-                    continue;
-                }
-
-                if (isset($agent_alerts[$agent['nombre']][$tid])) {
-                    foreach ($agent_alerts[$agent['nombre']][$tid] as $alert) {
-                        if ($alert['times_fired'] > 0) {
-                            $anyfired = true;
-                        }
-                    }
-
-                    $cellstyle = '';
-                    if ($anyfired) {
-                        $cellstyle = 'background:'.COL_ALERTFIRED.';';
-                    }
-
-                    echo '<td style=";'.$cellstyle.'" class="action_buttons"> ';
-
-                    $uniqid = uniqid();
-                    echo '<div>';
-
-                    echo count($agent_alerts[$agent['nombre']][$tid]).' '.__('Alerts').' ';
-
-                    echo "<a href='javascript:show_alerts_details(\"$uniqid\")'>".html_print_image('images/zoom.png', true).'</a>';
-
-                    echo '</div>';
-
-                    print_alerts_summary_modal_window($uniqid, $agent_alerts[$agent['nombre']][$tid]);
-                } else {
-                    echo '<td style="text-align:center"> ';
-                }
-
-                echo '</td>';
-            }
-
-            echo '</tr>';
-        }
-
-        echo '</table>';
-
-        ui_pagination(
-            $nagents,
-            false,
-            0,
-            0,
-            false,
-            'offset',
-            true,
-            'pagination-bottom',
-            '',
-            [
-                'count'  => '',
-                'offset' => 'offset_param',
-            ],
-            'alerts_agents'
-        );
+        // Stop this execution, but continue 'globally'.
+        return;
     }
 
+    // AJAX controller.
+    if (is_ajax() === true) {
+        $method = get_parameter('method');
+
+        if (method_exists($obj, $method) === true) {
+            $obj->{$method}();
+        } else {
+            $obj->error('Method not found. ['.$method.']');
+        }
+
+        // Stop any execution.
+        exit;
+    } else {
+        // Run.
+        $obj->run();
+    }
 }
-
-
-// Print the modal window for the summary of each alerts group
-function print_alerts_summary_modal_window($id, $alerts)
-{
-    $table->width = '98%';
-    $table->class = 'info_table';
-    $table->data = [];
-
-    $table->head[0] = __('Module');
-    $table->head[1] = __('Action');
-    $table->head[2] = __('Last fired');
-    $table->head[3] = __('Status');
-
-    foreach ($alerts as $alert) {
-        $data[0] = modules_get_agentmodule_name($alert['id_agent_module']);
-
-        $actions = alerts_get_alert_agent_module_actions($alert['id']);
-
-        $actionDefault = db_get_value_sql(
-            '
-			SELECT id_alert_action
-			FROM talert_templates
-			WHERE id = '.$alert['id_alert_template']
-        );
-
-        $actionText = '';
-
-        if (!empty($actions)) {
-            $actionText = '<div style="margin-left: 10px;"><ul class="action_list">';
-            foreach ($actions as $action) {
-                $actionText .= '<div><span class="action_name"><li>'.$action['name'];
-                if ($action['fires_min'] != $action['fires_max']) {
-                    $actionText .= ' ('.$action['fires_min'].' / '.$action['fires_max'].')';
-                }
-
-                $actionText .= '</li></span><br /></div>';
-            }
-
-            $actionText .= '</ul></div>';
-        } else {
-            if (!empty($actionDefault)) {
-                $actionText = db_get_sql(
-                    "SELECT name
-					FROM talert_actions
-					WHERE id = $actionDefault"
-                ).' <i>('.__('Default').')</i>';
-            }
-        }
-
-        $data[1] = $actionText;
-        $data[2] = ui_print_timestamp($alert['last_fired'], true);
-
-        $status = STATUS_ALERT_NOT_FIRED;
-
-        if ($alert['times_fired'] > 0) {
-            $status = STATUS_ALERT_FIRED;
-            $title = __('Alert fired').' '.$alert['internal_counter'].' '.__('time(s)');
-        } else if ($alert['disabled'] > 0) {
-            $status = STATUS_ALERT_DISABLED;
-            $title = __('Alert disabled');
-        } else {
-            $status = STATUS_ALERT_NOT_FIRED;
-            $title = __('Alert not fired');
-        }
-
-        $data[3] = ui_print_status_image($status, $title, true);
-
-        array_push($table->data, $data);
-    }
-
-    $content = html_print_table($table, true);
-
-    $agent = modules_get_agentmodule_agent_alias($alerts[0]['id_agent_module']);
-    $template = alerts_get_alert_template_name($alerts[0]['id_alert_template']);
-
-    echo '<div id="alerts_details_'.$id.'" title="'.__('Agent').': '.$agent.' / '.__('Template').': '.$template.'" style="display:none">'.$content.'</div>';
-}
-
-
-extensions_add_operation_menu_option(__('Agents/Alerts view'), 'estado', null, 'v1r1', 'view');
-extensions_add_main_function('mainAgentsAlerts');
-
-ui_require_jquery_file('pandora');
-
-?>
-
-<script type="text/javascript">
-    function show_alerts_details(id) {
-        $("#alerts_details_"+id).dialog({
-            resizable: true,
-            draggable: true,
-            modal: true,
-            height: 280,
-            width: 800,
-            overlay: {
-                opacity: 0.5,
-                background: "black"
-            }
-        });
-    }
-    
-    function show_add_alerts(id) {
-        $("#add_alerts_dialog_"+id).dialog({
-            resizable: true,
-            draggable: true,
-            modal: true,
-            height: 235,
-            width: 600,
-            overlay: {
-                opacity: 0.5,
-                background: "black"
-            }
-        });
-    }
-    
-    // checkbox-slides_ids
-    $(document).ready(function () {
-        $('#checkbox-slides_ids').click(function(){
-            if ($('#checkbox-slides_ids').prop('checked')){
-                var url = location.href.replace("&show_modules=true", "");
-                location.href = url+"&show_modules=true";
-            } else {
-                var url = location.href.replace("&show_modules=true", "");
-                var re = /&offset=\d*/g;
-                location.href = url.replace(re, "");
-            }
-        });
-        
-        $('#group_id').change(function(){
-            if(location.href.indexOf("extensions/agents_modules") == -1){
-                var regx = /&group_id=\d*/g;
-                var url = location.href.replace(regx, "");
-                location.href = url+"&group_id="+$("#group_id").val();
-            }
-        });
-
-    });
-    
-</script>
diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php
index 8aa032c9a8..eb699b7467 100644
--- a/pandora_console/extensions/agents_modules.php
+++ b/pandora_console/extensions/agents_modules.php
@@ -26,17 +26,6 @@ function agents_modules_load_js()
     $ignored_params['refresh'] = '';
 
     ?>
-    <style type='text/css'>
-        .rotate_text_module {
-            -ms-transform: rotate(270deg);
-            -webkit-transform: rotate(270deg);
-            -moz-transform: rotate(270deg);
-            -o-transform: rotate(270deg);
-            writing-mode: lr-tb;
-            white-space: nowrap;
-        }
-    </style>
-
     <script type='text/javascript'>
         $(document).ready(function () {
             //Get max width of name of modules
@@ -668,7 +657,7 @@ function mainAgentsModules()
         if ($recursion) {
             $filter_groups['id_grupo'] = array_merge(
                 $group_id,
-                groups_get_id_recursive($group_id, true)
+                groups_get_children_ids($group_id, true)
             );
         } else {
             $filter_groups['id_grupo'] = $group_id;
diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php
index 76225c0751..50a0de4d78 100644
--- a/pandora_console/extensions/module_groups.php
+++ b/pandora_console/extensions/module_groups.php
@@ -86,7 +86,6 @@ function mainModuleGroups()
     );
     $info = $tree_group->getArray();
     $info = groupview_plain_groups($info);
-    $counter = count($info);
     $offset = get_parameter('offset', 0);
     $agent_group_search = get_parameter('agent_group_search', '');
     $module_group_search = get_parameter('module_group_search', '');
@@ -134,6 +133,8 @@ function mainModuleGroups()
         $ids_group = -1;
     }
 
+    $counter = count($info);
+
     $condition_critical = modules_get_state_condition(AGENT_MODULE_STATUS_CRITICAL_ALERT);
     $condition_warning  = modules_get_state_condition(AGENT_MODULE_STATUS_WARNING_ALERT);
     $condition_unknown  = modules_get_state_condition(AGENT_MODULE_STATUS_UNKNOWN);
diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index 27807e6029..5505caa3af 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -468,6 +468,7 @@ function quickShellSettings()
         100,
         true
     );
+    $hidden->data[1][1] .= ui_print_reveal_password('gotty_pass', true);
 
     html_print_table($t);
 
diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php
index 8940b36c2d..5776f5ff21 100644
--- a/pandora_console/extensions/realtime_graphs.php
+++ b/pandora_console/extensions/realtime_graphs.php
@@ -1,22 +1,42 @@
 <?php
+/**
+ * Funtions real time.
+ *
+ * @category   Realtime
+ * @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-2014 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/graphs/fgraph.php';
 require_once $config['homedir'].'/include/functions_snmp_browser.php';
 
 
+/**
+ * Real time charts.
+ *
+ * @return void
+ */
 function pandora_realtime_graphs()
 {
     global $config;
@@ -28,7 +48,7 @@ function pandora_realtime_graphs()
     $onheader = [];
 
     $hide_header = get_parameter('hide_header', 0);
-    if (!$hide_header) {
+    if ($hide_header === 0) {
         ui_print_page_header(
             __('Realtime graphs'),
             'images/extensions.png',
@@ -96,18 +116,42 @@ function pandora_realtime_graphs()
     $table->data = [];
 
     $graph_fields['cpu_load'] = __('%s Server CPU', get_product_name());
-    $graph_fields['pending_packets'] = __('Pending packages from %s Server', get_product_name());
-    $graph_fields['disk_io_wait'] = __('%s Server Disk IO Wait', get_product_name());
-    $graph_fields['apache_load'] = __('%s Server Apache load', get_product_name());
-    $graph_fields['mysql_load'] = __('%s Server MySQL load', get_product_name());
-    $graph_fields['server_load'] = __('%s Server load', get_product_name());
+    $graph_fields['pending_packets'] = __(
+        'Pending packages from %s Server',
+        get_product_name()
+    );
+    $graph_fields['disk_io_wait'] = __(
+        '%s Server Disk IO Wait',
+        get_product_name()
+    );
+    $graph_fields['apache_load'] = __(
+        '%s Server Apache load',
+        get_product_name()
+    );
+    $graph_fields['mysql_load'] = __(
+        '%s Server MySQL load',
+        get_product_name()
+    );
+    $graph_fields['server_load'] = __(
+        '%s Server load',
+        get_product_name()
+    );
     $graph_fields['snmp_interface'] = __('SNMP Interface throughput');
 
     $graph = get_parameter('graph', 'cpu_load');
     $refresh = get_parameter('refresh', '1000');
 
     if ($graph != 'snmp_module') {
-        $data['graph'] = __('Graph').'&nbsp;&nbsp;'.html_print_select($graph_fields, 'graph', $graph, '', '', 0, true);
+        $data['graph'] = __('Graph').'&nbsp;&nbsp;';
+        $data['graph'] .= html_print_select(
+            $graph_fields,
+            'graph',
+            $graph,
+            '',
+            '',
+            0,
+            true
+        );
     }
 
     $refresh_fields[1000]  = human_time_description_raw(1, true, 'large');
@@ -119,10 +163,14 @@ function pandora_realtime_graphs()
         $agent_alias = io_safe_output(get_parameter('agent_alias', ''));
         $module_name = io_safe_output(get_parameter('module_name', ''));
         $module_incremental = get_parameter('incremental', 0);
-        $data['module_info'] = "$agent_alias: <b>$module_name</b>";
+        $data['module_info'] = $agent_alias.': <b>'.$module_name.'</b>';
 
-        // Append all the hidden in this cell
-        $data['module_info'] .= html_print_input_hidden('incremental', $module_incremental, true);
+        // Append all the hidden in this cell.
+        $data['module_info'] .= html_print_input_hidden(
+            'incremental',
+            $module_incremental,
+            true
+        );
         $data['module_info'] .= html_print_select(
             ['snmp_module' => '-'],
             'graph',
@@ -139,76 +187,72 @@ function pandora_realtime_graphs()
         );
     }
 
-    $data['refresh'] = __('Refresh interval').'&nbsp;&nbsp;'.html_print_select($refresh_fields, 'refresh', $refresh, '', '', 0, true);
+    $data['refresh'] = __('Refresh interval').'&nbsp;&nbsp;';
+    $data['refresh'] .= html_print_select(
+        $refresh_fields,
+        'refresh',
+        $refresh,
+        '',
+        '',
+        0,
+        true
+    );
     if ($graph != 'snmp_module') {
-        $data['incremental'] = __('Incremental').'&nbsp;&nbsp;'.html_print_checkbox('incremental', 1, 0, true);
+        $data['incremental'] = __('Incremental').'&nbsp;&nbsp;';
+        $data['incremental'] .= html_print_checkbox('incremental', 1, 0, true);
     }
 
-    $data['reset'] = html_print_button(__('Clear graph'), 'reset', false, 'javascript:realtimeGraphs.clearGraph();', 'class="sub delete" style="margin-top:0px;"', true);
+    $data['reset'] = html_print_button(
+        __('Clear graph'),
+        'reset',
+        false,
+        'javascript:realtimeGraphs.clearGraph();',
+        'class="sub delete" style="margin-top:0px;"',
+        true
+    );
     $table->data[] = $data;
 
     if ($graph == 'snmp_interface' || $graph == 'snmp_module') {
-        $snmp_address = get_parameter('snmp_address', '');
-        $snmp_community = get_parameter('snmp_community', '');
-        $snmp_oid = get_parameter('snmp_oid', '');
-        $snmp_ver = get_parameter('snmp_ver', '');
-
-        $data = [];
-
-        $data['snmp_address'] = __('Target IP').'&nbsp;&nbsp;'.html_print_input_text('ip_target', $snmp_address, '', 50, 255, true);
-        $table->colspan[1]['snmp_address'] = 2;
-
-        $data['snmp_community'] = __('Community').'&nbsp;&nbsp;'.html_print_input_text('snmp_community', $snmp_community, '', 50, 255, true);
-        $table->colspan[1]['snmp_community'] = 2;
-
-        $table->data[] = $data;
-
-        $snmp_versions = [];
-        $snmp_versions['1'] = '1';
-        $snmp_versions['2'] = '2';
-        $snmp_versions['2c'] = '2c';
-
-        $data = [];
-        $data['snmp_oid'] = __('OID').'&nbsp;&nbsp;'.html_print_input_text('snmp_oid', $snmp_oid, '', 100, 255, true);
-        $table->colspan[2]['snmp_oid'] = 2;
-
-        $data['snmp_ver'] = __('Version').'&nbsp;&nbsp;'.html_print_select($snmp_versions, 'snmp_version', $snmp_ver, '', '', 0, true);
-        $data['snmp_ver'] .= '&nbsp;&nbsp;'.html_print_button(__('SNMP walk'), 'snmp_walk', false, 'javascript:snmpBrowserWindow();', 'class="sub next"', true);
-        $table->colspan[2]['snmp_ver'] = 2;
-
-        $table->data[] = $data;
-
-        // Hide some options in snmp_module graphs
-        if ($graph == 'snmp_module') {
-            $table->rowstyle[1] = 'display: none;';
-            $table->rowstyle[2] = 'display: none;';
-        }
-
-        snmp_browser_print_container(false, '100%', '60%', 'none');
+        echo snmp_browser_print_container(true, '100%', '60%', 'none');
     }
 
-    // Print the relative path to AJAX calls:
+    // Print the relative path to AJAX calls.
     html_print_input_hidden('rel_path', get_parameter('rel_path', ''));
 
-    // Print the form
+    // Print the form.
     echo '<form id="realgraph" method="post">';
     html_print_table($table);
     echo '</form>';
 
-    // Define a custom action to save the OID selected in the SNMP browser to the form
-    html_print_input_hidden('custom_action', urlencode(base64_encode('&nbsp;<a href="javascript:realtimeGraphs.setOID();"><img src="'.ui_get_full_url('images').'/input_filter.disabled.png" title="'.__('Use this OID').'" style="vertical-align: middle;"></img></a>')), false);
+    // Define a custom action to save
+    // the OID selected in the SNMP browser to the form.
+    html_print_input_hidden(
+        'custom_action',
+        urlencode(
+            base64_encode(
+                '&nbsp;<a href="javascript:realtimeGraphs.setOID();"><img src="'.ui_get_full_url('images').'/input_filter.disabled.png" title="'.__('Use this OID').'" style="vertical-align: middle;"></img></a>'
+            )
+        ),
+        false
+    );
     html_print_input_hidden('incremental_base', '0');
 
     echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/pandora_snmp_browser.js').'"></script>';
     echo '<script type="text/javascript" src="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.js').'"></script>';
     echo '<link rel="stylesheet" type="text/css" href="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.css').'"></style>';
 
-    // Store servers timezone offset to be retrieved from js
+    // Store servers timezone offset to be retrieved from js.
     set_js_value('timezone_offset', date('Z', time()));
 }
 
 
-extensions_add_operation_menu_option(__('Realtime graphs'), 'estado', null, 'v1r1', 'view');
+extensions_add_operation_menu_option(
+    __('Realtime graphs'),
+    'estado',
+    null,
+    'v1r1',
+    'view'
+);
 extensions_add_main_function('pandora_realtime_graphs');
 
 $db = null;
diff --git a/pandora_console/extensions/realtime_graphs/ajax.php b/pandora_console/extensions/realtime_graphs/ajax.php
index dea94a5753..a09ef9bb29 100644
--- a/pandora_console/extensions/realtime_graphs/ajax.php
+++ b/pandora_console/extensions/realtime_graphs/ajax.php
@@ -69,15 +69,34 @@ switch ($graph) {
 
     case 'snmp_interface':
     case 'snmp_module':
-        $snmp_address = $_POST['snmp_address'];
-        $snmp_community = $_POST['snmp_community'];
-        $snmp_ver = $_POST['snmp_ver'];
-        $snmp_oid = $_POST['snmp_oid'];
+        $snmp_address = get_parameter('snmp_address', '');
+        $snmp_community = get_parameter('snmp_community', '');
+        $snmp_ver = get_parameter('snmp_ver', '');
+        $snmp_oid = get_parameter('snmp_oid', '');
+        $snmp3_auth_user = get_parameter('snmp3_auth_user', '');
+        $snmp3_security_level = get_parameter('snmp3_security_level', '');
+        $snmp3_auth_method = get_parameter('snmp3_auth_method', '');
+        $snmp3_auth_pass = get_parameter('snmp3_auth_pass', '');
+        $snmp3_privacy_method = get_parameter('snmp3_privacy_method', '');
+        $snmp3_privacy_pass = get_parameter('snmp3_privacy_pass', '');
 
         if (empty($snmp_address) || empty($snmp_oid)) {
             $data = 0;
         } else {
-            $data = get_snmpwalk($snmp_address, $snmp_ver, $snmp_community, '', '', '', '', '', '', 0, $snmp_oid);
+            $data = get_snmpwalk(
+                $snmp_address,
+                $snmp_ver,
+                $snmp_community,
+                $snmp3_auth_user,
+                $snmp3_security_level,
+                $snmp3_auth_method,
+                $snmp3_auth_pass,
+                $snmp3_privacy_method,
+                $snmp3_privacy_pass,
+                0,
+                $snmp_oid,
+                $snmp_port
+            );
             $data_index = array_keys($data);
             $graph_title = $data_index[0];
             if (!empty($data)) {
diff --git a/pandora_console/extensions/realtime_graphs/realtime_graphs.js b/pandora_console/extensions/realtime_graphs/realtime_graphs.js
index b5d6c1eaa8..088f31dbf6 100644
--- a/pandora_console/extensions/realtime_graphs/realtime_graphs.js
+++ b/pandora_console/extensions/realtime_graphs/realtime_graphs.js
@@ -1,3 +1,4 @@
+/* global $, get_php_value */
 (function() {
   var numberOfPoints = 100;
   var refresh = parseInt($("#refresh").val());
@@ -14,7 +15,7 @@
       container: $("#chartLegend")
     },
     xaxis: {
-      tickFormatter: function(timestamp, axis) {
+      tickFormatter: function(timestamp) {
         var date = new Date(timestamp * 1000);
 
         var server_timezone_offset = get_php_value("timezone_offset");
@@ -39,7 +40,7 @@
       }
     },
     yaxis: {
-      tickFormatter: function(value, axis) {
+      tickFormatter: function(value) {
         return shortNumber(roundToTwo(value));
       }
     },
@@ -66,10 +67,16 @@
       data: {
         graph: $("#graph :selected").val(),
         graph_title: $("#graph :selected").html(),
-        snmp_community: $("#text-snmp_community").val(),
-        snmp_oid: $("#text-snmp_oid").val(),
-        snmp_ver: $("#snmp_version :selected").val(),
-        snmp_address: $("#text-ip_target").val(),
+        snmp_community: $("#text-community").val(),
+        snmp_oid: $("#text-starting_oid").val(),
+        snmp_ver: $("#snmp_browser_version").val(),
+        snmp_address: $("#text-target_ip").val(),
+        snmp3_auth_user: $("#text-snmp3_browser_auth_user").val(),
+        snmp3_security_level: $("#snmp3_browser_security_level").val(),
+        snmp3_auth_method: $("#snmp3_browser_auth_method").val(),
+        snmp3_auth_pass: $("#password-snmp3_browser_auth_pass").val(),
+        snmp3_privacy_method: $("#snmp3_browser_privacy_method").val(),
+        snmp3_privacy_pass: $("#password-snmp3_browser_privacy_pass").val(),
         refresh: refresh
       },
       success: function(serie) {
@@ -87,7 +94,7 @@
         }
 
         if (data.length === 0) {
-          for (i = 0; i < numberOfPoints; i++) {
+          for (var i = 0; i < numberOfPoints; i++) {
             var step = i * (refresh / 1000);
             serie.data.unshift([timestamp - step, 0]);
           }
@@ -123,7 +130,7 @@
     var data = plot.getData();
     if (data.length === 0) return;
 
-    for (i = 0; i < data[0].data.length; i++) {
+    for (var i = 0; i < data[0].data.length; i++) {
       data[0].data[i][1] = 0;
     }
     if (incremental) lastIncVal = null;
diff --git a/pandora_console/extensions/resource_exportation.php b/pandora_console/extensions/resource_exportation.php
index 3946ec053d..16cf674ab6 100755
--- a/pandora_console/extensions/resource_exportation.php
+++ b/pandora_console/extensions/resource_exportation.php
@@ -92,7 +92,11 @@ function output_xml_report($id)
 
     $group = db_get_value('nombre', 'tgrupo', 'id_grupo', $report['id_group']);
     echo '<group><![CDATA['.io_safe_output($group)."]]></group>\n";
-    $items = db_get_all_rows_field_filter('treport_content', 'id_report', $report['id_report']);
+    $items = db_get_all_rows_field_filter(
+        'treport_content',
+        'id_report',
+        $report['id_report']
+    );
     foreach ($items as $item) {
         echo "<item>\n";
             echo '<type>'.io_safe_output($item['type'])."</type>\n";
diff --git a/pandora_console/extensions/resource_registration.php b/pandora_console/extensions/resource_registration.php
index dae61e3a78..80fed2cf6c 100755
--- a/pandora_console/extensions/resource_registration.php
+++ b/pandora_console/extensions/resource_registration.php
@@ -37,8 +37,16 @@ function insert_item_report($report_id, $values)
 
         ui_print_result_message(
             $result,
-            sprintf(__("Success add '%s' item in report '%s'."), $values['type'], $name),
-            sprintf(__("Error create '%s' item in report '%s'."), $values['type'], $name)
+            sprintf(
+                __("Success add '%s' item in report '%s'."),
+                $values['type'],
+                $name
+            ),
+            sprintf(
+                __("Error create '%s' item in report '%s'."),
+                $values['type'],
+                $name
+            )
         );
     }
 }
@@ -55,9 +63,12 @@ function process_upload_xml_report($xml, $group_filter=0)
             $posible_name = $values['name'];
             $exist = true;
             $loops = 30;
-            // Loops to exit or tries
+            // Loops to exit or tries.
             while ($exist && $loops > 0) {
-                $exist = (bool) db_get_row_filter('treport', ['name' => io_safe_input($posible_name)]);
+                $exist = (bool) db_get_row_filter(
+                    'treport',
+                    ['name' => io_safe_input($posible_name)]
+                );
 
                 if ($exist) {
                     $loops--;
@@ -74,7 +85,7 @@ function process_upload_xml_report($xml, $group_filter=0)
                 );
                 break;
             } else if ($loops != 30) {
-                ui_print_error_message(
+                ui_print_warning_message(
                     sprintf(
                         __("Warning create '%s' report, the name exist, the report have a name %s."),
                         $reportElement->name,
@@ -89,13 +100,22 @@ function process_upload_xml_report($xml, $group_filter=0)
             break;
         }
 
-        $id_group = db_get_value('id_grupo', 'tgrupo', 'nombre', $reportElement->group);
-        if ($id_group === false) {
-            ui_print_error_message(__("Error the report haven't group."));
-            break;
+        if (isset($reportElement->group) === true
+            && empty($reportElement->group) === false
+        ) {
+            $id_group = db_get_value(
+                'id_grupo',
+                'tgrupo',
+                'nombre',
+                $reportElement->group
+            );
+            if ($id_group === false) {
+                ui_print_error_message(__("Error the report haven't group."));
+                break;
+            }
         }
 
-        if (isset($reportElement->description)) {
+        if (isset($reportElement->description) === true) {
             $values['description'] = $reportElement->description;
         }
 
@@ -108,9 +128,19 @@ function process_upload_xml_report($xml, $group_filter=0)
         );
 
         if ($id_report) {
-            db_pandora_audit('Report management', 'Create report '.$id_report, false, false);
+            db_pandora_audit(
+                'Report management',
+                'Create report '.$id_report,
+                false,
+                false
+            );
         } else {
-            db_pandora_audit('Report management', 'Fail to create report', false, false);
+            db_pandora_audit(
+                'Report management',
+                'Fail to create report',
+                false,
+                false
+            );
             break;
         }
 
@@ -119,45 +149,52 @@ function process_upload_xml_report($xml, $group_filter=0)
 
             $values = [];
             $values['id_report'] = $id_report;
-            if (isset($item['description'])) {
+            if (isset($item['description']) === true) {
                 $values['description'] = io_safe_input($item['description']);
             }
 
-            if (isset($item['period'])) {
+            if (isset($item['period']) === true) {
                 $values['period'] = io_safe_input($item['period']);
             }
 
-            if (isset($item['type'])) {
+            if (isset($item['type']) === true) {
                 $values['type'] = io_safe_input($item['type']);
             }
 
             $agents_item = [];
-            if (isset($item['agent'])) {
+            if (isset($item['agent']) === true) {
                 $agents = agents_get_agents(
                     ['id_grupo' => $group_filter],
                     [
                         'id_agente',
-                        'nombre',
+                        'alias',
                     ]
                 );
 
-                $agent_clean = str_replace(['[', ']'], '', $item['agent']);
+                $agent_clean = str_replace(
+                    [
+                        '[',
+                        ']',
+                    ],
+                    '',
+                    io_safe_output($item['agent'])
+                );
                 $regular_expresion = ($agent_clean != $item['agent']);
 
                 foreach ($agents as $agent) {
                     if ($regular_expresion) {
-                        if ((bool) preg_match('/'.$agent_clean.'/', io_safe_output($agent['nombre']))) {
-                            $agents_item[$agent['id_agente']]['name'] = $agent['nombre'];
+                        if ((bool) preg_match('/'.$agent_clean.'/', io_safe_output($agent['alias']))) {
+                            $agents_item[$agent['id_agente']]['name'] = $agent['alias'];
                         }
                     } else {
-                        if ($agent_clean == io_safe_output($agent['nombre'])) {
-                            $agents_item[$agent['id_agente']]['name'] = $agent['nombre'];
+                        if ($agent_clean == io_safe_output($agent['alias'])) {
+                            $agents_item[$agent['id_agente']]['name'] = $agent['alias'];
                         }
                     }
                 }
             }
 
-            if (isset($item['module'])) {
+            if (isset($item['module']) === true) {
                 $module_clean = str_replace(['[', ']'], '', $item['module']);
                 $regular_expresion = ($module_clean != $item['module']);
 
diff --git a/pandora_console/extras/mr/42.sql b/pandora_console/extras/mr/42.sql
index 26f20e0f0a..f4bed54d16 100644
--- a/pandora_console/extras/mr/42.sql
+++ b/pandora_console/extras/mr/42.sql
@@ -31,4 +31,6 @@ ALTER TABLE `treport` ADD COLUMN `index_render` tinyint(1) NOT NULL DEFAULT 1;
 ALTER TABLE `treport_template` ADD COLUMN `cover_page_render` tinyint(1) NOT NULL DEFAULT 1;
 ALTER TABLE `treport_template` ADD COLUMN `index_render` tinyint(1) NOT NULL DEFAULT 1;
 
+UPDATE `tconfig` SET value = '{"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.00097656250000":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}' WHERE token = 'post_process_custom_values';
+
 COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/mr/43.sql b/pandora_console/extras/mr/43.sql
index 3845154eb1..02cd804410 100644
--- a/pandora_console/extras/mr/43.sql
+++ b/pandora_console/extras/mr/43.sql
@@ -2,4 +2,10 @@ START TRANSACTION;
 
 ALTER TABLE `tagente_modulo` ADD COLUMN `debug_content` varchar(200);
 
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field16` TEXT NOT NULL AFTER `al_field15`;
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field17` TEXT NOT NULL AFTER `al_field16`;
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field18` TEXT NOT NULL AFTER `al_field17`;
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field19` TEXT NOT NULL AFTER `al_field18`;
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field20` TEXT NOT NULL AFTER `al_field19`;
+
 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 5dd93ebf31..4a7b3e4929 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
@@ -1256,11 +1256,16 @@ ALTER TABLE `talert_templates` ADD COLUMN `disable_event` tinyint(1) DEFAULT 0;
 -- ---------------------------------------------------------------------
 -- Table `talert_snmp`
 -- ---------------------------------------------------------------------
-ALTER TABLE talert_snmp ADD COLUMN `al_field11` TEXT NOT NULL DEFAULT "";
-ALTER TABLE talert_snmp ADD COLUMN `al_field12` TEXT NOT NULL DEFAULT "";
-ALTER TABLE talert_snmp ADD COLUMN `al_field13` TEXT NOT NULL DEFAULT "";
-ALTER TABLE talert_snmp ADD COLUMN `al_field14` TEXT NOT NULL DEFAULT "";
-ALTER TABLE talert_snmp ADD COLUMN `al_field15` TEXT NOT NULL DEFAULT "";
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field11` TEXT NOT NULL DEFAULT "";
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field12` TEXT NOT NULL DEFAULT "";
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field13` TEXT NOT NULL DEFAULT "";
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field14` TEXT NOT NULL DEFAULT "";
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field15` TEXT NOT NULL DEFAULT "";
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field16` TEXT NOT NULL DEFAULT "";
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field17` TEXT NOT NULL DEFAULT "";
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field18` TEXT NOT NULL DEFAULT "";
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field19` TEXT NOT NULL DEFAULT "";
+ALTER TABLE `talert_snmp` ADD COLUMN `al_field20` TEXT NOT NULL DEFAULT "";
 ALTER TABLE `talert_snmp` ADD COLUMN `disable_event` tinyint(1) DEFAULT 0;
 ALTER TABLE `talert_snmp` MODIFY COLUMN `al_field11` text NOT NULL,
 	MODIFY COLUMN `al_field12` text NOT NULL,
@@ -1268,6 +1273,7 @@ ALTER TABLE `talert_snmp` MODIFY COLUMN `al_field11` text NOT NULL,
 	MODIFY COLUMN `al_field14` text NOT NULL,
 	MODIFY COLUMN `al_field15` text NOT NULL;
 
+
 -- ---------------------------------------------------------------------
 -- Table `talert_snmp_action`
 -- ---------------------------------------------------------------------
@@ -1405,6 +1411,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_type', '');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_status', '');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_title', '');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_content', '');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('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.00097656250000":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}');
 
 -- ---------------------------------------------------------------------
 -- Table `tconfig_os`
diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index c4cd8482bc..59257907ad 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -114,6 +114,13 @@ foreach ($custom_fields as $field) {
     }
 }
 
+// Connection lost alert.
+ui_require_css_file('register', 'include/styles/', true);
+ui_require_javascript_file('connection_check');
+$conn_title = __('Connection with server has been lost');
+$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
+
 // Get the custom icons.
 $docs_logo = ui_get_docs_logo();
 $support_logo = ui_get_support_logo();
@@ -450,7 +457,12 @@ if ($login_screen == 'logout') {
             echo '<div class="content_message_alert">';
                 echo '<div class="text_message_alert">';
                     echo '<h1>'.__('Logged out').'</h1>';
-                    echo '<p>'.__('Your session has ended. Please close your browser window to close this %s session.', get_product_name()).'</p>';
+    if (empty($config['logout_msg']) === true) {
+        echo '<p>'.__('Your session has ended. Please close your browser window to close this %s session.', get_product_name()).'</p>';
+    } else {
+        echo '<p>'.__($config['logout_msg']).'</p>';
+    }
+
                 echo '</div>';
                 echo '<div class="button_message_alert">';
                     html_print_submit_button('Ok', 'hide-login-logout', false);
diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index e7097b994e..6d15c7ab2f 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -148,7 +148,8 @@ if ($initial && users_is_admin()) {
     config_wiz_modal(
         false,
         true,
-        (($registration === true) ? 'show_registration_wizard()' : null)
+        (($registration === true) ? 'show_registration_wizard()' : null),
+        true
     );
 }
 
@@ -159,7 +160,8 @@ if (!$config['disabled_newsletter']) {
             false,
             // Launch only if not being launch from 'initial'.
             !$initial,
-            (($show_newsletter === true) ? 'force_run_newsletter()' : null)
+            (($show_newsletter === false) ? 'force_run_newsletter()' : null),
+            true
         );
     } else {
         if ($show_newsletter) {
@@ -167,7 +169,8 @@ if (!$config['disabled_newsletter']) {
             newsletter_wiz_modal(
                 false,
                 // Launch only if not being call from 'registration'.
-                !$registration && !$initial
+                !$registration && !$initial,
+                true
             );
         }
     }
@@ -183,6 +186,88 @@ try {
     $welcome = false;
 }
 
+$double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $config['id_user']);
+
+if (!$double_auth_enabled && $config['2FA_all_users'] != ''
+    && $config['2Fa_auth'] != '1'
+    && $config['double_auth_enabled']
+) {
+    echo '<div id="doble_auth_window" style="display: none"; >';
+    ?>
+    <script type="text/javascript">
+  var userID = "<?php echo $config['id_user']; ?>";
+
+  var $loadingSpinner = $("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
+  var $dialogContainer = $("div#doble_auth_window");
+
+  $dialogContainer.html($loadingSpinner);
+
+  // Load the info page
+  var request = $.ajax({
+    url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+    type: 'POST',
+    dataType: 'html',
+    data: {
+      page: 'include/ajax/double_auth.ajax',
+      id_user: userID,
+      get_double_auth_info_page: 1,
+      containerID: $dialogContainer.prop('id')
+    },
+    complete: function (xhr, textStatus) {
+
+    },
+    success: function (data, textStatus, xhr) {
+      // isNaN = is not a number
+      if (isNaN(data)) {
+        $dialogContainer.html(data);
+      }
+      // data is a number, convert it to integer to do the compare
+      else if (Number(data) === -1) {
+        $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Authentication error').'</div></b>'; ?>");
+      }
+      else {
+        $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Error').'</div></b>'; ?>");
+      }
+    },
+    error: function (xhr, textStatus, errorThrown) {
+      $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error loading the data').'</div></b>'; ?>");
+    }
+  });
+
+  $("div#doble_auth_window").dialog({
+    <?php config_update_value('2Fa_auth', ''); ?>
+    resizable: true,
+    draggable: true,
+    modal: true,
+    title: "<?php echo __('Double autentication activation'); ?>",
+    overlay: {
+      opacity: 0.5,
+      background: "black"
+    },
+    width: 500,
+    height: 400,
+    close: function (event, ui) {
+        
+    <?php
+    if (!$double_auth_enabled) {
+        config_update_value('2Fa_auth', '1');
+    }
+    ?>
+      // Abort the ajax request
+      if (typeof request != 'undefined'){
+        request.abort();
+      }
+      // Remove the contained html
+      $dialogContainer.empty();
+
+      //document.location.reload();
+    }
+  })
+    .show();    </script>
+    <?php
+    echo '</div>';
+}
+
 $newsletter = null;
 
 ?>
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index f4014de907..d1c7ae5224 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -149,7 +149,7 @@ if (is_ajax()) {
 
 ui_require_javascript_file('openlayers.pandora');
 
-$new_agent = (bool) get_parameter('new_agent');
+$new_agent = (empty($id_agente)) ? true : false;
 
 if (! isset($id_agente) && ! $new_agent) {
     db_pandora_audit('ACL Violation', 'Trying to access agent manager witout an agent');
@@ -1222,6 +1222,7 @@ ui_require_jquery_file('bgiframe');
 
     $(document).ready (function() {
 
+        var $id_agent = '<?php echo $id_agente; ?>';
         var previous_primary_group_select;
         $("#grupo").on('focus', function () {
             previous_primary_group_select = this.value;
@@ -1276,12 +1277,14 @@ ui_require_jquery_file('bgiframe');
             }
         });
 
-        paint_qrcode(
-            "<?php echo ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente); ?>",
-            "#qr_code_agent_view",
-            128,
-            128
-        );
+        if (typeof $id_agent !== 'undefined' && $id_agent !== '0') {
+            paint_qrcode(
+                "<?php echo ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente); ?>",
+                "#qr_code_agent_view",
+                128,
+                128
+            );
+        }
         $("#text-agente").prop('readonly', true);
 
     });
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index d4036bd68c..77d8f06b46 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -408,7 +408,7 @@ if ($ag_group > 0) {
     $ag_groups = [];
     $ag_groups = (array) $ag_group;
     if ($recursion) {
-        $ag_groups = groups_get_id_recursive($ag_group, true);
+        $ag_groups = groups_get_children_ids($ag_group, true);
     }
 
     $user_groups_to_sql = implode(',', $ag_groups);
@@ -754,7 +754,6 @@ if (check_acl($config['id_user'], 0, 'AW')) {
     // Create agent button.
     echo '<div style="text-align: right;">';
     echo '<form method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">';
-    html_print_input_hidden('new_agent', 1);
     html_print_submit_button(
         __('Create agent'),
         'crt-2',
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index e6d384e5e4..64bb89a565 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -535,20 +535,30 @@ $table_advanced->data[0][1] = html_print_input_text(
 );
 
 $table_advanced->data[0][3] = __('Unit');
-// $table_advanced->data[1][4] = html_print_input_text ('unit', $unit, '', 20, 65, true,
-// $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy);
-// $table_advanced->colspan[1][4] = 3;
-$table_advanced->data[0][4] = html_print_extended_select_for_unit(
+$table_advanced->data[0][4] = html_print_input_text(
     'unit',
     $unit,
     '',
-    '',
-    '0',
-    false,
+    20,
+    65,
     true,
+    $disabledBecauseInPolicy,
     false,
-    false
+    '',
+    $classdisabledBecauseInPolicy
 );
+// $table_advanced->colspan[1][4] = 3;
+// $table_advanced->data[0][4] = html_print_extended_select_for_unit(
+// 'unit',
+// $unit,
+// '',
+// '',
+// '0',
+// false,
+// true,
+// false,
+// false
+// );
 $table_advanced->colspan[0][4] = 3;
 
 $module_id_policy_module = 0;
@@ -1340,115 +1350,117 @@ $(document).ready (function () {
         var type_name_selected = type_names[type_selected];
         var element = document.getElementById("module_type_help");
         var language =  "<?php echo $config['language']; ?>" ;
-        element.onclick = function (event) {
-            if(type_name_selected == 'async_data' ||
-             type_name_selected == 'async_proc' ||
-             type_name_selected == 'async_string' ||
-             type_name_selected == 'generic_proc'||
-             type_name_selected == 'generic_data' ||
-             type_name_selected == 'generic_data_inc' ||
-             type_name_selected == 'generic_data_inc_abs'||
-             type_name_selected == 'generic_data_string' ||
-             type_name_selected == 'keep_alive'
-               ){
-                if (language == 'es'){
-                 window.open(
-                     'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Operacion&printable=yes#Tipos_de_m.C3.B3dulos',
-                     '_blank',
-                     'width=800,height=600'
-                        );
-               }
-               else{
-                window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Operations&printable=yes#Types_of_Modules',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-               }
-              
-                
-            }
-            if(type_name_selected == 'remote_icmp' ||
-             type_name_selected == 'remote_icmp_proc'
-             ){
-                 if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_ICMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-                 else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#ICMP_Monitoring',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-              
-                
-            }
-            if(type_name_selected == 'remote_snmp_string' ||
-             type_name_selected == 'remote_snmp_proc' ||
-             type_name_selected == 'remote_snmp_inc' ||
-             type_name_selected == 'remote_snmp'
-             ){
-                 if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizando_con_m.C3.B3dulos_de_red_tipo_SNMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-                 else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#Monitoring_by_Network_Modules_with_SNMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-               
-                
-            }
-            if(type_name_selected == 'remote_tcp_string' ||
-             type_name_selected == 'remote_tcp_proc' ||
-             type_name_selected == 'remote_tcp_inc' ||
-             type_name_selected == 'remote_tcp'
-               ){
-                   if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_TCP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
+        if (typeof element !== 'undefined' && element !== null) {
+            element.onclick = function (event) {
+                if(type_name_selected == 'async_data' ||
+                 type_name_selected == 'async_proc' ||
+                 type_name_selected == 'async_string' ||
+                 type_name_selected == 'generic_proc'||
+                 type_name_selected == 'generic_data' ||
+                 type_name_selected == 'generic_data_inc' ||
+                 type_name_selected == 'generic_data_inc_abs'||
+                 type_name_selected == 'generic_data_string' ||
+                 type_name_selected == 'keep_alive'
+                   ){
+                    if (language == 'es'){
+                     window.open(
+                         'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Operacion&printable=yes#Tipos_de_m.C3.B3dulos',
+                         '_blank',
+                         'width=800,height=600'
+                            );
                    }
                    else{
                     window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#TCP_Monitoring',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-            }
-            if(type_name_selected == 'web_data' ||
-             type_name_selected == 'web_proc' ||
-             type_name_selected == 'web_content_data' ||
-             type_name_selected == 'web_content_string'
-               ){
-                   if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_web&printable=yes#Creaci.C3.B3n_de_m.C3.B3dulos_web',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-                   else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Web_Monitoring&printable=yes#Creating_Web_Modules',
-                     '_blank',
-                     'width=800,height=600'
-                     );
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Operations&printable=yes#Types_of_Modules',
+                         '_blank',
+                         'width=800,height=600'
+                         );
                    }
+                  
+                    
+                }
+                if(type_name_selected == 'remote_icmp' ||
+                 type_name_selected == 'remote_icmp_proc'
+                 ){
+                     if(language == 'es'){
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_ICMP',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                     }
+                     else{
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#ICMP_Monitoring',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                     }
+                  
+                    
+                }
+                if(type_name_selected == 'remote_snmp_string' ||
+                 type_name_selected == 'remote_snmp_proc' ||
+                 type_name_selected == 'remote_snmp_inc' ||
+                 type_name_selected == 'remote_snmp'
+                 ){
+                     if(language == 'es'){
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizando_con_m.C3.B3dulos_de_red_tipo_SNMP',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                     }
+                     else{
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#Monitoring_by_Network_Modules_with_SNMP',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                     }
+                   
+                    
+                }
+                if(type_name_selected == 'remote_tcp_string' ||
+                 type_name_selected == 'remote_tcp_proc' ||
+                 type_name_selected == 'remote_tcp_inc' ||
+                 type_name_selected == 'remote_tcp'
+                   ){
+                       if(language == 'es'){
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_TCP',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                       }
+                       else{
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#TCP_Monitoring',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                       }
+                }
+                if(type_name_selected == 'web_data' ||
+                 type_name_selected == 'web_proc' ||
+                 type_name_selected == 'web_content_data' ||
+                 type_name_selected == 'web_content_string'
+                   ){
+                       if(language == 'es'){
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_web&printable=yes#Creaci.C3.B3n_de_m.C3.B3dulos_web',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                       }
+                       else{
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Web_Monitoring&printable=yes#Creating_Web_Modules',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                       }
+                }
             }
         }
 
diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index b3e7029dbd..40d3f3b1e3 100644
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -354,8 +354,8 @@ if ($create_downtime || $update_downtime) {
             __('Not created. Error inserting data').'. '.__('The end date must be higher than the current time')
         );
     } else if ($type_execution == 'periodically'
-        && (($type_periodicity == 'weekly' && $periodically_time_from >= $periodically_time_to)
-        || ($type_periodicity == 'monthly' && $periodically_day_from == $periodically_day_to && $periodically_time_from >= $periodically_time_to))
+        && $type_periodicity == 'monthly'
+        && $periodically_day_from == $periodically_day_to
     ) {
         ui_print_error_message(
             __('Not created. Error inserting data').'. '.__('The end time must be higher than the start time')
@@ -877,7 +877,7 @@ if ($id_downtime > 0) {
     $filter_cond = '';
     if ($filter_group > 0) {
         if ($recursion) {
-            $rg = groups_get_id_recursive($filter_group, true);
+            $rg = groups_get_children_ids($filter_group, true);
             $filter_cond .= ' AND id_grupo IN (';
 
             $i = 0;
diff --git a/pandora_console/godmode/alerts/alert_list.builder.php b/pandora_console/godmode/alerts/alert_list.builder.php
index 4e9772b6d6..bcb1db0e08 100644
--- a/pandora_console/godmode/alerts/alert_list.builder.php
+++ b/pandora_console/godmode/alerts/alert_list.builder.php
@@ -131,7 +131,7 @@ if (check_acl($config['id_user'], 0, 'LM')) {
 
     $table->data[2][0] = __('Template');
     $own_info = get_user_info($config['id_user']);
-if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
+if ($own_info['is_admin']) {
     $templates = alerts_get_alert_templates(false, ['id', 'name']);
 } else {
     $usr_groups = users_get_groups($config['id_user'], 'LW', true);
diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php
index 56201e3a28..a93f38bfa1 100644
--- a/pandora_console/godmode/events/event_edit_filter.php
+++ b/pandora_console/godmode/events/event_edit_filter.php
@@ -130,6 +130,16 @@ if ($update || $create) {
     $id_agent = (int) get_parameter('id_agent');
     $text_module = get_parameter('text_module', '');
     $id_agent_module = (int) get_parameter('module_search_hidden');
+    if ($text_module === '') {
+        $text_module = io_safe_output(
+            db_get_value_filter(
+                'nombre',
+                'tagente_modulo',
+                ['id_agente_modulo' => $id_agent_module]
+            )
+        );
+    }
+
     $pagination = get_parameter('pagination', '');
     $event_view_hr = get_parameter('event_view_hr', '');
     $id_user_ack = get_parameter('id_user_ack', '');
diff --git a/pandora_console/godmode/groups/configure_group.php b/pandora_console/godmode/groups/configure_group.php
index 72fe425fca..7d74fe56d0 100644
--- a/pandora_console/godmode/groups/configure_group.php
+++ b/pandora_console/godmode/groups/configure_group.php
@@ -168,7 +168,15 @@ if ($id_group) {
     }
 } else {
     $table->data[2][1] = '<div class="w250px inline">';
-    $table->data[2][1] .= html_print_select_groups(false, 'AR', true, 'id_parent', $id_parent, '', '', '', true);
+    $table->data[2][1] .= html_print_input(
+        [
+            'type'           => 'select_groups',
+            'name'           => 'id_parent',
+            'selected'       => $id_parent,
+            'return'         => true,
+            'returnAllGroup' => true,
+        ]
+    );
     $table->data[2][1] .= '</div>';
 }
 
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index de5cae9f7d..ddb5224590 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -419,45 +419,52 @@ if ($update_group) {
         $aviable_name = false;
     }
 
+    // Check if group name is unique.
+    $check = db_get_value_filter(
+        'nombre',
+        'tgrupo',
+        [
+            'nombre'   => $name,
+            'id_grupo' => $id_group,
+        ],
+        'AND NOT'
+    );
+
     // Check if name field is empty.
-    if ($name != '' && $aviable_name === true) {
-        $sql = sprintf(
-            'UPDATE tgrupo
-             SET nombre = "%s",
-                icon = "%s",
-                disabled = %d,
-                parent = %d,
-                custom_id = "%s",
-                propagate = %d,
-                id_skin = %d,
-                description = "%s",
-                contact = "%s",
-                other = "%s",
-                password = "%s"
-            WHERE id_grupo = %d',
-            $name,
-            empty($icon) ? '' : substr($icon, 0, -4),
-            !$alerts_enabled,
-            $id_parent,
-            $custom_id,
-            $propagate,
-            $skin,
-            $description,
-            $contact,
-            $other,
-            $group_pass,
-            $id_group
-        );
+    if ($name != '') {
+        if (!$check) {
+            if ($aviable_name === true) {
+                $values = [
+                    'nombre'      => $name,
+                    'icon'        => empty($icon) ? '' : substr($icon, 0, -4),
+                    'parent'      => $id_parent,
+                    'disabled'    => !$alerts_enabled,
+                    'custom_id'   => $custom_id,
+                    'id_skin'     => $skin,
+                    'description' => $description,
+                    'contact'     => $contact,
+                    'propagate'   => $propagate,
+                    'other'       => $other,
+                    'password'    => io_safe_input($group_pass),
+                ];
 
-        $result = db_process_sql($sql);
-    } else {
-        $result = false;
-    }
+                $result = db_process_sql_update(
+                    'tgrupo',
+                    $values,
+                    ['id_grupo' => $id_group]
+                );
+            }
 
-    if ($result !== false) {
-        ui_print_success_message(__('Group successfully updated'));
+            if ($result) {
+                ui_print_success_message(__('Group successfully updated'));
+            } else {
+                ui_print_error_message(__('There was a problem modifying group'));
+            }
+        } else {
+            ui_print_error_message(__('Each group must have a different name'));
+        }
     } else {
-        ui_print_error_message(__('There was a problem modifying group'));
+        ui_print_error_message(__('Group must have a name'));
     }
 }
 
diff --git a/pandora_console/godmode/massive/massive_add_action_alerts.php b/pandora_console/godmode/massive/massive_add_action_alerts.php
index 9abac11def..52fd5bed07 100755
--- a/pandora_console/godmode/massive/massive_add_action_alerts.php
+++ b/pandora_console/godmode/massive/massive_add_action_alerts.php
@@ -67,10 +67,30 @@ if ($add) {
             $modules = get_parameter('module');
             $modules_id = [];
             if (!empty($modules)) {
+                $modules_id = [];
+
                 foreach ($modules as $module) {
                     foreach ($id_agents as $id_agent) {
-                        $module_id = modules_get_agentmodule_id($module, $id_agent);
-                        $modules_id[] = $module_id['id_agente_modulo'];
+                        if ($module == '0') {
+                                // Get all modules of agent.
+                                $agent_modules = db_get_all_rows_filter(
+                                    'tagente_modulo',
+                                    ['id_agente' => $id_agent],
+                                    'id_agente_modulo'
+                                );
+
+                                $agent_modules_id = array_map(
+                                    function ($field) {
+                                        return $field['id_agente_modulo'];
+                                    },
+                                    $agent_modules
+                                );
+
+                                $modules_id = array_merge($modules_id, $agent_modules_id);
+                        } else {
+                            $module_id = modules_get_agentmodule_id($module, $id_agent);
+                            $modules_id[] = $module_id['id_agente_modulo'];
+                        }
                     }
                 }
 
diff --git a/pandora_console/godmode/massive/massive_add_alerts.php b/pandora_console/godmode/massive/massive_add_alerts.php
index bf52fd0459..7ed99d8277 100755
--- a/pandora_console/godmode/massive/massive_add_alerts.php
+++ b/pandora_console/godmode/massive/massive_add_alerts.php
@@ -106,15 +106,31 @@ function process_manage_add($id_alert_template, $id_agents, $module_names)
         return false;
     }
 
+    $modules_id = [];
+
     foreach ($module_names as $module) {
         foreach ($id_agents as $id_agent) {
-            $module_id = modules_get_agentmodule_id($module, $id_agent);
-            $modules_id[] = $module_id['id_agente_modulo'];
-        }
-    }
+            if ($module == '0') {
+                    // Get all modules of agent.
+                    $agent_modules = db_get_all_rows_filter(
+                        'tagente_modulo',
+                        ['id_agente' => $id_agent],
+                        'id_agente_modulo'
+                    );
 
-    if (count($module_names) == 1 && $module_names[0] == '0') {
-        $modules_id = agents_common_modules($id_agents, false, true);
+                    $agent_modules_id = array_map(
+                        function ($field) {
+                            return $field['id_agente_modulo'];
+                        },
+                        $agent_modules
+                    );
+
+                    $modules_id = array_merge($modules_id, $agent_modules_id);
+            } else {
+                $module_id = modules_get_agentmodule_id($module, $id_agent);
+                $modules_id[] = $module_id['id_agente_modulo'];
+            }
+        }
     }
 
     $conttotal = 0;
diff --git a/pandora_console/godmode/massive/massive_delete_action_alerts.php b/pandora_console/godmode/massive/massive_delete_action_alerts.php
index 832765d4de..5f658fade6 100644
--- a/pandora_console/godmode/massive/massive_delete_action_alerts.php
+++ b/pandora_console/godmode/massive/massive_delete_action_alerts.php
@@ -66,10 +66,29 @@ if ($delete) {
             $modules = (array) get_parameter('module');
             $modules_id = [];
             if (!empty($modules)) {
+                $modules_id = [];
                 foreach ($modules as $module) {
                     foreach ($id_agents as $id_agent) {
-                        $module_id = modules_get_agentmodule_id($module, $id_agent);
-                        $modules_id[] = $module_id['id_agente_modulo'];
+                        if ($module == '0') {
+                                // Get all modules of agent.
+                                $agent_modules = db_get_all_rows_filter(
+                                    'tagente_modulo',
+                                    ['id_agente' => $id_agent],
+                                    'id_agente_modulo'
+                                );
+
+                                $agent_modules_id = array_map(
+                                    function ($field) {
+                                        return $field['id_agente_modulo'];
+                                    },
+                                    $agent_modules
+                                );
+
+                                $modules_id = array_merge($modules_id, $agent_modules_id);
+                        } else {
+                            $module_id = modules_get_agentmodule_id($module, $id_agent);
+                            $modules_id[] = $module_id['id_agente_modulo'];
+                        }
                     }
                 }
 
diff --git a/pandora_console/godmode/massive/massive_delete_alerts.php b/pandora_console/godmode/massive/massive_delete_alerts.php
index c9bcda46ba..c5407ed365 100755
--- a/pandora_console/godmode/massive/massive_delete_alerts.php
+++ b/pandora_console/godmode/massive/massive_delete_alerts.php
@@ -40,7 +40,7 @@ if (is_ajax()) {
         $keys_prefix = (string) get_parameter('keys_prefix', '');
 
         if ($recursion) {
-            $groups = groups_get_id_recursive($id_group, true);
+            $groups = groups_get_children_ids($id_group, true);
         } else {
             $groups = [$id_group];
         }
diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php
index 7d8d64141a..6b31331d1b 100755
--- a/pandora_console/godmode/massive/massive_delete_modules.php
+++ b/pandora_console/godmode/massive/massive_delete_modules.php
@@ -450,7 +450,7 @@ $table->data['form_modules_2'][1] = html_print_select(
     '',
     false,
     'width:100%'
-);
+).' '.__('Select all modules').' '.html_print_checkbox('select_all_modules', 1, false, true, false, '', false, "class='static'");
 
 $table->data['form_modules_2'][2] = __('When select modules');
 $table->data['form_modules_2'][2] .= '<br>';
@@ -522,7 +522,8 @@ $table->data['form_agents_3'][1] = html_print_select(
     '',
     false,
     'width:100%'
-);
+).' '.__('Select all agents').' '.html_print_checkbox('select_all_agents', 1, false, true, false, '', false, "class='static'");
+
 $table->data['form_agents_3'][2] = __('When select agents');
 $table->data['form_agents_3'][2] .= '<br>';
 $table->data['form_agents_3'][2] .= html_print_select(
@@ -588,6 +589,44 @@ if ($selection_mode == 'modules') {
 var limit_parameters_massive = <?php echo $config['limit_parameters_massive']; ?>;
 
 $(document).ready (function () {
+    $("#checkbox-select_all_modules").change(function() {
+        if( $('#checkbox-select_all_modules').prop('checked')) {
+            $("#module_name option").prop('selected', 'selected');
+            $("#module_name").trigger('change');
+        } else {
+            $("#module_name option").prop('selected', false);
+            $("#module_name").trigger('change');
+        }
+    });
+
+    $("#module_name").change(function() {
+        var options_length = $("#module_name option").length;
+        var options_selected_length = $("#module_name option:selected").length;
+
+        if (options_selected_length < options_length) {
+            $('#checkbox-select_all_modules').prop("checked", false);
+        }
+    });
+
+    $("#checkbox-select_all_agents").change(function() {
+        if( $('#checkbox-select_all_agents').prop('checked')) {
+            $("#id_agents option").prop('selected', 'selected');
+            $("#id_agents").trigger('change');
+        } else {
+            $("#id_agents option").prop('selected', false);
+            $("#id_agents").trigger('change');
+        }
+    });
+
+    $("#id_agents").change(function() {
+        var options_length = $("#id_agents option").length;
+        var options_selected_length = $("#id_agents option:selected").length;
+
+        if (options_selected_length < options_length) {
+            $('#checkbox-select_all_agents').prop("checked", false);
+        }
+    });
+
     $("#id_agents").change(agent_changed_by_multiple_agents);
     $("#module_name").change(module_changed_by_multiple_modules);
     
@@ -680,7 +719,7 @@ $(document).ready (function () {
         $('#groups_select').val(-1);
     }
     
-    $('input[type=checkbox]').change (
+    $('input[type=checkbox]').not(".static").change (
         function () {
             if (this.id == "checkbox-force_type") {
                 if (this.checked) {
diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php
index 8c5a611847..1948ba4fa0 100755
--- a/pandora_console/godmode/massive/massive_edit_modules.php
+++ b/pandora_console/godmode/massive/massive_edit_modules.php
@@ -406,7 +406,8 @@ $table->data['form_modules_2'][1] = html_print_select(
     true,
     true,
     true
-);
+).' '.__('Select all modules').' '.html_print_checkbox('select_all_modules', 1, false, true, false, '', false, "class='static'");
+
 $table->data['form_modules_2'][2] = __('When select modules');
 $table->data['form_modules_2'][2] .= '<br>';
 $table->data['form_modules_2'][2] .= html_print_select(
@@ -491,7 +492,7 @@ $table->data['form_agents_3'][1] = html_print_select(
     true,
     true,
     false
-);
+).' '.__('Select all agents').' '.html_print_checkbox('select_all_agents', 1, false, true, false, '', false, "class='static'");
 
 $table->data['form_agents_3'][2] = __('When select agents');
 $table->data['form_agents_3'][2] .= '<br>';
@@ -1212,7 +1213,45 @@ $(document).ready (function () {
             return false;
         }
     });
-    
+
+    $("#checkbox-select_all_modules").change(function() {
+        if( $('#checkbox-select_all_modules').prop('checked')) {
+            $("#module_name option").prop('selected', 'selected');
+            $("#module_name").trigger('change');
+        } else {
+            $("#module_name option").prop('selected', false);
+            $("#module_name").trigger('change');
+        }
+    });
+
+    $("#module_name").change(function() {
+        var options_length = $("#module_name option").length;
+        var options_selected_length = $("#module_name option:selected").length;
+
+        if (options_selected_length < options_length) {
+            $('#checkbox-select_all_modules').prop("checked", false);
+        }
+    });
+
+    $("#checkbox-select_all_agents").change(function() {
+        if( $('#checkbox-select_all_agents').prop('checked')) {
+            $("#id_agents option").prop('selected', 'selected');
+            $("#id_agents").trigger('change');
+        } else {
+            $("#id_agents option").prop('selected', false);
+            $("#id_agents").trigger('change');
+        }
+    });
+
+    $("#id_agents").change(function() {
+        var options_length = $("#id_agents option").length;
+        var options_selected_length = $("#id_agents option:selected").length;
+
+        if (options_selected_length < options_length) {
+            $('#checkbox-select_all_agents').prop("checked", false);
+        }
+    });
+
     $("#text-custom_ip_target").hide();
     
     $("#id_agents").change(agent_changed_by_multiple_agents);
@@ -1463,7 +1502,7 @@ $(document).ready (function () {
         $('#groups_select').val(-1);
     }
     
-    $('input[type=checkbox]').change (
+    $('input[type=checkbox]').not(".static").change (
         function () {
             if (this.id == "checkbox-force_type") {
                 if (this.checked) {
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index fb8a845284..5ff2132d12 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -258,7 +258,7 @@ if ($id_modulo === COMPONENT_TYPE_WIZARD) {
     if ($execution_type === EXECUTION_TYPE_PLUGIN || $module_protocol === 'wmi') {
         // Search all parameters received with extra_fields.
         foreach ($_REQUEST as $parameter => $thisValue) {
-            // Extra fields (OIDs Macros or WMI Extra fields)
+            // Extra fields (OIDs Macros or WMI Extra fields).
             if (preg_match('/extra_field_'.$module_protocol.'_/', $parameter) !== 0) {
                 $tmpParameter = explode('_', $parameter);
                 $extra_fields['extra_field_'.$tmpParameter[3]] = get_parameter($parameter);
@@ -330,7 +330,7 @@ if ($create_component) {
 
     if ($name && !$name_check) {
         $id = network_components_create_network_component(
-            strip_tags(io_safe_input($name), '<br>'),
+            $name,
             $type,
             $id_group,
             [
@@ -431,7 +431,7 @@ if ($update_component) {
             $id,
             [
                 'type'                  => $type,
-                'name'                  => strip_tags(io_safe_input($name, '<br>')),
+                'name'                  => $name,
                 'id_group'              => $id_group,
                 'description'           => $description,
                 'module_interval'       => $module_interval,
diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php
index 35c5648db2..d42e93c949 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_common.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_common.php
@@ -386,121 +386,124 @@ $next_row++;
             console.log(type_name_selected);
             var element = document.getElementById("module_type_help");
             var language =  "<?php echo $config['language']; ?>" ;
-        element.onclick = function (event) {
-            if(type_name_selected == 'async_data' ||
-             type_name_selected == 'async_proc' ||
-             type_name_selected == 'async_string' ||
-             type_name_selected == 'generic_proc'||
-             type_name_selected == 'generic_data' ||
-             type_name_selected == 'generic_data_inc' ||
-             type_name_selected == 'generic_data_inc_abs'||
-             type_name_selected == 'generic_data_string' ||
-             type_name_selected == 'keep_alive'
-               ){
-                if (language == 'es'){
-                 window.open(
-                     'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Operacion&printable=yes#Tipos_de_m.C3.B3dulos',
-                     '_blank',
-                     'width=800,height=600'
-                        );
-               }
-               else{
-                window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Operations&printable=yes#Types_of_Modules',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-               }
-              
-                
+
+            if (typeof element !== 'undefined' && element !== null) {
+                element.onclick = function (event) {
+                    if(type_name_selected == 'async_data' ||
+                     type_name_selected == 'async_proc' ||
+                     type_name_selected == 'async_string' ||
+                     type_name_selected == 'generic_proc'||
+                     type_name_selected == 'generic_data' ||
+                     type_name_selected == 'generic_data_inc' ||
+                     type_name_selected == 'generic_data_inc_abs'||
+                     type_name_selected == 'generic_data_string' ||
+                     type_name_selected == 'keep_alive'
+                       ){
+                        if (language == 'es'){
+                         window.open(
+                             'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Operacion&printable=yes#Tipos_de_m.C3.B3dulos',
+                             '_blank',
+                             'width=800,height=600'
+                                );
+                       }
+                       else{
+                        window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Operations&printable=yes#Types_of_Modules',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                       }
+                      
+                        
+                    }
+                    if(type_name_selected == 'remote_icmp' ||
+                     type_name_selected == 'remote_icmp_proc'
+                     ){
+                         if(language == 'es'){
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_ICMP',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                         }
+                         else{
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#ICMP_Monitoring',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                         }
+                      
+                        
+                    }
+                    if(type_name_selected == 'remote_snmp_string' ||
+                     type_name_selected == 'remote_snmp_proc' ||
+                     type_name_selected == 'remote_snmp_inc' ||
+                     type_name_selected == 'remote_snmp'
+                     ){
+                         if(language == 'es'){
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizando_con_m.C3.B3dulos_de_red_tipo_SNMP',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                         }
+                         else{
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#Monitoring_by_Network_Modules_with_SNMP',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                         }
+                       
+                        
+                    }
+                    if(type_name_selected == 'remote_tcp_string' ||
+                     type_name_selected == 'remote_tcp_proc' ||
+                     type_name_selected == 'remote_tcp_inc' ||
+                     type_name_selected == 'remote_tcp'
+                       ){
+                           if(language == 'es'){
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_TCP',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                           }
+                           else{
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#TCP_Monitoring',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                           }
+                      
+                        
+                    }
+                    if(type_name_selected == 'web_data' ||
+                     type_name_selected == 'web_proc' ||
+                     type_name_selected == 'web_content_data' ||
+                     type_name_selected == 'web_content_string'
+                       ){
+                           if(language == 'es'){
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_web&printable=yes#Creaci.C3.B3n_de_m.C3.B3dulos_web',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                           }
+                           else{
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Web_Monitoring&printable=yes#Creating_Web_Modules',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                           }
+                      
+                        
+                    }
+                }
             }
-            if(type_name_selected == 'remote_icmp' ||
-             type_name_selected == 'remote_icmp_proc'
-             ){
-                 if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_ICMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-                 else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#ICMP_Monitoring',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-              
-                
-            }
-            if(type_name_selected == 'remote_snmp_string' ||
-             type_name_selected == 'remote_snmp_proc' ||
-             type_name_selected == 'remote_snmp_inc' ||
-             type_name_selected == 'remote_snmp'
-             ){
-                 if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizando_con_m.C3.B3dulos_de_red_tipo_SNMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-                 else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#Monitoring_by_Network_Modules_with_SNMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-               
-                
-            }
-            if(type_name_selected == 'remote_tcp_string' ||
-             type_name_selected == 'remote_tcp_proc' ||
-             type_name_selected == 'remote_tcp_inc' ||
-             type_name_selected == 'remote_tcp'
-               ){
-                   if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_TCP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-                   else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#TCP_Monitoring',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-              
-                
-            }
-            if(type_name_selected == 'web_data' ||
-             type_name_selected == 'web_proc' ||
-             type_name_selected == 'web_content_data' ||
-             type_name_selected == 'web_content_string'
-               ){
-                   if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_web&printable=yes#Creaci.C3.B3n_de_m.C3.B3dulos_web',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-                   else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Web_Monitoring&printable=yes#Creating_Web_Modules',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-              
-                
-            }
-        }
             
             if (type_name_selected.match(/_string$/) == null) {
                 // Numeric types
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 9f8b8f0162..482b995f8f 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -278,7 +278,7 @@ if ($ag_group > 0) {
     $ag_groups = [];
     $ag_groups = (array) $ag_group;
     if ($recursion) {
-        $ag_groups = groups_get_id_recursive($ag_group, true);
+        $ag_groups = groups_get_children_ids($ag_group, true);
     }
 }
 
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index db1303d907..1a3249a306 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -156,6 +156,14 @@ $agent_max_value = true;
 $agent_min_value = true;
 $uncompressed_module = true;
 
+// Users.
+$id_users = [];
+$users_groups = [];
+$select_by_group = false;
+
+$nothing = __('Local metaconsole');
+$nothing_value = 0;
+
 $graph_render = (empty($config['type_mode_graph']) === true) ? 0 : $config['type_mode_graph'];
 
 switch ($action) {
@@ -223,8 +231,9 @@ switch ($action) {
             $server_name = $item['server_name'];
 
             // Metaconsole db connection.
-            if ($meta && !empty($server_name)) {
+            if ($meta && empty($server_name) === false) {
                 $connection = metaconsole_get_connection($server_name);
+                $server_id = $connection['id'];
                 if (metaconsole_load_external_db($connection) != NOERR) {
                     continue;
                 }
@@ -725,6 +734,8 @@ switch ($action) {
                 case 'group_configuration':
                     $group = $item['id_group'];
                     $recursion = $item['recursion'];
+                    $nothing = '';
+                    $nothing_value = 0;
                 break;
 
                 case 'netflow_area':
@@ -746,6 +757,22 @@ switch ($action) {
                     $top_n_value = $item['top_n_value'];
                 break;
 
+                case 'permissions_report':
+                    $description = $item['description'];
+                    $es = json_decode($item['external_source'], true);
+                    $id_users = array_combine(
+                        array_values($es['id_users']),
+                        array_values($es['id_users'])
+                    );
+
+                    if (isset($id_users[0]) && $id_users[0] == 0) {
+                        $id_users[0] = __('None');
+                    }
+
+                    $users_groups = $es['users_groups'];
+                    $select_by_group = $es['select_by_group'];
+                break;
+
                 default:
                     // It's not possible.
                 break;
@@ -933,8 +960,8 @@ $class = 'databox filters';
                     'combo_server',
                     $server_name,
                     '',
-                    __('Local metaconsole'),
-                    0
+                    $nothing,
+                    $nothing_value
                 );
                 ?>
             </td>
@@ -1040,23 +1067,6 @@ $class = 'databox filters';
             </td>
         </tr>
 
-        <tr id="row_resolution" style="" class="datos">
-            <td style="font-weight:bold;">
-                <?php
-                echo __('Resolution');
-                ?>
-            </td>
-            <td style="">
-                <?php
-                html_print_select(
-                    netflow_resolution_select_params(),
-                    'resolution',
-                    $resolution
-                );
-                ?>
-            </td>
-        </tr>
-
         <tr id="row_period1" style="" class="datos">
             <td style="font-weight:bold;">
                 <?php
@@ -1383,8 +1393,7 @@ $class = 'databox filters';
 
                 html_print_input_hidden('id_agent', $idAgent);
                 html_print_input_hidden('server_name', $server_name);
-                html_print_input_hidden('server_id', $server_name);
-                html_print_input_hidden('id_server', '');
+                html_print_input_hidden('server_id', $server_id);
 
                 $params = [];
                 $params['show_helptip'] = false;
@@ -1896,7 +1905,14 @@ $class = 'databox filters';
         </tr>
 
         <tr id="row_query" style="" class="datos">
-            <td style="font-weight:bold;"><?php echo __('SQL query'); ?></td>
+            <td style="font-weight:bold;">
+            <?php
+            echo __('SQL query').ui_print_help_tip(
+                __('The entities of the fields that contain them must be included.'),
+                true
+            );
+            ?>
+                </td>
             <td style="" id="sql_entry">
                 <?php
                 html_print_textarea('sql', 5, 25, $sql_query_report);
@@ -2846,7 +2862,102 @@ $class = 'databox filters';
             ?>
             </td>
         </tr>
+        
+        <tr id="row_profiles_group" style="" class="datos">
+            <td style="font-weight:bold;">
+                <?php
+                echo __('Group');
+                ?>
+            </td>
+            <td>
+            <?php
+            $user_groups = users_get_groups();
 
+            // Add a selector for users without assigned group.
+            $user_groups[''] = __('Unassigned group');
+
+            html_print_select(
+                $user_groups,
+                'users_groups[]',
+                $users_groups,
+                '',
+                false,
+                '',
+                false,
+                true,
+                false,
+                '',
+                false,
+                'min-width: 180px'
+            );
+            ?>
+                </td>
+        </tr>
+
+        <tr id="row_users" style="" class="datos">
+            <td style="font-weight:bold;">
+                <?php
+                echo __('User');
+                ?>
+            </td>
+            <td style="">
+                <?php
+                $tmp_users = db_get_all_rows_filter('tusuario', [], 'id_user');
+                foreach ($tmp_users as $key => $user) {
+                    $select_users[$user['id_user']] = $user['id_user'];
+                }
+
+                $input_data = [
+                    'type'         => 'select_multiple_filtered',
+                    'class'        => 'w80p mw600px',
+                    'name'         => 'id_users',
+                    'return'       => 0,
+                    'available'    => array_diff(
+                        $select_users,
+                        $id_users
+                    ),
+                    'selected'     => $id_users,
+                    'group_filter' => [
+                        'page'          => 'godmode/users/user_list',
+                        'method'        => 'get_users_by_group',
+                        'nothing'       => __('Unnasigned group'),
+                        'nothing_value' => -1,
+                        'id'            => $id_users,
+                    ],
+                    'texts'        => [
+                        'title-left'  => 'Available users',
+                        'title-right' => 'Selected users',
+                        'filter-item' => 'Filter user name',
+                    ],
+                    'sections'     => [
+                        'filters'               => 1,
+                        'item-selected-filters' => 0,
+                    ],
+                ];
+
+                html_print_input($input_data, 'div', true);
+                ?>
+            </td>
+        </tr>
+
+        <tr id="row_select_by_group" style="" class="datos">
+            <td style="font-weight:bold;">
+                <?php
+                echo __('Select by group');
+                ?>
+            </td>
+            <td>
+                <?php
+                html_print_checkbox_switch(
+                    'select_by_group',
+                    1,
+                    $select_by_group,
+                    false
+                );
+                ?>
+                </td>
+        </tr>
+        
         <tr id="row_landscape" style="" class="datos">
             <td style="font-weight:bold;">
             <?php
@@ -3707,6 +3818,14 @@ echo "<div id='message_no_interval_option'  title='".__('Item Editor Information
 echo "<p style='text-align: center;font-weight: bold;'>".__('Please checked a custom interval option.').'</p>';
 echo '</div>';
 
+echo "<div id='message_no_user'  title='".__('Item Editor Information')."' style='display:none;'>";
+echo "<p style='text-align: center;font-weight: bold;'>".__('Please select a user.').'</p>';
+echo '</div>';
+
+echo "<div id='message_no_group'  title='".__('Item Editor Information')."' style='display:none;'>";
+echo "<p style='text-align: center;font-weight: bold;'>".__('Please select a group.').'</p>';
+echo '</div>';
+
 ui_require_javascript_file(
     'pandora_inventory',
     ENTERPRISE_DIR.'/include/javascript/'
@@ -3744,7 +3863,16 @@ $(document).ready (function () {
 
     $("#combo_group").change (
         function () {
-            $("#id_agents").html('');
+
+            // Alert report group must show all matches when selecting All group
+            // ignoring 'recursion' option. #6497.
+            if ($("#combo_group").val() == 0) {
+                $('#checkbox-recursion').attr('disabled',true)
+                $('#checkbox-recursion').attr('checked','checked')
+            } else {
+                $('#checkbox-recursion').removeAttr('disabled')
+            }
+
             $("#id_agents2").html('');
             $("#module").html('');
             $("#inventory_modules").html('');
@@ -3772,6 +3900,7 @@ $(document).ready (function () {
             );
         }
     );
+    $("#combo_group").change();
 
     $("#checkbox-recursion").change (
         function () {
@@ -3921,6 +4050,20 @@ $(document).ready (function () {
         });
     });
 
+    $("#checkbox-select_by_group").change(function () {
+        var select_by_group  = $('#checkbox-select_by_group').prop('checked');
+    
+    if(select_by_group == true) {
+        $("#row_users").hide(); 
+        $("#row_profiles_group").show(); 
+
+    } else {
+        $("#row_users").show(); 
+        $("#row_profiles_group").hide(); 
+
+    }
+    });
+
     $("#checkbox-fullscale").change(function(e){
         if(e.target.checked === true) {
             $("#graph_render").prop('disabled', 'disabled');
@@ -3984,6 +4127,16 @@ $(document).ready (function () {
                     return false;
                 }
                 break;
+                case 'permissions_report':
+                if ($("#checkbox-select_by_group").prop("checked") && $("select#users_groups>option:selected").val() == undefined) {
+                    dialog_message('#message_no_group');
+                    return false;
+                    }
+                if ($("#checkbox-select_by_group").prop("checked") == false && $("select#selected-select-id_users>option:selected").val() == 0) {
+                    dialog_message('#message_no_user');
+                    return false;
+                    }
+            break;
             default:
                 break;
         }
@@ -4105,6 +4258,18 @@ $(document).ready (function () {
                     return false;
                     }
                     break;
+            
+            case 'permissions_report':
+                if ($("#checkbox-select_by_group").prop("checked") && $("select#users_groups>option:selected").val() == undefined) {
+                    dialog_message('#message_no_group');
+                    return false;
+                    }
+                if ($("#checkbox-select_by_group").prop("checked") == false && $("select#selected-select-id_users>option:selected").val() == 0) {
+                    dialog_message('#message_no_user');
+                    return false;
+                    }
+            break;
+
             default:
                 break;
         }
@@ -4991,6 +5156,10 @@ function chooseType() {
     $("#row_select_fields2").hide();
     $("#row_select_fields3").hide();
     $("#row_uncompressed_module").hide();
+    $("#row_users").hide();
+    $("#row_profiles_group").hide();
+    $("#row_select_by_group").hide();
+
 
     // SLA list default state.
     $("#sla_list").hide();
@@ -5637,6 +5806,7 @@ function chooseType() {
             $("#row_group").show();
             $("#row_servers").show();
             $("#row_historical_db_check").hide();
+            $("#combo_server option[value='0']").remove();
             break;
 
         case 'netflow_area':
@@ -5674,7 +5844,21 @@ function chooseType() {
             $("#row_period").show();
             $("#row_quantity").show();
             break;
+
+        case 'permissions_report':
+            $("#row_description").show();
+            $("#row_users").show();
+            $("#row_profiles_group").show();
+            $("#row_select_by_group").show();
+
+            if($("#checkbox-select_by_group").prop("checked")) {
+                $("#row_users").hide();
+            } else {
+                $("#row_profiles_group").hide(); 
+            }
+            
     }
+
     switch (type) {
         case 'event_report_agent':
         case 'simple_graph':
@@ -5763,4 +5947,5 @@ function dialog_message(message_id) {
       }
     });
 }
+
 </script>
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 8ac3a11e37..15f71c951a 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1380,11 +1380,12 @@ 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);
+                        $server_id = get_parameter('server_id', 0);
+                        if (is_metaconsole() === true
+                            && empty($server_id) === false
+                        ) {
                             $connection = metaconsole_get_connection_by_id(
-                                $id_meta
+                                $server_id
                             );
                             metaconsole_connect($connection);
                             $values['server_name'] = $connection['server_name'];
@@ -1431,10 +1432,7 @@ switch ($action) {
                             'module_description' => $module_description,
                         ];
 
-                        $values['name'] = reporting_label_macro(
-                            $items_label,
-                            $name_it
-                        );
+                        $values['name'] = $name_it;
 
                         $values['landscape'] = get_parameter('landscape');
                         $values['pagebreak'] = get_parameter('pagebreak');
@@ -1811,13 +1809,10 @@ switch ($action) {
                             'combo_modulegroup'
                         );
                         $values['id_group'] = get_parameter('combo_group');
-                        $values['server_name'] = get_parameter('server_name');
 
-                        if ($values['server_name'] == '') {
-                            $values['server_name'] = get_parameter(
-                                'combo_server'
-                            );
-                        }
+                        $values['server_name'] = get_parameter(
+                            'combo_server'
+                        );
 
                         if ((($values['type'] == 'custom_graph')
                             || ($values['type'] == 'automatic_custom_graph'))
@@ -1867,9 +1862,7 @@ switch ($action) {
                         );
 
                         // If metaconsole is activated.
-                        if ($config['metaconsole'] == 1
-                            && defined('METACONSOLE')
-                        ) {
+                        if (is_metaconsole() === true) {
                             if (($values['type'] == 'custom_graph')
                                 || ($values['type'] == 'automatic_custom_graph')
                             ) {
@@ -2058,6 +2051,14 @@ switch ($action) {
                                 }
                             break;
 
+                            case 'permissions_report':
+                                $es['id_users'] = get_parameter('selected-select-id_users', 0);
+                                $es['users_groups'] = get_parameter('users_groups', 0);
+                                $es['select_by_group'] = get_parameter('select_by_group', 0);
+                                $description = get_parameter('description');
+                                $values['external_source'] = json_encode($es);
+                            break;
+
                             default:
                                 // Default.
                             break;
@@ -2138,10 +2139,7 @@ switch ($action) {
                             'module_description' => $module_description,
                         ];
 
-                        $values['name'] = reporting_label_macro(
-                            $items_label,
-                            $name_it
-                        );
+                        $values['name'] = $name_it;
 
                         $values['landscape'] = get_parameter('landscape');
                         $values['pagebreak'] = get_parameter('pagebreak');
@@ -2673,6 +2671,14 @@ switch ($action) {
                                 }
                             break;
 
+                            case 'permissions_report':
+                                $es['id_users'] = get_parameter('selected-select-id_users');
+                                $es['users_groups'] = get_parameter('users_groups', 0);
+                                $es['select_by_group'] = get_parameter('select_by_group', 0);
+                                $description = get_parameter('description');
+                                $values['external_source'] = json_encode($es);
+                            break;
+
                             default:
                                 // Default.
                             break;
diff --git a/pandora_console/godmode/reporting/visual_console_favorite.php b/pandora_console/godmode/reporting/visual_console_favorite.php
index b9f4fe28d7..66b4a21e30 100644
--- a/pandora_console/godmode/reporting/visual_console_favorite.php
+++ b/pandora_console/godmode/reporting/visual_console_favorite.php
@@ -115,7 +115,7 @@ if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'AW')) {
             $return_all_group,
             'ag_group',
             $ag_group,
-            'this.form.submit();',
+            '',
             '',
             0,
             false,
@@ -126,7 +126,7 @@ if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'AW')) {
         );
         echo "</li></ul></li><li class='second_elements'><ul><li>";
         echo __('Group Recursion');
-        html_print_checkbox('recursion', 1, $recursion, false, false, 'this.form.submit()');
+        html_print_checkbox('recursion', 1, $recursion, false, false, '');
         echo '</li><li>';
         echo "<input name='search_visual_console' type='submit' class='sub search' value='".__('Search')."'>";
         echo '</li></ul></li></ul>';
@@ -143,7 +143,7 @@ if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'AW')) {
             $ag_groups = [];
             $ag_groups = (array) $ag_group;
             if ($recursion) {
-                $ag_groups = groups_get_id_recursive($ag_group, true);
+                $ag_groups = groups_get_children_ids($ag_group, true);
             }
         } else if ($own_info['is_admin']) {
             $returnAllGroups = 1;
diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php
index 9062eab0a4..d7332b86b4 100644
--- a/pandora_console/godmode/servers/modificar_server.php
+++ b/pandora_console/godmode/servers/modificar_server.php
@@ -140,7 +140,7 @@ if (isset($_GET['server'])) {
             ui_print_error_message(__('There was a problem deleting the server'));
         }
     } else if (isset($_GET['update'])) {
-        $address = trim(get_parameter_post('address'), '&#x20;');
+        $address = trim(io_safe_output(get_parameter_post('address')), ' ');
         $description = trim(get_parameter_post('description'), '&#x20;');
         $id_server = get_parameter_post('server');
         $exec_proxy = get_parameter_post('exec_proxy');
diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 668ef26f0c..fd6f8d7a02 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -91,8 +91,20 @@ foreach ($servers as $server) {
 
     // Status
     $data[1] = ui_print_status_image(STATUS_SERVER_OK, '', true);
-    if (($server['status'] == 0) || (($date - time_w_fixed_tz($server['keepalive'])) > ($server['server_keepalive']) * 2)) {
-        $data[1] = ui_print_status_image(STATUS_SERVER_DOWN, '', true);
+    if ($server['status'] == -1) {
+        $data[1] = ui_print_status_image(
+            STATUS_SERVER_CRASH,
+            __('Server has crashed.'),
+            true
+        );
+    } else if (($server['status'] == 0)
+        || (($date - time_w_fixed_tz($server['keepalive'])) > ($server['server_keepalive']) * 2)
+    ) {
+        $data[1] = ui_print_status_image(
+            STATUS_SERVER_DOWN,
+            __('Server is stopped.'),
+            true
+        );
     }
 
     // Type
diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php
index 146eae9b79..2b2bb6d13a 100644
--- a/pandora_console/godmode/setup/news.php
+++ b/pandora_console/godmode/setup/news.php
@@ -55,7 +55,11 @@ if (isset($_POST['create'])) {
         'expire_timestamp' => $expire_timestamp,
     ];
 
-    $id_link = db_process_sql_insert('tnews', $values);
+    if ($subject === '') {
+        $id_link = false;
+    } else {
+        $id_link = db_process_sql_insert('tnews', $values);
+    }
 
     ui_print_result_message(
         $id_link,
@@ -92,7 +96,11 @@ if (isset($_POST['update'])) {
         'expire_timestamp' => $expire_timestamp,
     ];
 
-    $result = db_process_sql_update('tnews', $values, ['id_news' => $id_news]);
+    if ($subject === '') {
+        $result = false;
+    } else {
+        $result = db_process_sql_update('tnews', $values, ['id_news' => $id_news]);
+    }
 
     ui_print_result_message(
         $result,
@@ -173,7 +181,7 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
 
     $data = [];
     $data[0] = __('Subject').'<br>';
-    $data[0] .= '<input type="text" name="subject" size="35" value="'.$subject.'">';
+    $data[0] .= '<input type="text" name="subject" size="35" value="'.$subject.'" >';
 
     $data[1] = __('Group').'<br>';
     $data[1] .= '<div class="w250px">';
diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index db436224c3..282d391bc4 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -189,6 +189,10 @@ if (is_ajax()) {
                     100,
                     true
                 );
+                $row['control'] .= ui_print_reveal_password(
+                    'ldap_admin_pass',
+                    true
+                );
                 $table->data['ldap_admin_pass'] = $row;
             break;
 
@@ -217,10 +221,33 @@ if (is_ajax()) {
             'double_auth_enabled',
             1,
             $config['double_auth_enabled'],
-            true
+            true,
+            false,
+            'showAndHide()'
         );
         $table->data['double_auth_enabled'] = $row;
 
+        // Enable 2FA for all users.
+        // Set default value.
+        set_unless_defined($config['2FA_all_users'], false);
+        $row = [];
+        $row['name'] = __('Force 2FA for all users is enabled');
+        $row['control'] .= html_print_checkbox_switch(
+            '2FA_all_users',
+            1,
+            $config['2FA_all_users'],
+            true
+        );
+
+        if (!$config['double_auth_enabled']) {
+            $table->rowclass['2FA_all_users'] = 'invisible';
+        } else {
+            $table->rowclass['2FA_all_users'] = '';
+        }
+
+            $table->data['2FA_all_users'] = $row;
+
+
         // Session timeout.
         // Default session timeout.
         set_when_empty($config['session_timeout'], 90);
@@ -313,6 +340,22 @@ echo '</form>';
 ?>
 
 <script type="text/javascript">
+
+    function showAndHide() {
+        if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
+                $('#table1-2FA_all_users').removeClass('invisible');
+                $('#table1-2FA_all_users-name').removeClass('invisible');
+                $('#table1-2FA_all_users-control').removeClass('invisible');
+                $('#table1-2FA_all_users').show();
+            } else {
+                $('#table1-2FA_all_users').hide();
+        }
+    }
+    $( document ).ready(function() {   
+
+    });
+    //For change autocreate remote users
+
     $('#auth').on('change', function(){
         type_auth = $('#auth').val();
         $.ajax({
diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php
index 1c3650418b..1c522593ee 100644
--- a/pandora_console/godmode/setup/setup_ehorus.php
+++ b/pandora_console/godmode/setup/setup_ehorus.php
@@ -82,6 +82,7 @@ $table_remote->data['ehorus_user'] = $row;
 $row = [];
 $row['name'] = __('Password');
 $row['control'] = html_print_input_password('ehorus_pass', io_output_password($config['ehorus_pass']), '', 30, 100, true);
+$row['control'] .= ui_print_reveal_password('ehorus_pass', true);
 $table_remote->data['ehorus_pass'] = $row;
 
 // Directory hostname.
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index f9160e3864..29334c3271 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -116,7 +116,8 @@ $table->data[$i][0] = __('Phantomjs bin directory');
 $table->data[$i++][1] = html_print_input_text('phantomjs_bin', io_safe_output($config['phantomjs_bin']), '', 30, 100, 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[$i][1] = html_print_input_password('loginhash_pwd', io_output_password($config['loginhash_pwd']), '', 15, 15, true);
+$table->data[$i++][1] .= ui_print_reveal_password('loginhash_pwd', true);
 
 $table->data[$i][0] = __('Time source');
 $sources['system'] = __('System');
@@ -154,7 +155,8 @@ if (isset($_POST['list_ACL_IPs_for_API'])) {
 $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[$i][0] = __('API password');
-$table->data[$i++][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true);
+$table->data[$i][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true);
+$table->data[$i++][1] .= ui_print_reveal_password('api_password', true);
 
 $table->data[$i][0] = __('Enable GIS features');
 $table->data[$i++][1] = html_print_checkbox_switch('activate_gis', 1, $config['activate_gis'], true);
@@ -379,6 +381,7 @@ $table_mail_conf->data[5][1] = html_print_input_text('email_username', $config['
 
 $table_mail_conf->data[6][0] = __('Email password');
 $table_mail_conf->data[6][1] = html_print_input_password('email_password', io_output_password($config['email_password']), '', 30, 100, true);
+$table_mail_conf->data[6][1] .= ui_print_reveal_password('email_password', true);
 
 $uniqid = uniqid();
 
diff --git a/pandora_console/godmode/setup/setup_integria.php b/pandora_console/godmode/setup/setup_integria.php
index e172dda50b..0113c6f024 100644
--- a/pandora_console/godmode/setup/setup_integria.php
+++ b/pandora_console/godmode/setup/setup_integria.php
@@ -221,6 +221,7 @@ $table_remote->data['integria_user'] = $row;
 $row = [];
 $row['name'] = __('Password');
 $row['control'] = html_print_input_password('integria_pass', io_output_password($config['integria_pass']), '', 30, 100, true);
+$row['control'] .= ui_print_reveal_password('integria_pass', true);
 $table_remote->data['integria_pass'] = $row;
 
 // Integria hostname.
@@ -233,6 +234,7 @@ $table_remote->data['integria_hostname'] = $row;
 $row = [];
 $row['name'] = __('API Password');
 $row['control'] = html_print_input_password('integria_api_pass', io_output_password($config['integria_api_pass']), '', 30, 100, true);
+$row['control'] .= ui_print_reveal_password('integria_api_pass', true);
 $table_remote->data['integria_api_pass'] = $row;
 
 // Request timeout.
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 8c07381452..d1230f8c35 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1482,7 +1482,7 @@ $row++;
         '.' => '.',
         ',' => ',',
     ];
-    $table_other->data[$row][0] = __('CSV decimal separator').ui_print_help_tip(__('Only for csv reports'), true);
+    $table_other->data[$row][0] = __('CSV decimal separator');
     $table_other->data[$row][1] = html_print_select($decimal_separator, 'csv_decimal_separator', $config['csv_decimal_separator'], '', '', '', true, false, false);
 
     $row++;
diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php
index ee6ad32a26..68e9ebb2e6 100755
--- a/pandora_console/godmode/snmpconsole/snmp_alert.php
+++ b/pandora_console/godmode/snmpconsole/snmp_alert.php
@@ -1,16 +1,17 @@
 <?php
-
-// 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 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-2020 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
 if (! check_acl($config['id_user'], 0, 'LW')) {
     db_pandora_audit(
@@ -61,6 +62,11 @@ if ($add_action) {
     $values[db_escape_key_identifier('al_field13')] = get_parameter('field13_value');
     $values[db_escape_key_identifier('al_field14')] = get_parameter('field14_value');
     $values[db_escape_key_identifier('al_field15')] = get_parameter('field15_value');
+    $values[db_escape_key_identifier('al_field16')] = get_parameter('field16_value');
+    $values[db_escape_key_identifier('al_field17')] = get_parameter('field17_value');
+    $values[db_escape_key_identifier('al_field18')] = get_parameter('field18_value');
+    $values[db_escape_key_identifier('al_field19')] = get_parameter('field19_value');
+    $values[db_escape_key_identifier('al_field20')] = get_parameter('field20_value');
 
     $result = db_process_sql_insert('talert_snmp_action', $values);
 }
@@ -123,6 +129,11 @@ if ($save_alert || $modify_alert) {
     $al_field13 = (string) get_parameter_post('field13_value');
     $al_field14 = (string) get_parameter_post('field14_value');
     $al_field15 = (string) get_parameter_post('field15_value');
+    $al_field16 = (string) get_parameter_post('field16_value');
+    $al_field17 = (string) get_parameter_post('field17_value');
+    $al_field18 = (string) get_parameter_post('field18_value');
+    $al_field19 = (string) get_parameter_post('field19_value');
+    $al_field20 = (string) get_parameter_post('field20_value');
     $max_alerts = (int) get_parameter_post('max_alerts', 1);
     $min_alerts = (int) get_parameter_post('min_alerts', 0);
     $priority = (int) get_parameter_post('priority', 0);
@@ -195,6 +206,11 @@ if ($save_alert || $modify_alert) {
             'al_field13'                           => $al_field13,
             'al_field14'                           => $al_field14,
             'al_field15'                           => $al_field15,
+            'al_field16'                           => $al_field16,
+            'al_field17'                           => $al_field17,
+            'al_field18'                           => $al_field18,
+            'al_field19'                           => $al_field19,
+            'al_field20'                           => $al_field20,
             'description'                          => $description,
             'agent'                                => $source_ip,
             'custom_oid'                           => $custom_value,
@@ -267,7 +283,9 @@ if ($save_alert || $modify_alert) {
 			al_field5 = '%s', al_field6 = '%s',al_field7 = '%s',
 			al_field8 = '%s', al_field9 = '%s',al_field10 = '%s',
 			al_field11 = '%s', al_field12 = '%s', al_field13 = '%s',
-			al_field14 = '%s', al_field15 = '%s',
+			al_field14 = '%s', al_field15 = '%s', al_field16 = '%s',
+            al_field17 = '%s', al_field18 = '%s', al_field19 = '%s',
+            al_field20 = '%s',
 			description = '%s',
 			agent = '%s', custom_oid = '%s', oid = '%s',
 			time_threshold = %d, max_alerts = %d, min_alerts = %d,
@@ -318,6 +336,11 @@ if ($save_alert || $modify_alert) {
             $al_field13,
             $al_field14,
             $al_field15,
+            $al_field16,
+            $al_field17,
+            $al_field18,
+            $al_field19,
+            $al_field20,
             $description,
             $source_ip,
             $custom_value,
@@ -417,6 +440,11 @@ if ($update_alert || $duplicate_alert) {
     $al_field13 = $alert['al_field13'];
     $al_field14 = $alert['al_field14'];
     $al_field15 = $alert['al_field15'];
+    $al_field16 = $alert['al_field16'];
+    $al_field17 = $alert['al_field17'];
+    $al_field18 = $alert['al_field18'];
+    $al_field19 = $alert['al_field19'];
+    $al_field20 = $alert['al_field20'];
     $max_alerts = $alert['max_alerts'];
     $min_alerts = $alert['min_alerts'];
     $priority = $alert['priority'];
@@ -490,6 +518,11 @@ if ($update_alert || $duplicate_alert) {
     $al_field13 = '';
     $al_field14 = '';
     $al_field15 = '';
+    $al_field16 = '';
+    $al_field17 = '';
+    $al_field18 = '';
+    $al_field19 = '';
+    $al_field20 = '';
     $max_alerts = 1;
     $min_alerts = 0;
     $priority = 0;
@@ -547,10 +580,11 @@ if ($duplicate_alert) {
 		id_alert, al_field1, al_field2, al_field3, 
 		al_field4, al_field5, al_field6, al_field7,
 		al_field8, al_field9, al_field10, al_field11, 
-		al_field12, al_field13, al_field14, al_field15,
-		description, alert_type, agent, custom_oid, oid, time_threshold,
-		times_fired, last_fired, max_alerts, min_alerts,
-		internal_counter, priority,
+        al_field12, al_field13, al_field14, al_field15,
+        al_field16, al_field17, al_field18, al_field19,
+        al_field20, description, alert_type, agent, custom_oid,
+        oid, time_threshold, times_fired, last_fired,
+        max_alerts, min_alerts, internal_counter, priority,
 		'.db_escape_key_identifier('_snmp_f1_').',
 		'.db_escape_key_identifier('_snmp_f2_').',
 		'.db_escape_key_identifier('_snmp_f3_').',
@@ -597,6 +631,11 @@ if ($duplicate_alert) {
         $al_field13,
         $al_field14,
         $al_field15,
+        $al_field16,
+        $al_field17,
+        $al_field18,
+        $al_field19,
+        $al_field20,
         $description,
         $alert_type,
         $source_ip,
@@ -998,6 +1037,11 @@ if ($create_alert || $update_alert) {
         'al_field13' => $al_field13,
         'al_field14' => $al_field14,
         'al_field15' => $al_field15,
+        'al_field16' => $al_field16,
+        'al_field17' => $al_field17,
+        'al_field18' => $al_field18,
+        'al_field19' => $al_field19,
+        'al_field20' => $al_field20,
     ];
 
     // Hidden div with help hint to fill with javascript
@@ -1421,6 +1465,11 @@ if ($create_alert || $update_alert) {
                     'al_field13' => $al_field13,
                     'al_field14' => $al_field14,
                     'al_field15' => $al_field15,
+                    'al_field16' => $al_field16,
+                    'al_field17' => $al_field17,
+                    'al_field18' => $al_field18,
+                    'al_field19' => $al_field19,
+                    'al_field20' => $al_field20,
                 ];
 
                 for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php
index 8fb4447772..2461ec6980 100644
--- a/pandora_console/godmode/update_manager/update_manager.offline.php
+++ b/pandora_console/godmode/update_manager/update_manager.offline.php
@@ -44,6 +44,16 @@ if (! check_acl($config['id_user'], 0, 'PM')
     return;
 }
 
+require_once $config['homedir'].'/include/functions_update_manager.php';
+
+
+if (update_manager_verify_license_expired()) {
+    ui_print_error_message(
+        __('The license has expired. Please contact Artica at info@artica.es')
+    );
+    return;
+}
+
 $baseurl = ui_get_full_url(false, false, false, false);
 
 $current_package = db_get_value(
diff --git a/pandora_console/godmode/update_manager/update_manager.online.php b/pandora_console/godmode/update_manager/update_manager.online.php
index a1524d5518..6ac5c61f9b 100644
--- a/pandora_console/godmode/update_manager/update_manager.online.php
+++ b/pandora_console/godmode/update_manager/update_manager.online.php
@@ -94,6 +94,13 @@ if ($upload_max_filesize < $PHPupload_max_filesize_min) {
     $php_settings_fine++;
 }
 
+if (update_manager_verify_license_expired()) {
+    ui_print_error_message(
+        __('The license has expired. Please contact Artica at info@artica.es')
+    );
+    return;
+}
+
 // Verify registry.
 if (update_manager_verify_registration() === false) {
     ui_require_css_file('register');
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index b98d35e003..f9618b64a1 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -196,6 +196,8 @@ if (is_ajax()) {
     }
 }
 
+
+
 $tab = get_parameter('tab', 'user');
 
 if ($id) {
@@ -1128,6 +1130,28 @@ if ($config['ehorus_user_level_conf']) {
     $ehorus .= '</div>';
 }
 
+$double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $id);
+
+if ($config['double_auth_enabled'] && check_acl($config['id_user'], 0, 'PM')) {
+    $double_authentication = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Double authentication').'</p>';
+    if (($config['2FA_all_users'] == '' && !$double_auth_enabled)
+        || ($config['double_auth_enabled'] == '' && $double_auth_enabled)
+        || check_acl($config['id_user'], 0, 'PM')
+    ) {
+        $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true);
+    }
+
+    // Dialog.
+    $double_authentication .= '<div id="dialog-double_auth" style="display:none"><div id="dialog-double_auth-container"></div></div>';
+}
+
+if ($double_auth_enabled && $config['double_auth_enabled'] && $config['2FA_all_users'] != '') {
+    $double_authentication .= html_print_button(__('Show information'), 'show_info', false, 'javascript:show_double_auth_info();', '', true);
+}
+
+if (isset($double_authentication)) {
+    $double_authentication .= '</div>';
+}
 
 if ($meta) {
     enterprise_include_once('include/functions_metaconsole.php');
@@ -1179,7 +1203,7 @@ echo '<div id="user_form">
     <div class="edit_user_autorefresh white_box"><p style="font-weight:bold;">Extra info</p>'.$email.$phone.$not_login.$session_time.'</div>
 </div> 
 <div class="user_edit_second_row white_box">
-    <div class="edit_user_options">'.$language.$access_or_pagination.$skin.$home_screen.$default_event_filter.$newsletter.'</div>
+    <div class="edit_user_options">'.$language.$access_or_pagination.$skin.$home_screen.$default_event_filter.$newsletter.$double_authentication.'</div>
 
     <div class="edit_user_timezone">'.$timezone;
 if (!is_metaconsole()) {
@@ -1278,6 +1302,15 @@ if (!is_metaconsole()) {
 var json_profile = $('#hidden-json_profile');
 /* <![CDATA[ */
 $(document).ready (function () {
+    $("input#checkbox-double_auth").change(function (e) {
+        e.preventDefault();
+            if (this.checked) {
+                show_double_auth_activation();
+            } else {
+                show_double_auth_deactivation();
+            }
+    }); 
+
     $('input:radio[name="is_admin"]').change(function() {
         if($('#radiobtn0002').prop('checked')) {     
             $('#metaconsole_agents_manager_div').show();
@@ -1313,6 +1346,7 @@ $(document).ready (function () {
 
     var img_delete = '<?php echo $delete_image; ?>';
     var id_user = '<?php echo io_safe_output($id); ?>';
+    var is_metaconsole = '<?php echo $meta; ?>';
     var data = [];
 
     $('input:image[name="add"]').click(function (e) {
@@ -1357,7 +1391,7 @@ $(document).ready (function () {
     $('input:image[name="del"]').click(function (e) {
         e.preventDefault();
         var rows = $("#table_profiles tr").length;
-        if (rows <= 3) {
+        if ((is_metaconsole === '1' && rows <= 4) || (is_metaconsole === '' && rows <= 3)) {
             if (!confirm('<?php echo __('Deleting last profile will delete this user'); ?>' + '. ' + '<?php echo __('Are you sure?'); ?>')) {
                 return;
             }
@@ -1379,21 +1413,39 @@ $(document).ready (function () {
             success: function (data) {
                 row.remove();
                 var rows = $("#table_profiles tr").length;
-                if (rows <= 2) {
+                if ((is_metaconsole === '1' && rows <= 3) || (is_metaconsole === '' && rows <= 2)) {
                     window.location.replace("<?php echo ui_get_full_url('index.php?sec=gusuarios&sec2=godmode/users/user_list&tab=user&pure=0', false, false, false); ?>");
                 }
             }
         });
     });
 
-    $('#submit-crtbutton').click(function (e) {
+    function checkProfiles(e) {
         e.preventDefault();
-        var rows = $("#table_profiles tr").length;
-        if (rows <= 2) {
-            alert('<?php echo __('please add a profile'); ?>');
+        if ($('input[name="is_admin"]:checked').val() == 1) {
+            // Admin does not require profiles.
+            $('#user_profile_form').submit();
         } else {
-            this.form.submit();
+            if ($('#table_profiles tbody').children().length == 1) {
+                confirmDialog({
+                    title: "<?php echo __('Warning'); ?>",
+                    message: "<?php echo __('User will be created without profiles assigned and won\'t be able to log in, are you sure?'); ?>",
+                    onAccept: function() {
+                        $('#user_profile_form').submit();
+                    }
+                });
+            } else {
+                $('#user_profile_form').submit();
+            }
         }
+    }
+
+    $('#submit-crtbutton').click(function (e) {
+        checkProfiles(e);
+    });
+
+    $('#submit-uptbutton').click(function (e) {
+        checkProfiles(e);
     });
 });
 
@@ -1476,5 +1528,216 @@ function switch_ehorus_conf()
 
 }
 
+function show_double_auth_info () {
+    var userID = '<?php echo io_safe_output($id); ?>';
+
+    var $loadingSpinner = $("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
+    var $dialogContainer = $("div#dialog-double_auth-container");
+
+    $dialogContainer.html($loadingSpinner);
+console.log(userID);
+    // Load the info page
+    var request = $.ajax({
+        url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+        type: 'POST',
+        dataType: 'html',
+        data: {
+            page: 'include/ajax/double_auth.ajax',
+            id_user: userID,
+            get_double_auth_data_page: 1,
+            FA_forced: 1,
+            containerID: $dialogContainer.prop('id')
+        },
+        complete: function(xhr, textStatus) {
+            
+        },
+        success: function(data, textStatus, xhr) {
+            // isNaN = is not a number
+            if (isNaN(data)) {
+                $dialogContainer.html(data);
+            }
+            // data is a number, convert it to integer to do the compare
+            else if (Number(data) === -1) {
+                $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Authentication error').'</div></b>'; ?>");
+            }
+            else {
+                $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Error').'</div></b>'; ?>");
+            }
+        },
+        error: function(xhr, textStatus, errorThrown) {
+            $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error loading the data').'</div></b>'; ?>");
+        }
+    });
+
+    $("div#dialog-double_auth")
+        .css('display','block')
+        .append($dialogContainer)
+        .dialog({
+            resizable: true,
+            draggable: true,
+            modal: true,
+            title: "<?php echo __('Double autentication information'); ?>",
+            overlay: {
+                opacity: 0.5,
+                background: "black"
+            },
+            width: 400,
+            height: 375,
+            close: function(event, ui) {
+                // Abort the ajax request
+                if (typeof request != 'undefined')
+                    request.abort();
+                // Remove the contained html
+                $dialogContainer.empty();
+            }
+        })
+        .show();
+
+}
+
+function show_double_auth_activation () {
+    var userID = '<?php echo io_safe_output($id); ?>';
+
+    var $loadingSpinner = $("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
+    var $dialogContainer = $("div#dialog-double_auth-container");
+
+    $dialogContainer.html($loadingSpinner);
+
+    // Load the info page
+    var request = $.ajax({
+        url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+        type: 'POST',
+        dataType: 'html',
+        data: {
+            page: 'include/ajax/double_auth.ajax',
+            id_user: userID,
+            FA_forced: 1,
+            get_double_auth_info_page: 1,
+            containerID: $dialogContainer.prop('id')
+        },
+        complete: function(xhr, textStatus) {
+            
+        },
+        success: function(data, textStatus, xhr) {
+            // isNaN = is not a number
+            if (isNaN(data)) {
+                $dialogContainer.html(data);
+            }
+            // data is a number, convert it to integer to do the compare
+            else if (Number(data) === -1) {
+                $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Authentication error').'</div></b>'; ?>");
+            }
+            else {
+                $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Error').'</div></b>'; ?>");
+            }
+        },
+        error: function(xhr, textStatus, errorThrown) {
+            $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error loading the data').'</div></b>'; ?>");
+        }
+    });
+
+    $("div#dialog-double_auth").dialog({
+            resizable: true,
+            draggable: true,
+            modal: true,
+            title: "<?php echo __('Double autentication activation'); ?>",
+            overlay: {
+                opacity: 0.5,
+                background: "black"
+            },
+            width: 500,
+            height: 400,
+            close: function(event, ui) {
+                // Abort the ajax request
+                if (typeof request != 'undefined')
+                    request.abort();
+                // Remove the contained html
+                $dialogContainer.empty();
+
+                document.location.reload();
+            }
+        })
+        .show();
+}
+
+function show_double_auth_deactivation () {
+    var userID = '<?php echo io_safe_output($id); ?>';
+    console.log(userID);
+    var $loadingSpinner = $("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
+    var $dialogContainer = $("div#dialog-double_auth-container");
+
+    var message = "<p><?php echo __('Are you sure?').'<br>'.__('The double authentication will be deactivated'); ?></p>";
+    var $button = $("<input type=\"button\" value=\"<?php echo __('Deactivate'); ?>\" />");
+
+    $dialogContainer
+        .empty()
+        .append(message)
+        .append($button);
+
+    var request;
+
+    $button.click(function(e) {
+        e.preventDefault();
+
+        $dialogContainer.html($loadingSpinner);
+
+        // Deactivate the double auth
+        request = $.ajax({
+            url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+            type: 'POST',
+            dataType: 'json',
+            data: {
+                page: 'include/ajax/double_auth.ajax',
+                id_user: userID,
+                FA_forced: 1,
+                deactivate_double_auth: 1
+            },
+            complete: function(xhr, textStatus) {
+                
+            },
+            success: function(data, textStatus, xhr) {
+                console.log(data);
+                if (data === -1) {
+                    $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Authentication error').'</div></b>'; ?>");
+                }
+                else if (data) {
+                    $dialogContainer.html("<?php echo '<b><div class=\"green\">'.__('The double autentication was deactivated successfully').'</div></b>'; ?>");
+                }
+                else {
+                    $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error deactivating the double autentication').'</div></b>'; ?>");
+                }
+            },
+            error: function(xhr, textStatus, errorThrown) {
+                $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error deactivating the double autentication').'</div></b>'; ?>");
+            }
+        });
+    });
+    
+
+    $("div#dialog-double_auth").dialog({
+            resizable: true,
+            draggable: true,
+            modal: true,
+            title: "<?php echo __('Double autentication activation'); ?>",
+            overlay: {
+                opacity: 0.5,
+                background: "black"
+            },
+            width: 300,
+            height: 150,
+            close: function(event, ui) {
+                // Abort the ajax request
+                if (typeof request != 'undefined')
+                    request.abort();
+                // Remove the contained html
+                $dialogContainer.empty();
+
+                document.location.reload();
+            }
+        })
+        .show();
+}
+
+
 /* ]]> */
 </script>
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 783c22c8af..77ca07acce 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -33,6 +33,53 @@ if (! check_acl($config['id_user'], 0, 'UM')) {
     exit;
 }
 
+if (is_ajax()) {
+    $method = get_parameter('method');
+    $group_id = get_parameter('group_id');
+    $group_recursion = (bool) get_parameter('group_recursion', 0);
+    $return_all = false;
+
+    if ($group_id == -1) {
+        $sql = 'SELECT tusuario.id_user FROM tusuario 
+                        LEFT OUTER JOIN tusuario_perfil
+                        ON tusuario.id_user = tusuario_perfil.id_usuario
+                        WHERE tusuario_perfil.id_usuario IS NULL';
+
+        $users = io_safe_output(db_get_all_rows_sql($sql));
+
+        foreach ($users as $key => $user) {
+            $ret_user[$user['id_user']] = $user['id_user'];
+        }
+
+        echo json_encode($ret_user);
+        return;
+    }
+
+    if ($group_id == 0) {
+        $users = io_safe_output(db_get_all_rows_filter('tusuario', [], 'id_user'));
+        foreach ($users as $key => $user) {
+            $ret_user[$user['id_user']] = $user['id_user'];
+        }
+
+        echo json_encode($ret_user);
+        return;
+    }
+
+    if ($method === 'get_users_by_group') {
+        if ($group_recursion === true) {
+            $group_id = groups_get_children_ids($group_id);
+        }
+
+        $users_id = io_safe_output(users_get_user_users(false, 'AR', false, null, $group_id));
+        foreach ($users_id as $key => $user_id) {
+            $ret_id[$user_id] = $user_id;
+        }
+
+        echo json_encode($ret_id);
+        return;
+    }
+}
+
 $sortField = get_parameter('sort_field');
 $sort = get_parameter('sort', 'none');
 $tab = get_parameter('tab', 'user');
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 59a9fab84a..a3a2b15c8a 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -176,7 +176,7 @@ class DiscoveryTaskList extends HTML
                             'type'       => 'button',
                             'attributes' => 'class="sub upd"',
                             'return'     => true,
-                            'script'     => 'location.reload();',
+                            'script'     => 'location.href = \''.$this->url.'\';',
                         ],
                     ],
                 ],
@@ -402,8 +402,10 @@ class DiscoveryTaskList extends HTML
                 $table->headstyle[$i] = 'text-align: left;';
             }
 
+            // Task name.
+            $table->headstyle[1] .= 'min-width: 150px; width: 300px;';
             // Name.
-            $table->headstyle[4] .= 'min-width: 100px; width: 600px;';
+            $table->headstyle[4] .= 'min-width: 100px; width: 400px;';
             // Status.
             $table->headstyle[5] .= 'min-width: 50px; width: 100px;';
             // Task type.
diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php
index 2a15affd94..7abfe15d5d 100755
--- a/pandora_console/godmode/wizards/HostDevices.class.php
+++ b/pandora_console/godmode/wizards/HostDevices.class.php
@@ -336,6 +336,12 @@ class HostDevices extends Wizard
                             )
                         )
                     );
+
+                    // Forbidden chars cleaning.
+                    foreach ($network as $key => $singleNetwork) {
+                        $network[$key] = preg_replace('/[-()\']/', '', $singleNetwork);
+                    }
+
                     unlink($_FILES['network_csv']['tmp_name']);
                     if (empty($network) || is_array($network) === false) {
                         $this->msg = __(
@@ -1170,6 +1176,380 @@ class HostDevices extends Wizard
                 ];
             }
 
+            // Input: SNMP enabled.
+            $form['inputs'][] = [
+                'label'     => __('SNMP enabled'),
+                'arguments' => [
+                    'name'    => 'snmp_enabled',
+                    'type'    => 'switch',
+                    'return'  => true,
+                    'value'   => (isset($this->task['snmp_enabled'])) ? $this->task['snmp_enabled'] : 1,
+                    'onclick' => 'extraSNMP();',
+
+                ],
+            ];
+
+            // SNMP CONFIGURATION.
+            $form['inputs'][] = [
+                'hidden'        => 1,
+                'block_id'      => 'snmp_extra',
+                'class'         => 'indented',
+                'block_content' => [
+                    [
+                        'label'     => __('SNMP version'),
+                        'arguments' => [
+                            'name'     => 'snmp_version',
+                            'fields'   => [
+                                '1'  => 'v. 1',
+                                '2c' => 'v. 2c',
+                                '3'  => 'v. 3',
+                            ],
+                            'type'     => 'select',
+                            'script'   => 'SNMPExtraShow(this.value)',
+                            'selected' => $this->task['snmp_version'],
+                            'return'   => true,
+                        ],
+                    ],
+                ],
+            ];
+
+            // SNMP Options pack v1.
+            $form['inputs'][] = [
+                'hidden'        => 1,
+                'block_id'      => 'snmp_options_basic',
+                'class'         => 'indented',
+                'block_content' => [
+                    [
+                        'label'     => __('SNMP communities to try with').ui_print_help_tip(
+                            __(
+                                'You can specify several values, separated by commas, for example: public,mysecret,1234'
+                            ),
+                            true
+                        ),
+                        'arguments' => [
+                            'name'   => 'community',
+                            'type'   => 'text',
+                            'value'  => $this->task['snmp_community'],
+                            'size'   => 25,
+                            'return' => true,
+
+                        ],
+                    ],
+                ],
+            ];
+
+            // SNMP Options pack v3.
+            $form['inputs'][] = [
+                'hidden'        => 1,
+                'block_id'      => 'snmp_options_v3',
+                'class'         => 'indented',
+                'block_content' => [
+                    [
+                        'label'     => '<b>'.__('Context').'</b>',
+                        'arguments' => [
+                            'name'   => 'snmp_context',
+                            'type'   => 'text',
+                            'value'  => $this->task['snmp_community'],
+                            'size'   => 15,
+                            'return' => true,
+
+                        ],
+                    ],
+                    [
+                        'label'     => '<b>'.__('Auth user').'</b>',
+                        'arguments' => [
+                            'name'   => 'snmp_auth_user',
+                            'type'   => 'text',
+                            'value'  => $this->task['snmp_auth_user'],
+                            'size'   => 15,
+                            'return' => true,
+
+                        ],
+                    ],
+                    [
+                        'label'     => '<b>'.__('Auth password').'</b>'.ui_print_help_tip(
+                            __(
+                                'The pass length must be eight character minimum.'
+                            ),
+                            true
+                        ),
+                        'arguments' => [
+                            'name'   => 'snmp_auth_pass',
+                            'type'   => 'password',
+                            'value'  => $this->task['snmp_auth_pass'],
+                            'size'   => 15,
+                            'return' => true,
+
+                        ],
+                    ],
+                    [
+                        'label'     => '<b>'.__('Privacy method').'</b>',
+                        'arguments' => [
+                            'name'     => 'snmp_privacy_method',
+                            'type'     => 'select',
+                            'fields'   => [
+                                'DES' => __('DES'),
+                                'AES' => __('AES'),
+                            ],
+                            'selected' => $this->task['snmp_privacy_method'],
+                            'size'     => 15,
+                            'return'   => true,
+
+                        ],
+                    ],
+                    [
+                        'label'     => '<b>'.__('Privacy pass').'</b>'.ui_print_help_tip(
+                            __(
+                                'The pass length must be eight character minimum.'
+                            ),
+                            true
+                        ),
+                        'arguments' => [
+                            'name'   => 'snmp_privacy_pass',
+                            'type'   => 'password',
+                            'value'  => $this->task['snmp_privacy_pass'],
+                            'size'   => 15,
+                            'return' => true,
+
+                        ],
+                    ],
+                    [
+                        'label'     => '<b>'.__('Auth method').'</b>',
+                        'arguments' => [
+                            'name'     => 'snmp_auth_method',
+                            'type'     => 'select',
+                            'fields'   => [
+                                'MD5' => __('MD5'),
+                                'SHA' => __('SHA'),
+                            ],
+                            'selected' => $this->task['snmp_auth_method'],
+                            'size'     => 15,
+                            'return'   => true,
+
+                        ],
+                    ],
+                    [
+                        'label'     => '<b>'.__('Security level').'</b>',
+                        'arguments' => [
+                            'name'     => 'snmp_security_level',
+                            'type'     => 'select',
+                            'fields'   => [
+                                'noAuthNoPriv' => __('Not auth and not privacy method'),
+                                'authNoPriv'   => __('Auth and not privacy method'),
+                                'authPriv'     => __('Auth and privacy method'),
+                            ],
+                            'selected' => $this->task['snmp_security_level'],
+                            'size'     => 15,
+                            'return'   => true,
+
+                        ],
+                    ],
+
+                ],
+            ];
+
+            // Input: Enforce os detection.
+            $form['inputs'][] = [
+                'label'     => __('OS detection'),
+                'arguments' => [
+                    'name'   => 'os_detect',
+                    'type'   => 'switch',
+                    'return' => true,
+                    'value'  => (isset($this->task['os_detect'])) ? $this->task['os_detect'] : 1,
+
+                ],
+            ];
+
+            // Input: Name resolution.
+            $form['inputs'][] = [
+                'label'     => __('Name resolution'),
+                'arguments' => [
+                    'name'   => 'resolve_names',
+                    'type'   => 'switch',
+                    'return' => true,
+                    'value'  => (isset($this->task['resolve_names'])) ? $this->task['resolve_names'] : 1,
+                ],
+            ];
+
+            // Input: Parent detection.
+            $form['inputs'][] = [
+                'label'     => __('Parent detection'),
+                'arguments' => [
+                    'name'   => 'parent_detection',
+                    'type'   => 'switch',
+                    'return' => true,
+                    'value'  => (isset($this->task['parent_detection'])) ? $this->task['parent_detection'] : 1,
+                ],
+            ];
+
+            // Input: Parent recursion.
+            $form['inputs'][] = [
+                'label'     => __('Parent recursion'),
+                'arguments' => [
+                    'name'   => 'parent_recursion',
+                    'type'   => 'switch',
+                    'return' => true,
+                    'value'  => (isset($this->task['parent_recursion'])) ? $this->task['parent_recursion'] : 1,
+                ],
+            ];
+
+            // Input: VLAN enabled.
+            $form['inputs'][] = [
+                'label'     => __('VLAN enabled'),
+                'arguments' => [
+                    'name'   => 'vlan_enabled',
+                    'type'   => 'switch',
+                    'return' => true,
+                    'value'  => (isset($this->task['vlan_enabled'])) ? $this->task['vlan_enabled'] : 1,
+                ],
+            ];
+
+            // Input: WMI enabled.
+            $form['inputs'][] = [
+                'label'     => __('WMI enabled'),
+                'arguments' => [
+                    'name'    => 'wmi_enabled',
+                    'type'    => 'switch',
+                    'value'   => (isset($this->task['wmi_enabled'])) ? $this->task['wmi_enabled'] : 0,
+                    'return'  => true,
+                    'onclick' => 'toggleAuth();',
+
+                ],
+            ];
+
+             // AUTH CONFIGURATION.
+            $show_auth = false;
+            if ((isset($this->task['wmi_enabled']) && $this->task['wmi_enabled'] > 0)
+                || (isset($this->task['rcmd_enabled']) && $this->task['rcmd_enabled'] > 0)
+            ) {
+                $show_auth = true;
+            }
+
+            include_once $config['homedir'].'/include/class/CredentialStore.class.php';
+            $available_keys = CredentialStore::getKeys('CUSTOM');
+            if (check_acl($config['id_user'], 0, 'PM')) {
+                $link_to_cs = '<a class="ext_link" href="'.ui_get_full_url(
+                    'index.php?sec=gagente&sec2=godmode/groups/group_list&tab=credbox'
+                ).'" >';
+                $link_to_cs .= __('No credentials available').', ';
+                $link_to_cs .= strtolower(__('Manage credentials')).'</a>';
+            } else {
+                $link_to_cs = __('No credentials available');
+            }
+
+            if (count($available_keys) > 0) {
+                $form['inputs'][] = [
+                    'block_id'      => 'auth_block',
+                    'class'         => 'indented',
+                    'hidden'        => !$show_auth,
+                    'block_content' => [
+                        [
+                            'label'     => __('Credentials to try with'),
+                            'arguments' => [
+                                'type'     => 'select',
+                                'name'     => 'auth_strings[]',
+                                'fields'   => CredentialStore::getKeys('CUSTOM'),
+                                'selected' => explode(
+                                    ',',
+                                    $this->task['auth_strings']
+                                ),
+
+                                'multiple' => true,
+                                'class'    => 'select_multiple',
+                            ],
+                        ],
+                    ],
+                ];
+            } else {
+                $form['inputs'][] = [
+                    'block_id'      => 'auth_block',
+                    'class'         => 'indented',
+                    'hidden'        => !$show_auth,
+                    'block_content' => [
+                        [
+                            'label' => __('Credentials'),
+                            'extra' => $link_to_cs,
+                        ],
+                    ],
+                ];
+            }
+
+            ui_require_jquery_file('tag-editor.min');
+            ui_require_jquery_file('caret.min');
+            ui_require_css_file('jquery.tag-editor');
+
+            $form['js'] = '
+                $(\'#text-community\').tagEditor({
+                    forceLowercase: false
+                });
+
+                function SNMPExtraShow(target) {
+                    $("#snmp_options_basic").hide();
+                    $("#snmp_options_v3").hide();
+                    if (document.getElementsByName("snmp_enabled")[0].checked) {
+                        $("#snmp_extra").show();
+                        if (target == 3) {
+                            $("#snmp_options_v3").show();
+                        } else {
+                            $("#snmp_options_basic").show();
+                        }
+                    }
+                }
+
+                function extraSNMP() {
+                    if (document.getElementsByName("snmp_enabled")[0].checked) {
+                        SNMPExtraShow($("#snmp_version").val());
+                        $("#snmp_extra").show();
+
+                        // Enable snmp dependant checks
+                        if (!document.getElementsByName("parent_recursion")[0].checked)
+                            $("input[name=parent_recursion]").click();
+
+                        if (!document.getElementsByName("parent_detection")[0].checked)
+                            $("input[name=parent_detection]").click();
+
+                        if (!document.getElementsByName("resolve_names")[0].checked)
+                            $("input[name=resolve_names]").click();
+
+                        if (!document.getElementsByName("vlan_enabled")[0].checked)
+                            $("input[name=vlan_enabled]").click();
+                    } else {
+                        // Hide unusable sections
+                        $("#snmp_extra").hide();
+                        $("#snmp_options_basic").hide();
+                        $("#snmp_options_v3").hide();
+
+                        // Disable snmp dependant checks
+                        if (document.getElementsByName("parent_recursion")[0].checked)
+                            $("input[name=parent_recursion]").click();
+
+                        if (document.getElementsByName("parent_detection")[0].checked)
+                            $("input[name=parent_detection]").click();
+
+                        if (document.getElementsByName("resolve_names")[0].checked)
+                            $("input[name=resolve_names]").click();
+
+                        if (document.getElementsByName("vlan_enabled")[0].checked)
+                            $("input[name=vlan_enabled]").click();
+                    }
+                }
+
+                function toggleAuth() {
+                    if (document.getElementsByName("wmi_enabled")[0].checked
+                        || (typeof document.getElementsByName("rcmd_enabled")[0] != "undefined"
+                            && document.getElementsByName("rcmd_enabled")[0].checked)
+                    ) {
+                        $("#auth_block").show();
+                    } else {
+                        $("#auth_block").hide();
+                    }
+                }
+
+                $(function() {
+                    SNMPExtraShow($("#snmp_version").val());
+                });
+            ';
+
             if (enterprise_installed()) {
                 // Feature configuration.
                 $extra = enterprise_hook('hd_showextrainputs', [$this]);
@@ -1178,7 +1558,7 @@ class HostDevices extends Wizard
                         $form['inputs'],
                         $extra['inputs']
                     );
-                    $form['js'] = $extra['js'];
+                    $form['js'] .= $extra['js'];
                 }
             }
 
diff --git a/pandora_console/images/eye_hide.png b/pandora_console/images/eye_hide.png
new file mode 100644
index 0000000000..8bed55e599
Binary files /dev/null and b/pandora_console/images/eye_hide.png differ
diff --git a/pandora_console/images/eye_show.png b/pandora_console/images/eye_show.png
new file mode 100644
index 0000000000..6447f0a0d7
Binary files /dev/null and b/pandora_console/images/eye_show.png differ
diff --git a/pandora_console/images/status_sets/default/server_crash.png b/pandora_console/images/status_sets/default/server_crash.png
new file mode 100644
index 0000000000..5bee46f76c
Binary files /dev/null and b/pandora_console/images/status_sets/default/server_crash.png differ
diff --git a/pandora_console/images/status_sets/default/server_crash_ball.png b/pandora_console/images/status_sets/default/server_crash_ball.png
new file mode 100644
index 0000000000..fea84fee55
Binary files /dev/null and b/pandora_console/images/status_sets/default/server_crash_ball.png differ
diff --git a/pandora_console/include/ajax/agent.php b/pandora_console/include/ajax/agent.php
index 698ab7df9b..4db3fbbbd9 100644
--- a/pandora_console/include/ajax/agent.php
+++ b/pandora_console/include/ajax/agent.php
@@ -216,7 +216,7 @@ if ($search_agents && (!is_metaconsole() || $force_local)) {
 } else if ($search_agents && is_metaconsole()) {
     $id_agent = (int) get_parameter('id_agent');
     $string = (string) get_parameter('q');
-    // q is what autocomplete plugin gives
+    // Q is what autocomplete plugin gives.
     $id_group = (int) get_parameter('id_group', -1);
     $addedItems = html_entity_decode((string) get_parameter('add'));
     $addedItems = json_decode($addedItems);
@@ -236,6 +236,7 @@ if ($search_agents && (!is_metaconsole() || $force_local)) {
         'alias',
         'direccion',
         'id_tmetaconsole_setup AS id_server',
+        'server_name',
     ];
 
     $filter = [];
@@ -254,36 +255,33 @@ if ($search_agents && (!is_metaconsole() || $force_local)) {
         case 'enabled':
             $filter['disabled'] = 0;
         break;
+
+        default:
+            // Not possible.
+        break;
     }
 
-    if (!empty($id_agent)) {
+    if (empty($id_agent) === false) {
         $filter['id_agente'] = $id_agent;
     }
 
-    if (!empty($string)) {
+    if (empty($string) === false) {
         // Get agents for only the alias.
         $filter_alias = $filter;
-        switch ($config['dbtype']) {
-            case 'mysql':
-                $filter_alias[] = '(alias COLLATE utf8_general_ci LIKE "%'.$string.'%")';
-            break;
+        $filter_alias[] = '(alias COLLATE utf8_general_ci LIKE "%'.$string.'%")';
 
-            case 'postgresql':
-                $filter_alias[] = '(alias LIKE \'%'.$string.'%\')';
-            break;
+        $agents = db_get_all_rows_filter(
+            'tmetaconsole_agent',
+            $filter_alias,
+            $fields
+        );
 
-            case 'oracle':
-                $filter_alias[] = '(UPPER(alias) LIKE UPPER(\'%'.$string.'%\'))';
-            break;
-        }
-
-        $agents = db_get_all_rows_filter('tmetaconsole_agent', $filter_alias, $fields);
         if ($agents !== false) {
             foreach ($agents as $agent) {
                 $data[] = [
                     'id'        => $agent['id_agente'],
                     'name'      => io_safe_output($agent['nombre']),
-                    'alias'     => io_safe_output($agent['alias']),
+                    'alias'     => io_safe_output($agent['alias']).' ('.io_safe_output($agent['server_name']).')',
                     'ip'        => io_safe_output($agent['direccion']),
                     'id_server' => $agent['id_server'],
                     'filter'    => 'alias',
@@ -293,27 +291,20 @@ if ($search_agents && (!is_metaconsole() || $force_local)) {
 
         // Get agents for only the name.
         $filter_agents = $filter;
-        switch ($config['dbtype']) {
-            case 'mysql':
-                $filter_agents[] = '(alias COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND nombre COLLATE utf8_general_ci LIKE "%'.$string.'%")';
-            break;
+        $filter_agents[] = '(alias COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND nombre COLLATE utf8_general_ci LIKE "%'.$string.'%")';
 
-            case 'postgresql':
-                $filter_agents[] = '(alias NOT LIKE \'%'.$string.'%\' AND nombre LIKE \'%'.$string.'%\')';
-            break;
+        $agents = db_get_all_rows_filter(
+            'tmetaconsole_agent',
+            $filter_agents,
+            $fields
+        );
 
-            case 'oracle':
-                $filter_agents[] = '(UPPER(alias) NOT LIKE UPPER(\'%'.$string.'%\') AND UPPER(nombre) LIKE UPPER(\'%'.$string.'%\'))';
-            break;
-        }
-
-        $agents = db_get_all_rows_filter('tmetaconsole_agent', $filter_agents, $fields);
         if ($agents !== false) {
             foreach ($agents as $agent) {
                 $data[] = [
                     'id'        => $agent['id_agente'],
                     'name'      => io_safe_output($agent['nombre']),
-                    'alias'     => io_safe_output($agent['alias']),
+                    'alias'     => io_safe_output($agent['alias']).' ('.io_safe_output($agent['server_name']).')',
                     'ip'        => io_safe_output($agent['direccion']),
                     'id_server' => $agent['id_server'],
                     'filter'    => 'agent',
@@ -321,29 +312,22 @@ if ($search_agents && (!is_metaconsole() || $force_local)) {
             }
         }
 
-        // Get agents for only the address
+        // Get agents for only the address.
         $filter_address = $filter;
-        switch ($config['dbtype']) {
-            case 'mysql':
-                $filter_address[] = '(alias COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND nombre COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND direccion LIKE "%'.$string.'%")';
-            break;
+        $filter_address[] = '(alias COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND nombre COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND direccion LIKE "%'.$string.'%")';
 
-            case 'postgresql':
-                $filter_address[] = '(alias NOT LIKE \'%'.$string.'%\' AND nombre NOT LIKE \'%'.$string.'%\' AND direccion LIKE \'%'.$string.'%\')';
-            break;
+        $agents = db_get_all_rows_filter(
+            'tmetaconsole_agent',
+            $filter_address,
+            $fields
+        );
 
-            case 'oracle':
-                $filter_address[] = '(UPPER(alias) NOT LIKE UPPER(\'%'.$string.'%\') AND UPPER(nombre) NOT LIKE UPPER(\'%'.$string.'%\') AND UPPER(direccion) LIKE UPPER(\'%'.$string.'%\'))';
-            break;
-        }
-
-        $agents = db_get_all_rows_filter('tmetaconsole_agent', $filter_address, $fields);
         if ($agents !== false) {
             foreach ($agents as $agent) {
                 $data[] = [
                     'id'        => $agent['id_agente'],
                     'name'      => io_safe_output($agent['nombre']),
-                    'alias'     => io_safe_output($agent['alias']),
+                    'alias'     => io_safe_output($agent['alias']).' ('.io_safe_output($agent['server_name']).')',
                     'ip'        => io_safe_output($agent['direccion']),
                     'id_server' => $agent['id_server'],
                     'filter'    => 'address',
@@ -351,29 +335,22 @@ if ($search_agents && (!is_metaconsole() || $force_local)) {
             }
         }
 
-        // Get agents for only the description
+        // Get agents for only the description.
         $filter_description = $filter;
-        switch ($config['dbtype']) {
-            case 'mysql':
-                $filter_description[] = '(alias COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND nombre COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND direccion NOT LIKE "%'.$string.'%" AND comentarios LIKE "%'.$string.'%")';
-            break;
+        $filter_description[] = '(alias COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND nombre COLLATE utf8_general_ci NOT LIKE "%'.$string.'%" AND direccion NOT LIKE "%'.$string.'%" AND comentarios LIKE "%'.$string.'%")';
 
-            case 'postgresql':
-                $filter_description[] = '(alias NOT LIKE \'%'.$string.'%\' AND nombre NOT LIKE \'%'.$string.'%\' AND direccion NOT LIKE \'%'.$string.'%\' AND comentarios LIKE \'%'.$string.'%\')';
-            break;
+        $agents = db_get_all_rows_filter(
+            'tmetaconsole_agent',
+            $filter_description,
+            $fields
+        );
 
-            case 'oracle':
-                $filter_description[] = '(UPPER(alias) NOT LIKE UPPER(\'%'.$string.'%\') AND UPPER(nombre) NOT LIKE UPPER(\'%'.$string.'%\') AND UPPER(direccion) NOT LIKE UPPER(\'%'.$string.'%\') AND UPPER(comentarios) LIKE UPPER(\'%'.$string.'%\'))';
-            break;
-        }
-
-        $agents = db_get_all_rows_filter('tmetaconsole_agent', $filter_description, $fields);
         if ($agents !== false) {
             foreach ($agents as $agent) {
                 $data[] = [
                     'id'        => $agent['id_agente'],
                     'name'      => io_safe_output($agent['nombre']),
-                    'alias'     => io_safe_output($agent['alias']),
+                    'alias'     => io_safe_output($agent['alias']).' ('.io_safe_output($agent['server_name']).')',
                     'ip'        => io_safe_output($agent['direccion']),
                     'id_server' => $agent['id_server'],
                     'filter'    => 'description',
diff --git a/pandora_console/include/ajax/double_auth.ajax.php b/pandora_console/include/ajax/double_auth.ajax.php
index 7633a28979..2f2970ee23 100644
--- a/pandora_console/include/ajax/double_auth.ajax.php
+++ b/pandora_console/include/ajax/double_auth.ajax.php
@@ -17,7 +17,9 @@ check_login();
 
 // Security check
 $id_user = (string) get_parameter('id_user');
-if ($id_user !== $config['id_user']) {
+$FA_forced = (int) get_parameter('FA_forced');
+
+if ($id_user !== $config['id_user'] && $FA_forced != 1) {
     db_pandora_audit(
         'ACL Violation',
         'Trying to access Double Authentication'
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 230b55a476..4e796c2539 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -114,7 +114,9 @@ if ($get_comments) {
             sprintf(
                 ' HAVING max_id_evento = %d',
                 $event['id_evento']
-            )
+            ),
+            // True for show comments of validated events.
+            true
         );
         if ($events !== false) {
             $event = $events[0];
@@ -331,17 +333,52 @@ if ($get_filter_values) {
 
     if ($event_filter === false) {
         $event_filter = [
-            'status'        => EVENT_NO_VALIDATED,
-            'event_view_hr' => $config['event_view_hr'],
-            'group_rep'     => 1,
-            'tag_with'      => [],
-            'tag_without'   => [],
-            'history'       => false,
+            'status'            => EVENT_NO_VALIDATED,
+            'event_view_hr'     => $config['event_view_hr'],
+            'group_rep'         => 1,
+            'tag_with'          => [],
+            'tag_without'       => [],
+            'history'           => false,
+            'module_search'     => '',
+            'filter_only_alert' => '-1',
+            'user_comment'      => '',
+            'id_extra'          => '',
+            'id_user_ack'       => '',
+            'date_from'         => '',
+            'date_to'           => '',
+            'severity'          => '',
+            'event_type'        => '',
+            'group_rep'         => 0,
+            'id_group'          => 0,
+            'id_group_filter'   => 0,
+            'group_name'        => 'All',
+            'text_agent'        => '',
+            'id_agent'          => 0,
+            'id_name'           => 'None',
+            'filter_id'         => 0,
         ];
+    } else {
+        $event_filter['module_search'] = io_safe_output(db_get_value_filter('nombre', 'tagente_modulo', ['id_agente_modulo' => $event_filter['id_agent_module']]));
+        $a = array_keys(users_get_groups(false));
+        $event_filter['group_name'] = '';
+        foreach ($a as $key => $value) {
+            if ($value == $event_filter['id_group']) {
+                $event_filter['group_name'] = db_get_value('nombre', 'tgrupo', 'id_grupo', $event_filter['id_group_filter']);
+                if ($event_filter['group_name'] === false) {
+                    $event_filter['group_name'] = __('All');
+                }
+            }
+        }
+
+        $event_filter['module_search'] = io_safe_output(db_get_value_filter('nombre', 'tagente_modulo', ['id_agente_modulo' => $event_filter['id_agent_module']]));
     }
 
     $event_filter['search'] = io_safe_output($event_filter['search']);
     $event_filter['id_name'] = io_safe_output($event_filter['id_name']);
+    $event_filter['text_agent'] = io_safe_output($event_filter['text_agent']);
+    $event_filter['source'] = io_safe_output($event_filter['source']);
+
+
     $event_filter['tag_with'] = base64_encode(
         io_safe_output($event_filter['tag_with'])
     );
@@ -353,7 +390,7 @@ if ($get_filter_values) {
 }
 
 if ($load_filter_modal) {
-    $current = get_parameter('current_filter', '');
+    $current = db_get_value_filter('default_event_filter', 'tusuario', ['id_user' => $config['id_user']]);
     $filters = events_get_event_filter_select();
     $user_groups_array = users_get_groups_for_select(
         $config['id_user'],
@@ -433,10 +470,12 @@ function load_form_filter() {
         },
         function (data) {
             jQuery.each (data, function (i, val) {
+                console.log(val);
                 if (i == 'id_name')
                     $("#hidden-id_name").val(val);
-                if (i == 'id_group')
-                    $("#id_group").val(val);
+                if (i == 'id_group'){
+                    $('#id_group').val(val);
+                }
                 if (i == 'event_type')
                     $("#event_type").val(val);
                 if (i == 'severity') {
@@ -446,9 +485,9 @@ function load_form_filter() {
                 if (i == 'status')
                     $("#status").val(val);
                 if (i == 'search')
-                    $("#text-search").val(val);
+                    $('#text-search').val(val);
                 if (i == 'text_agent')
-                    $("#text_id_agent").val(val);
+                    $('input[name=text_agent]').val(val);
                 if (i == 'id_agent')
                     $('input:hidden[name=id_agent]').val(val);
                 if (i == 'id_agent_module')
@@ -477,6 +516,15 @@ function load_form_filter() {
                     $("#text-user_comment").val(val);
                 if (i == 'id_source_event')
                     $("#text-id_source_event").val(val);
+                if(i == 'date_from')
+                    $("#text-date_from").val(val);
+                if(i == 'date_to')
+                    $("#text-date_to").val(val);
+                if(i == 'module_search')
+                    $('input[name=module_search]').val(val);
+                if(i == 'group_name')
+                $("#select2-id_group_filter-container").text(val);
+
             });
             reorder_tags_inputs();
             // Update the info with the loaded filter
@@ -1145,12 +1193,37 @@ if ($change_status) {
     $event_ids = get_parameter('event_ids');
     $new_status = get_parameter('new_status');
 
-    $return = events_change_status(explode(',', $event_ids), $new_status, $meta, $history);
+    $return = events_change_status(
+        explode(',', $event_ids),
+        $new_status,
+        $meta,
+        $history
+    );
 
-    if ($return) {
-        echo 'status_ok';
+    if ($return !== false) {
+        echo json_encode(
+            [
+                'status' => 'status_ok',
+                'user'   => db_get_value(
+                    'fullname',
+                    'tusuario',
+                    'id_user',
+                    $config['id_user']
+                ),
+            ]
+        );
     } else {
-        echo 'status_error';
+        echo json_encode(
+            [
+                'status' => 'status_error',
+                'user'   => db_get_value(
+                    'fullname',
+                    'tusuario',
+                    'id_user',
+                    $config['id_user']
+                ),
+            ]
+        );
     }
 
     return;
diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index 930e2cdbd2..638282d381 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -239,8 +239,7 @@ function process_user_login_remote($login, $pass, $api=false)
 
         // Unknown authentication method
         default:
-            $config['auth_error'] = 'User not found in database 
-					or incorrect password';
+            $config['auth_error'] = 'User not found in database or incorrect password';
         return false;
             break;
     }
@@ -263,11 +262,6 @@ function process_user_login_remote($login, $pass, $api=false)
             if ($config['autocreate_remote_users'] == 1) {
                 if ($config['ad_save_password']) {
                     $update_credentials = change_local_user_pass_ldap($login, $pass);
-
-                    if ($update_credentials) {
-                        $config['auth_error'] = __('Your permissions have changed. Please, login again.');
-                        return false;
-                    }
                 } else {
                     delete_user_pass_ldap($login);
                 }
@@ -288,11 +282,6 @@ function process_user_login_remote($login, $pass, $api=false)
                 if ($return === 'error_permissions') {
                     $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator');
                     return false;
-                } else {
-                    if ($return === 'permissions_changed') {
-                        $config['auth_error'] = __('Your permissions have changed. Please, login again.');
-                        return false;
-                    }
                 }
             }
         } else if ($config['auth'] === 'ldap') {
@@ -300,11 +289,6 @@ function process_user_login_remote($login, $pass, $api=false)
             if ($config['autocreate_remote_users'] == 1) {
                 if ($config['ldap_save_password']) {
                     $update_credentials = change_local_user_pass_ldap($login, $pass);
-
-                    if ($update_credentials) {
-                        $config['auth_error'] = __('Your permissions have changed. Please, login again.');
-                        return false;
-                    }
                 } else {
                     delete_user_pass_ldap($login);
                 }
@@ -326,11 +310,6 @@ function process_user_login_remote($login, $pass, $api=false)
                     if ($return === 'error_permissions') {
                         $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator');
                         return false;
-                    } else {
-                        if ($return === 'permissions_changed') {
-                            $config['auth_error'] = __('Your permissions have changed. Please, login again.');
-                            return false;
-                        }
                     }
                 }
             }
diff --git a/pandora_console/include/class/AgentWizard.class.php b/pandora_console/include/class/AgentWizard.class.php
index 9efc2a872a..aa5acda1ad 100644
--- a/pandora_console/include/class/AgentWizard.class.php
+++ b/pandora_console/include/class/AgentWizard.class.php
@@ -273,7 +273,7 @@ class AgentWizard extends HTML
         // Check access.
         check_login();
 
-        if (! check_acl($config['id_user'], 0, 'AR')) {
+        if (!check_acl($config['id_user'], 0, 'AR')) {
             db_pandora_audit(
                 'ACL Violation',
                 'Trying to access event viewer'
@@ -293,6 +293,29 @@ class AgentWizard extends HTML
         $this->idAgent = get_parameter('id_agente', '');
         $this->idPolicy = get_parameter('id', '');
         $this->targetIp = get_parameter('targetIp', '');
+
+        if (!empty($this->idAgent)) {
+            $array_aux = db_get_all_rows_sql(
+                sprintf(
+                    'SELECT ip FROM taddress ta
+                    INNER JOIN taddress_agent taa ON taa.id_a = ta.id_a
+                    WHERE taa.id_agent = %d',
+                    $this->idAgent
+                )
+            );
+
+            if (!empty($array_aux)) {
+                $this->datalist = [];
+                foreach ($array_aux as $key => $value) {
+                    $this->datalist[] = $value['ip'];
+                }
+            }
+
+            if (count($this->datalist) === 1 && $this->targetIp === '') {
+                $this->targetIp = $this->datalist[0];
+            }
+        }
+
         $this->server = (int) get_parameter('server', '1');
         if ($this->server !== 0) {
             $this->serverType = (int) db_get_value(
@@ -563,6 +586,18 @@ class AgentWizard extends HTML
             ],
         ];
 
+        if (!empty($this->datalist)) {
+            $inputs[] = [
+                'id'        => 'li_address_list',
+                'arguments' => [
+                    'name'   => 'address_list',
+                    'type'   => 'datalist',
+                    'value'  => $this->datalist,
+                    'return' => true,
+                ],
+            ];
+        }
+
         $inputs[] = [
             'label'     => __('Target IP'),
             'id'        => 'txt-targetIp',
@@ -573,6 +608,7 @@ class AgentWizard extends HTML
                 'class'       => '',
                 'value'       => $this->targetIp,
                 'return'      => true,
+                'list'        => 'address_list',
             ],
         ];
 
@@ -865,7 +901,6 @@ class AgentWizard extends HTML
             ],
             true
         );
-
     }
 
 
@@ -992,10 +1027,51 @@ class AgentWizard extends HTML
         }
 
         if ($this->wizardSection === 'snmp_interfaces_explorer') {
-            // First, try x64 interfaces.
-            $this->interfacesx64 = true;
+            // Check if thereis x64 counters.
+            $snmp_tmp = '.1.3.6.1.2.1.31.1.1.1.6';
+            $check_x64 = get_snmpwalk(
+                $this->targetIp,
+                $this->version,
+                $this->community,
+                $this->authUserV3,
+                $this->securityLevelV3,
+                $this->authMethodV3,
+                $this->authPassV3,
+                $this->privacyMethodV3,
+                $this->privacyPassV3,
+                0,
+                $snmp_tmp,
+                $this->targetPort,
+                $this->server,
+                $this->extraArguments
+            );
+
+            if ($check_x64) {
+                $this->interfacesx64 = true;
+                $oidExplore = '.1.3.6.1.2.1.31.1.1.1.1';
+            } else {
+                $this->interfacesx64 = false;
+                $oidExplore = '1.3.6.1.2.1.2.2.1.2';
+            }
+
             // Explore interface names.
             $oidExplore = '.1.3.6.1.2.1.31.1.1.1.1';
+            $receivedOid = get_snmpwalk(
+                $this->targetIp,
+                $this->version,
+                $this->community,
+                $this->authUserV3,
+                $this->securityLevelV3,
+                $this->authMethodV3,
+                $this->authPassV3,
+                $this->privacyMethodV3,
+                $this->privacyPassV3,
+                0,
+                $oidExplore,
+                $this->targetPort,
+                $this->server,
+                $this->extraArguments
+            );
         } else {
             // Get the device PEN.
             $oidExplore = '.1.3.6.1.2.1.1.2.0';
@@ -1310,7 +1386,7 @@ class AgentWizard extends HTML
      *
      * @return array
      */
-    public function candidateModuleToCreate(array $data):array
+    public function candidateModuleToCreate(array $data): array
     {
         $modulesActivated = [];
         $generalInterface = false;
@@ -1391,10 +1467,16 @@ class AgentWizard extends HTML
                                 $result[$value]['name'] = $data['module-default_name-'.$key];
                             } else if (empty(preg_match('/module-description-set/', $k)) === false) {
                                 $result[$value]['description'] = $data['module-default_description-'.$key];
+                            } else if (empty(preg_match('/module-value/', $k)) === false) {
+                                $result[$value]['value'] = $data['module-value-'.$key];
                             }
 
-                            preg_match('/^(.*)-.*?_(\d-\d)$/', $k, $matches);
+                            preg_match('/^(.*)-.*?_(\d+-\d+)$/', $k, $matches);
                             $k = $matches[1].'-0_'.$matches[2];
+                        } else {
+                            if (empty(preg_match('/module-value/', $k)) === false) {
+                                $result[$value]['value'] = $data[$k];
+                            }
                         }
                     }
 
@@ -1418,7 +1500,7 @@ class AgentWizard extends HTML
                         $result[$value]['scan_type'] = (int) $data[$k];
                     } else if (empty(preg_match('/module-execution_type/', $k)) === false) {
                         $result[$value]['execution_type'] = (int) $data[$k];
-                    } else if (empty(preg_match('/module-value/', $k)) === false) {
+                    } else if (($data['wizard_section'] !== 'snmp_interfaces_explorer') && (empty(preg_match('/module-value/', $k)) === false)) {
                         $result[$value]['value'] = $data[$k];
                     } else if (empty(preg_match('/module-macros/', $k)) === false) {
                         $result[$value]['macros'] = $data[$k];
@@ -1560,8 +1642,8 @@ class AgentWizard extends HTML
                         if ($this->securityLevelV3 === 'authNoPriv'
                             || $this->securityLevelV3 === 'authPriv'
                         ) {
-                                $values['plugin_parameter'] = $this->authMethodV3;
-                                $values['plugin_pass'] = $this->authPassV3;
+                            $values['plugin_parameter'] = $this->authMethodV3;
+                            $values['plugin_pass'] = $this->authPassV3;
                             if ($this->securityLevelV3 === 'authPriv') {
                                 $values['custom_string_1'] = $this->privacyMethodV3;
                                 $values['custom_string_2'] = $this->privacyPassV3;
@@ -2261,7 +2343,7 @@ class AgentWizard extends HTML
     private function replacementMacrosPlugin(
         string $text,
         array $macros
-    ):string {
+    ): string {
         // Only agents.
         if (empty($this->idPolicy) === true) {
             // Common.
@@ -2308,7 +2390,7 @@ class AgentWizard extends HTML
         ?string $value,
         ?string $unit='',
         ?int $moduleType=0
-    ):string {
+    ): string {
         if ($moduleType !== MODULE_TYPE_REMOTE_SNMP_INC
             && $moduleType !== MODULE_TYPE_GENERIC_DATA_INC
             && $moduleType !== MODULE_TYPE_REMOTE_TCP_INC
@@ -2562,7 +2644,7 @@ class AgentWizard extends HTML
             // Unpack the extra fields
             // and include with key field in a field set.
             $macros = json_decode($module['macros'], true);
-            $fieldSet = [ '0' => $module['query_key_field'] ];
+            $fieldSet = ['0' => $module['query_key_field']];
             foreach ($macros as $fieldKey => $fieldMacro) {
                 if (preg_match('/extra_field_/', $fieldKey) !== 0) {
                     $tmpKey = explode('_', $fieldKey);
@@ -3002,7 +3084,7 @@ class AgentWizard extends HTML
                         $newModule = $module;
                         // Split the values got to obtain the name.
                         $tmpFirst = explode('.', $value);
-                        $tmpSecond = explode(' ', $tmpFirst[1]);
+                        $tmpSecond = explode(' ', $tmpFirst[(count($tmpFirst) - 1)]);
                         // Position 0 is the index, Position 3 is the MIB name.
                         $snmpwalkNames[$tmpSecond[0]] = $tmpSecond[3];
                         // Perform the operations for get the values.
@@ -3011,6 +3093,11 @@ class AgentWizard extends HTML
                             $currentOid = $oid.'.'.$tmpSecond[0];
                             $macros['macros'][$oidName] = $currentOid;
                             $currentOidValue = $this->snmpgetValue($currentOid);
+                            // If for any reason the value comes empty, add 1.
+                            if ($currentOidValue == '') {
+                                $currentOidValue = 1;
+                            }
+
                             $thisOperation = preg_replace(
                                 '/'.$oidName.'/',
                                 $currentOidValue,
@@ -3095,7 +3182,6 @@ class AgentWizard extends HTML
             // Add Create Modules form.
             $this->createModulesForm();
         }
-
     }
 
 
@@ -3204,7 +3290,6 @@ class AgentWizard extends HTML
         }
 
         return false;
-
     }
 
 
@@ -3301,7 +3386,7 @@ class AgentWizard extends HTML
      *
      * @return array Inputs for common data.
      */
-    private function getCommonDataInputs():array
+    private function getCommonDataInputs(): array
     {
         $inputs[] = [
             'id'        => 'create-modules-action',
@@ -4111,13 +4196,13 @@ class AgentWizard extends HTML
     }
 
 
-        /**
-         * This function return the definition of modules for SNMP Interfaces
-         *
-         * @param array $data Data.
-         *
-         * @return array Return modules for defect.
-         */
+    /**
+     * This function return the definition of modules for SNMP Interfaces
+     *
+     * @param array $data Data.
+     *
+     * @return array Return modules for defect.
+     */
     private function getInterfacesModules(array $data=[])
     {
         $moduleDescription  = '';
@@ -4202,6 +4287,34 @@ class AgentWizard extends HTML
             ],
         ];
 
+        // Get x86 or x64 modules.
+        if ($this->interfacesx64 === true) {
+            $definition_temp = $this->getInterfacesModulesx64($data);
+        } else {
+            $definition_temp = $this->getInterfacesModulesx86($data);
+        }
+
+        // General monitoring names.
+        $general_module_names = [
+            'ifInOctets / ifHCInOctets',
+            'ifOutOctets / ifHCOutOctets',
+            'ifInUcastPkts / ifHCInUcastPkts',
+            'ifOutUcastPkts / ifHCOutUcastPkts',
+            'ifInNUcastPkts / ifHCInNUcastPkts',
+            'ifOutNUcastPkts / ifHCOutNUcastPkts',
+        ];
+
+        if ($name == '') {
+            foreach ($definition_temp as $module => $module_def) {
+                $definition_temp[$module]['module_name'] = array_shift($general_module_names);
+            }
+        }
+
+        if (empty($definition_temp) === false) {
+            $definition = array_merge($definition, $definition_temp);
+        }
+
+        // Continue with common x86 and x84 modules.
         // IfAdminStatus.
         $moduleName = $name.'ifAdminStatus';
         $definition['ifAdminStatus'] = [
@@ -4328,19 +4441,6 @@ class AgentWizard extends HTML
             ],
         ];
 
-        // Get x86 or x64 modules.
-        if ($this->interfacesx64 === true) {
-            $definitionx64 = $this->getInterfacesModulesx64($data);
-            if (empty($definitionx64) === false) {
-                $definition = array_merge($definition, $definitionx64);
-            }
-        } else {
-            $definitionx86 = $this->getInterfacesModulesx86($data);
-            if (empty($definitionx86) === false) {
-                $definition = array_merge($definition, $definitionx86);
-            }
-        }
-
         return $definition;
     }
 
@@ -4566,7 +4666,7 @@ class AgentWizard extends HTML
 
         // Definition object.
         $definition = [];
-        // ifHCInOctets.
+        // IfHCInOctets.
         $moduleName = $name.'ifHCInOctets';
         $definition['ifHCInOctets'] = [
             'module_name'        => $moduleName,
@@ -4592,7 +4692,7 @@ class AgentWizard extends HTML
             ],
 
         ];
-        // ifHCOutOctets.
+        // IfHCOutOctets.
         $moduleName = $name.'ifHCOutOctets';
         $definition['ifHCOutOctets'] = [
             'module_name'        => $moduleName,
@@ -4618,7 +4718,7 @@ class AgentWizard extends HTML
             ],
         ];
 
-        // ifHCInUcastPkts.
+        // IfHCInUcastPkts.
         $moduleName = $name.'ifHCInUcastPkts';
         $definition['ifHCInUcastPkts'] = [
             'module_name'        => $moduleName,
@@ -4644,7 +4744,7 @@ class AgentWizard extends HTML
             ],
         ];
 
-        // ifHCOutUcastPkts.
+        // IfHCOutUcastPkts.
         $moduleName = $name.'ifHCOutUcastPkts';
         $definition['ifHCOutUcastPkts'] = [
             'module_name'        => $moduleName,
@@ -4669,7 +4769,7 @@ class AgentWizard extends HTML
                 'inv_critical' => false,
             ],
         ];
-        // ifHCInNUcastPkts.
+        // IfHCInNUcastPkts.
         $moduleName = $name.'ifHCInNUcastPkts';
         $definition['ifHCInNUcastPkts'] = [
             'module_name'        => $moduleName,
@@ -4733,17 +4833,18 @@ class AgentWizard extends HTML
      * @param integer|null $type      Module type.
      *
      * @return string
+     * @throws Exception Handle of unwanted operations.
      */
     private function evalOperation(
         string $operation,
         string $unit='',
         ?int $type=0
     ) {
-        // Avoid non-numeric or arithmetic chars for security reasons.
-        if (preg_match('/(([^0-9\s\+\-\*\/\(\).,])+)/', $operation) === 1) {
-            $output = 'ERROR';
-        } else {
-            try {
+        try {
+            // Avoid non-numeric or arithmetic chars for security reasons.
+            if (preg_match('/(([^0-9\s\+\-\*\/\(\).,])+)/', $operation) === 1) {
+                throw new Exception(sprintf(__("The operation '%s' is not permitted. Review for remote components."), $operation));
+            } else {
                 // Get the result of the operation and set it.
                 $output = '';
                 eval('$output = '.$operation.';');
@@ -4753,9 +4854,11 @@ class AgentWizard extends HTML
                     $unit,
                     $type
                 );
-            } catch (Exception $e) {
-                $output = 'ERROR';
             }
+        } catch (Exception $e) {
+            $this->message['type'][]    = 'error';
+            $this->message['message'][] = $e->getMessage();
+            $this->showMessage();
         }
 
         return $output;
@@ -4807,7 +4910,7 @@ class AgentWizard extends HTML
         try {
             exec($execution, $output);
         } catch (Exception $ex) {
-            $output = [ '0' => 'ERROR: Failed execution: '.(string) $ex];
+            $output = ['0' => 'ERROR: Failed execution: '.(string) $ex];
         }
 
         return $output;
@@ -4905,7 +5008,7 @@ class AgentWizard extends HTML
                 // Meta.
                 var meta = "<?php echo is_metaconsole(); ?>";
                 var hack_meta = '';
-                if(meta){
+                if (meta) {
                     hack_meta = '../../';
                 }
 
@@ -4913,15 +5016,15 @@ class AgentWizard extends HTML
                 showV3Form();
 
                 // Filter search interfaces snmp.
-                $('#text-filter-search').keyup(function () {
+                $('#text-filter-search').keyup(function() {
                     var string = $('#text-filter-search').val();
                     var regex = new RegExp(string);
                     var interfaces = $('.interfaces_search');
-                    interfaces.each(function(){
-                        if(string == ''){
+                    interfaces.each(function() {
+                        if (string == '') {
                             $(this).removeClass('hidden');
                         } else {
-                            if(this.id.match(regex)) {
+                            if (this.id.match(regex)) {
                                 $(this).removeClass('hidden');
                             } else {
                                 $(this).addClass('hidden');
@@ -4931,12 +5034,12 @@ class AgentWizard extends HTML
                 });
 
                 // Loading.
-                $('#submit-sub-protocol').click(function () {
+                $('#submit-sub-protocol').click(function() {
                     $('.wizard-result').remove();
                     $('#form-create-modules').remove();
                     $('.textodialogo').remove();
                     $('.loading-wizard')
-                        .html('<center><span style="font-size:25px;">Loading...</span><img style="width:25px;heigth:25px;" src="'+hack_meta+'images/spinner.gif"></center>');
+                        .html('<center><span style="font-size:25px;">Loading...</span><img style="width:25px;heigth:25px;" src="' + hack_meta + 'images/spinner.gif"></center>');
                 });
 
             });
@@ -4954,17 +5057,17 @@ class AgentWizard extends HTML
 
             function showSecurityLevelForm() {
                 var selector = $('#securityLevelV3').val();
-                if(selector === 'authNoPriv' || selector === 'authPriv'){
+                if (selector === 'authNoPriv' || selector === 'authPriv') {
                     $('#txt-authMethodV3').removeClass('invisible');
                     $('#txt-authPassV3').removeClass('invisible');
-                    if(selector === 'authPriv'){
+                    if (selector === 'authPriv') {
                         $('#txt-privacyMethodV3').removeClass('invisible');
                         $('#txt-privacyPassV3').removeClass('invisible');
                     } else {
                         $('#txt-privacyMethodV3').addClass('invisible');
                         $('#txt-privacyPassV3').addClass('invisible');
                     }
-                } else  {
+                } else {
                     $('#txt-authMethodV3').addClass('invisible');
                     $('#txt-authPassV3').addClass('invisible');
                     $('#txt-privacyMethodV3').addClass('invisible');
@@ -4978,45 +5081,42 @@ class AgentWizard extends HTML
                 var text = "";
                 var failed = 0;
                 try {
-                data = JSON.parse(data);
-                text = data["result"];
+                    data = JSON.parse(data);
+                    text = data["result"];
                 } catch (err) {
-                title = "<?php echo __('Failed'); ?>";
-                text = err.message;
-                failed = 1;
+                    title = "<?php echo __('Failed'); ?>";
+                    text = err.message;
+                    failed = 1;
                 }
                 if (!failed && data["error"] != undefined) {
-                title = "<?php echo __('Failed'); ?>";
-                text = data["error"];
-                failed = 1;
+                    title = "<?php echo __('Failed'); ?>";
+                    text = data["error"];
+                    failed = 1;
                 }
                 if (data["report"] != undefined) {
-                data["report"].forEach(function(item) {
-                    text += "<br>" + item;
-                });
+                    data["report"].forEach(function(item) {
+                        text += "<br>" + item;
+                    });
                 }
 
                 $("#msg").empty();
                 $("#msg").html(text);
                 $("#msg").dialog({
-                width: 450,
-                position: {
-                    my: "center",
-                    at: "center",
-                    of: window,
-                    collision: "fit"
-                },
-                title: title,
-                buttons: [
-                    {
-                        class:
-                            "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
+                    width: 450,
+                    position: {
+                        my: "center",
+                        at: "center",
+                        of: window,
+                        collision: "fit"
+                    },
+                    title: title,
+                    buttons: [{
+                        class: "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
                         text: "OK",
                         click: function(e) {
                             $("#msg").close();
                         }
-                    }
-                ]
+                    }]
                 });
 
             }
@@ -5034,41 +5134,39 @@ class AgentWizard extends HTML
                 var imageInfoModules = $("#image-info-modules-" + blockNumber);
                 var totalCount = 0;
                 var markedCount = 0;
-                var hidden_input  = document.getElementById("hidden-module-active-"+switchName[2]+"_"+switchName[3]);
-                var id_input = hidden_input.id.split("_");
                 if (type == 'block') {
                     selectedBlock
-                            .parent()
-                            .removeClass("alpha50");
+                        .parent()
+                        .removeClass("alpha50");
                     if (selectedBlock.prop("checked")) {
                         // Set to active the values of fields.
-                        $("[id*='"+id_input[0]+"']")
+                        $("[id*=hidden-module-active-"+blockNumber+"]")
                         .each(function(){
                             $(this).val('1');
                         });
                         // Set checked.
                         $("[id*=checkbox-sel_module_" + blockNumber + "]")
-                        .each(function(){
-                            $(this).prop("checked", true);
-                        });
+                            .each(function() {
+                                $(this).prop("checked", true);
+                            });
                         imageInfoModules.removeClass('hidden');
                     } else {
                         // Set to inactive the values of fields.
-                        $("[id*='"+id_input[0]+"']")
+                        $("[id*=hidden-module-active-"+blockNumber+"]")
                          .each(function(){
                             $(this).val('0');
                         });
                         // Set unchecked.
                         $("[id*=checkbox-sel_module_" + blockNumber + "]")
-                        .each(function(){
-                            $(this).prop("checked", false);
-                        });
+                            .each(function() {
+                                $(this).prop("checked", false);
+                            });
                         imageInfoModules.addClass('hidden');
                     }
                 } else if (type == 'module') {
                     // Getting the element.
-                    var thisModuleHidden  = document.getElementById("hidden-module-active-"+switchName[2]+"_"+moduleNumber); 
-                    var thisModule = $("#checkbox-sel_module_"+blockNumber+"_"+moduleNumber);
+                    var thisModuleHidden = document.getElementById("hidden-module-active-" + switchName[2] + "_" + moduleNumber);
+                    var thisModule = $("#checkbox-sel_module_" + blockNumber + "_" + moduleNumber);
                     // Setting the individual field
                     if (thisModule.prop('checked')) {
                         thisModuleHidden.value = '1';
@@ -5078,12 +5176,12 @@ class AgentWizard extends HTML
 
                     // Get the list of selected modules.
                     $("[id*=checkbox-sel_module_" + blockNumber + "]")
-                    .each(function() {
-                        if ($(this).prop("checked")) {
-                            markedCount++;
-                        }
-                        totalCount++;
-                    });
+                        .each(function() {
+                            if ($(this).prop("checked")) {
+                                markedCount++;
+                            }
+                            totalCount++;
+                        });
 
                     if (totalCount == markedCount) {
                         selectedBlock.prop("checked", true);
@@ -5112,7 +5210,7 @@ class AgentWizard extends HTML
              */
             function switchBlockControlInterfaces(e) {
                 var string = $('#text-filter-search').val();
-                if(string == ''){
+                if (string == '') {
                     if (e.checked) {
                         $(".interfaz_select").prop("checked", true);
                     } else {
@@ -5121,15 +5219,15 @@ class AgentWizard extends HTML
                 } else {
                     var regex = new RegExp(string);
                     var interfaces = $('.interfaces_search');
-                    interfaces.each(function(){
-                        if(this.id.match(regex)) {
+                    interfaces.each(function() {
+                        if (this.id.match(regex)) {
                             $(this).removeClass('hidden');
                             if (e.checked) {
-                                $("input[name='interfaz_select_"+this.id+"']")
+                                $("input[name='interfaz_select_" + this.id + "']")
                                     .prop("checked", true);
                             } else {
-                                $("input[name='interfaz_select_"+this.id+"']")
-                                 .prop("checked", false);
+                                $("input[name='interfaz_select_" + this.id + "']")
+                                    .prop("checked", false);
                             }
                         }
                     });
@@ -5137,13 +5235,13 @@ class AgentWizard extends HTML
             }
 
             /**
-            * Show the modal with modules for create.
-            */
+             * Show the modal with modules for create.
+             */
             function processListModules() {
                 confirmDialog({
                     title: "<?php echo __('Modules about to be created'); ?>",
                     message: function() {
-                        var id = "div-"+uniqId();
+                        var id = "div-" + uniqId();
                         var loading = "<?php echo __('Loading'); ?>" + "...";
                         $.ajax({
                             method: "post",
@@ -5159,22 +5257,22 @@ class AgentWizard extends HTML
                             },
                             datatype: "html",
                             success: function(data) {
-                                $('#'+id).empty().append(data);
+                                $('#' + id).empty().append(data);
                             },
                             error: function(e) {
                                 showMsg(e);
                             }
                         });
 
-                        return "<div id ='"+id+"'>"+loading+"</div>";
+                        return "<div id ='" + id + "'>" + loading + "</div>";
                     },
                     ok: "<?php echo __('OK'); ?>",
                     cancel: "<?php echo __('Cancel'); ?>",
                     onAccept: function() {
-                       $('#reviewed-modules').submit();
+                        $('#reviewed-modules').submit();
                     },
-                    size:750,
-                    maxHeight:500
+                    size: 750,
+                    maxHeight: 500
                 });
 
             }
diff --git a/pandora_console/include/class/AgentsAlerts.class.php b/pandora_console/include/class/AgentsAlerts.class.php
new file mode 100644
index 0000000000..514feccf3f
--- /dev/null
+++ b/pandora_console/include/class/AgentsAlerts.class.php
@@ -0,0 +1,1082 @@
+<?php
+/**
+ * Agents/Alerts Monitoring view Class.
+ *
+ * @category   Class
+ * @package    Pandora FMS
+ * @subpackage Agent Configuration
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2020 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.
+ * ============================================================================
+ */
+
+// Get global data.
+global $config;
+
+// Necessary classes for extends.
+require_once $config['homedir'].'/include/class/HTML.class.php';
+// Required functions.
+require_once $config['homedir'].'/include/functions_agents.php';
+require_once $config['homedir'].'/include/functions_modules.php';
+require_once $config['homedir'].'/include/functions_users.php';
+require_once $config['homedir'].'/include/functions_reporting.php';
+
+/**
+ * AgentWizard class
+ */
+class AgentsAlerts extends HTML
+{
+
+    /**
+     * Selected refresh rate
+     *
+     * @var string
+     */
+    private $refreshSelectedRate;
+
+    /**
+     * If true, will show modules that not have defined alerts.
+     *
+     * @var boolean
+     */
+    private $showWithoutAlertModules;
+
+    /**
+     * Selected group.
+     *
+     * @var integer
+     */
+    private $groupId;
+
+    /**
+     * Create alert received parameter.
+     *
+     * @var integer
+     */
+    private $createAlert;
+
+    /**
+     * Full screen variable.
+     *
+     * @var integer
+     */
+    private $pure;
+
+    /**
+     * Config id user.
+     *
+     * @var string
+     */
+    private $idUser;
+
+    /**
+     * Undocumented variable
+     *
+     * @var integer
+     */
+    private $offset;
+
+    /**
+     * Undocumented variable
+     *
+     * @var integer
+     */
+    private $horOffset;
+
+
+    /**
+     * Constructor
+     *
+     * @return $this
+     */
+    public function __construct()
+    {
+        global $config;
+
+        // Check access.
+        check_login();
+
+        if (! check_acl($config['id_user'], 0, 'AR')) {
+            db_pandora_audit(
+                'ACL Violation',
+                'Trying to access event viewer'
+            );
+
+            if (is_ajax() === true) {
+                echo json_encode(['error' => 'noaccess']);
+            }
+
+            include 'general/noaccess.php';
+            exit;
+        }
+
+        // Pure variable for full screen selection.
+        $this->pure = $config['pure'];
+        // Id user.
+        $this->idUser = $config['id_user'];
+        // Refresh rate.
+        $this->refreshSelectedRate = (string) get_parameter('refresh-rate', '30');
+        // Show Modules without alerts table.
+        $this->showWithoutAlertModules = isset($_POST['show-modules-without-alerts']);
+        // Selected group.
+        $this->groupId = (int) get_parameter('group-id', 0);
+        // Create alert token.
+        $this->createAlert = (int) get_parameter('create_alert', 0);
+        // Offset and hor-offset (for pagination).
+        $this->offset    = (int) get_parameter('offset', 0);
+        $this->horOffset = (int) get_parameter('hor_offset', 0);
+
+        return $this;
+    }
+
+
+    /**
+     * Run main page.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        // Javascript.
+        ui_require_jquery_file('pandora');
+        // Load own javascript file.
+        $this->loadJS();
+        // CSS.
+        ui_require_css_file('wizard');
+        ui_require_css_file('discovery');
+        ui_require_css_file('agent_alerts');
+        // Update network modules for this group
+        // Check for Network FLAG change request
+        // Made it a subquery, much faster on both the database and server side
+        // TODO. Check if this is used or necessary.
+        if (isset($_GET['update_netgroup']) === true) {
+            $group = get_parameter_get('update_netgroup', 0);
+            if (check_acl($this->idUser, $group, 'AW')) {
+                $where = ['id_agente' => 'ANY(SELECT id_agente FROM tagente WHERE id_grupo = '.$group];
+
+                db_process_sql_update('tagente_modulo', ['flag' => 1], $where);
+            } else {
+                db_pandora_audit('ACL Violation', 'Trying to set flag for groups');
+                include 'general/noaccess.php';
+                exit;
+            }
+        }
+
+        // Load the header.
+        $this->loadHeader();
+        // If the petition wants to create alert.
+        if ($this->createAlert) {
+            $this->createAlertAction();
+        }
+
+        if ($this->showWithoutAlertModules === true) {
+            $this->createAlertTable();
+        } else {
+            $this->loadMainAlertTable();
+        }
+    }
+
+
+    /**
+     * Show alert table.
+     *
+     * @return void
+     */
+    private function createAlertTable()
+    {
+        $table = new stdClass();
+
+        if ($this->groupId > 0) {
+            $grupo = ' AND tagente.id_grupo = '.$this->groupId;
+        } else {
+            $grupo = '';
+        }
+
+        $offset_modules = $this->offset;
+
+        $sql_count = 'SELECT COUNT(tagente_modulo.nombre) FROM tagente_modulo
+        INNER JOIN tagente ON tagente.id_agente = tagente_modulo.id_agente
+        WHERE id_agente_modulo NOT IN (SELECT id_agent_module FROM talert_template_modules)'.$grupo;
+
+        $count_agent_module = db_get_all_rows_sql($sql_count);
+
+        $sql = 'SELECT tagente.alias, tagente_modulo.nombre,
+        tagente_modulo.id_agente_modulo FROM tagente_modulo
+        INNER JOIN tagente ON tagente.id_agente = tagente_modulo.id_agente
+        WHERE id_agente_modulo NOT IN (SELECT id_agent_module FROM talert_template_modules) '.$grupo.' LIMIT 20 OFFSET '.$offset_modules;
+
+        $agent_modules = db_get_all_rows_sql($sql);
+
+        ui_pagination(
+            $count_agent_module[0]['COUNT(tagente_modulo.nombre)'],
+            ui_get_url_refresh(),
+            0,
+            0,
+            false,
+            'offset',
+            true,
+            '',
+            '',
+            false,
+            'alerts_modules'
+        );
+
+        $table->width    = '100%';
+        $table->class    = 'databox data';
+        $table->id       = 'table_agent_module';
+        $table->data     = [];
+
+        $table->head[0]  = __('Agents');
+        $table->head[1]  = __('Modules');
+        $table->head[2]  = __('Actions');
+
+        $table->style[0] = 'width: 25%;';
+        $table->style[1] = 'width: 33%;';
+        $table->style[2] = 'width: 33%;';
+
+        foreach ($agent_modules as $agent_module) {
+            // Let's build the table.
+            $data[0] = io_safe_output($agent_module['alias']);
+            $data[1] = io_safe_output($agent_module['nombre']);
+            $uniqid = $agent_module['id_agente_modulo'];
+            $data[2] = html_print_anchor(
+                [
+                    'href'    => sprintf(
+                        'javascript:show_add_alerts(\'%s\')',
+                        $uniqid
+                    ),
+                    'content' => html_print_image('images/add_mc.png', true),
+                ],
+                true
+            );
+
+            array_push($table->data, $data);
+
+            $table2 = new stdClass();
+
+            $table2->width  = '100%';
+            $table2->id     = 'table_add_alert';
+            $table2->class  = 'databox filters';
+            $table2->data   = [];
+
+            $table2->data[0][0] = __('Actions');
+
+            $groups_user = users_get_groups($this->idUser);
+
+            if (!empty($groups_user)) {
+                $groups = implode(',', array_keys($groups_user));
+                $sql = sprintf(
+                    'SELECT id, name FROM talert_actions WHERE id_group IN (%s)',
+                    $groups
+                );
+
+                $actions = db_get_all_rows_sql($sql);
+            }
+
+            $table2->data[0][1] = html_print_select(
+                index_array($actions, 'id', 'name'),
+                'action_select',
+                '',
+                '',
+                __('Default action'),
+                '0',
+                true,
+                '',
+                true,
+                '',
+                false,
+                'width: 250px;'
+            );
+            $table2->data[0][1] .= '<span id="advanced_action" class="advanced_actions invisible"><br>';
+            $table2->data[0][1] .= __('Number of alerts match from').' ';
+            $table2->data[0][1] .= html_print_input_text('fires_min', '', '', 4, 10, true);
+            $table2->data[0][1] .= ' '.__('to').' ';
+            $table2->data[0][1] .= html_print_input_text('fires_max', '', '', 4, 10, true);
+            $table2->data[0][1] .= ui_print_help_icon(
+                'alert-matches',
+                true,
+                ui_get_full_url(false, false, false, false)
+            );
+
+            $table2->data[0][1] .= '</span>';
+
+            // Check ACLs for LM users.
+            if (check_acl($this->idUser, 0, 'LM')) {
+                $table2->data[0][1] .= html_print_anchor(
+                    [
+                        'href'    => 'index.php?sec=galertas&sec2=godmode/alerts/configure_alert_action&pure='.$this->pure,
+                        'style'   => 'margin-left:5px;',
+                        'content' => html_print_image('images/add.png', true).'<span style="margin-left:5px;vertical-align:middle;">'.__('Create Action').'</span>',
+                    ],
+                    true
+                );
+            }
+
+            $table2->data[1][0] = __('Template');
+            $own_info = get_user_info($this->idUser);
+            if ($own_info['is_admin'] || check_acl($this->idUser, 0, 'PM')) {
+                $templates = alerts_get_alert_templates(false, ['id', 'name']);
+            } else {
+                $usr_groups = users_get_groups($this->idUser, 'LW', true);
+                $filter_groups = '';
+                $filter_groups = implode(',', array_keys($usr_groups));
+                $templates = alerts_get_alert_templates(['id_group IN ('.$filter_groups.')'], ['id', 'name']);
+            }
+
+            $table2->data[1][1] = html_print_select(
+                index_array($templates, 'id', 'name'),
+                'template',
+                '',
+                '',
+                __('Select'),
+                0,
+                true,
+                false,
+                true,
+                '',
+                false,
+                'width: 250px;'
+            );
+
+            $table2->data[1][1] .= html_print_anchor(
+                [
+                    'href'    => '#',
+                    'class'   => 'template_details invisible',
+                    'content' => html_print_image('images/zoom.png', true, ['class' => 'img_help']),
+                ],
+                true
+            );
+
+            // Check ACLs for LM users.
+            if (check_acl($this->idUser, 0, 'LM')) {
+                $table2->data[1][1] .= html_print_anchor(
+                    [
+                        'href'    => 'index.php?sec=galertas&sec2=godmode/alerts/configure_alert_template&pure='.$this->pure,
+                        'style'   => 'margin-left:5px;',
+                        'content' => html_print_image('images/add.png', true).'<span style="margin-left:5px;vertical-align:middle;">'.__('Create Template').'</span>',
+                    ],
+                    true
+                );
+            }
+
+            $table2->data[2][0] = __('Threshold');
+            $table2->data[2][1] = html_print_input_text('module_action_threshold', '0', '', 5, 7, true);
+            $table2->data[2][1] .= ' '.__('seconds');
+
+            $content2 = '<form class="add_alert_form" method="post">';
+
+            $content2 .= html_print_table($table2, true);
+            $content2 .= html_print_div(
+                [
+                    'class'   => 'action-buttons',
+                    'style'   => 'width: '.$table2->width,
+                    'content' => html_print_submit_button(__('Add alert'), 'add', false, 'class="sub wand"', true).html_print_input_hidden('create_alert', $uniqid, true),
+                ],
+                true
+            );
+
+            $content2 .= '</form>';
+
+            $module_name = ui_print_truncate_text(io_safe_output($agent_module['nombre']), 40, false, true, false, '&hellip;', false);
+
+            html_print_div(
+                [
+                    'id'      => 'add_alerts_dialog_'.$uniqid,
+                    'title'   => sprintf(
+                        '%s: %s / %s: %s',
+                        __('Agent'),
+                        $agent_module['alias'],
+                        __('Module'),
+                        $module_name
+                    ),
+                    'style'   => 'display:none; height: auto; padding-top: 1.5em;',
+                    'content' => $content2,
+                ]
+            );
+        }
+
+        html_print_table($table);
+    }
+
+
+    /**
+     * Creation of alerts
+     *
+     * @return void
+     */
+    private function createAlertAction()
+    {
+        $template2               = get_parameter('template');
+        $module_action_threshold = get_parameter('module_action_threshold');
+        $action_select           = get_parameter('action_select', 0);
+
+        $id_alert = alerts_create_alert_agent_module($this->create_alert, $template2);
+
+        if ($id_alert !== false) {
+            if ($action_select != 0) {
+                $values = [];
+                $values['fires_min'] = 0;
+                $values['fires_max'] = 0;
+                $values['module_action_threshold'] = (int) get_parameter('module_action_threshold');
+
+                alerts_add_alert_agent_module_action($id_alert, $action_select, $values);
+            }
+        }
+    }
+
+
+    /**
+     * Load the main table.
+     *
+     * @return boolean
+     */
+    public function loadMainAlertTable()
+    {
+        global $config;
+
+        $block = 10;
+
+        $filter = [
+            'offset' => (int) $this->offset,
+            'limit'  => (int) $config['block_size'],
+        ];
+
+        $filter_count = [];
+
+        if ($this->groupId > 0) {
+            $filter['id_grupo']       = $this->groupId;
+            $filter_count['id_grupo'] = $this->groupId;
+        }
+
+        // Get the id of all agents with alerts.
+        $sql = 'SELECT DISTINCT(id_agente)
+            FROM tagente_modulo
+            WHERE id_agente_modulo IN
+                (SELECT id_agent_module
+                FROM talert_template_modules)';
+        $agents_with_alerts_raw = db_get_all_rows_sql($sql);
+
+        if ($agents_with_alerts_raw === false) {
+            $agents_with_alerts_raw = [];
+        }
+
+        $agents_with_alerts = [];
+        foreach ($agents_with_alerts_raw as $awar) {
+            $agents_with_alerts[] = $awar['id_agente'];
+        }
+
+        $filter['id_agente']       = $agents_with_alerts;
+        $filter_count['id_agente'] = $agents_with_alerts;
+
+        $agents = agents_get_agents($filter);
+
+        $nagents = count(agents_get_agents($filter_count));
+
+        if ($agents == false) {
+            ui_print_info_message(
+                [
+                    'no_close' => true,
+                    'message'  => __('There are no agents with alerts'),
+                ]
+            );
+
+            return false;
+        }
+
+        $all_alerts = agents_get_alerts_simple();
+
+        if ($this->pure == 1) {
+            $block = count($all_alerts);
+        }
+
+        $templates = [];
+        $agent_alerts = [];
+        foreach ($all_alerts as $alert) {
+            $templates[$alert['id_alert_template']] = '';
+            $agent_alerts[$alert['agent_name']][$alert['id_alert_template']][] = $alert;
+        }
+
+        // Prepare pagination.
+        ui_pagination(
+            $nagents,
+            false,
+            0,
+            $filter['limit'],
+            false,
+            'offset',
+            true,
+            '',
+            '',
+            [
+                'count'  => '',
+                'offset' => 'offset_param',
+            ],
+            'alerts_agents'
+        );
+
+        echo '<table cellpadding="4" cellspacing="4" border="0" class="agents_modules_table table">';
+        echo '<tr>';
+        echo '<th class="header_table_principal_cell">'.__('Agents').' / '.__('Alerts').'</th>';
+
+        $templates_raw = [];
+        if (!empty($templates)) {
+            $sql = sprintf(
+                'SELECT id, name
+                FROM talert_templates
+                WHERE id IN (%s)',
+                implode(',', array_keys($templates))
+            );
+
+            $templates_raw = db_get_all_rows_sql($sql);
+
+            if (empty($templates_raw)) {
+                $templates_raw = [];
+            }
+        }
+
+        // Is needed sort templates for show in the row.
+        sort($templates);
+
+        $alerts = [];
+        $ntemplates = 0;
+        if ($this->horOffset > 0) {
+            $new_hor_offset = ($this->horOffset - $block);
+            echo "<th class='next_previous_step' rowspan='".($nagents + 1)."'>";
+
+            html_print_anchor(
+                [
+                    'href'    => sprintf(
+                        'index.php?sec=extensions&sec2=extensions/agents_alerts&hor_offset=%s&offset=%s&group-id=%s&pure=%s',
+                        $new_hor_offset,
+                        $this->offset,
+                        $this->groupId,
+                        $this->pure
+                    ),
+                    'content' => html_print_image(
+                        'images/arrow_left_green.png',
+                        true,
+                        [
+                            'style' => 'float: right;',
+                            'title' => __('Previous alerts'),
+                        ]
+                    ),
+                ]
+            );
+            echo '</th>';
+        }
+
+        // Dynamic Size.
+        if ($this->pure == 1) {
+            // Count of templates.
+            $templateCount = count($templates_raw);
+            // Define a dynamic size.
+            $thSize = floor(80 / $templateCount).'%';
+        } else {
+            $thSize = '8%';
+        }
+
+        foreach ($templates_raw as $temp) {
+            if (isset($templates[$temp['id']]) && $templates[$temp['id']] == '') {
+                $ntemplates++;
+
+                if ($ntemplates <= $this->horOffset || $ntemplates > ($this->horOffset + $block)) {
+                    continue;
+                }
+
+                $templates[$temp['id']] = $temp['name'];
+
+                if (empty($temp['name']) === false) {
+                    $outputLine = html_print_div(
+                        [
+                            'id'      => 'line_header_'.$temp['id'],
+                            'class'   => 'rotate_text_module position_text_module',
+                            'style'   => '',
+                            'content' => '<div title="'.io_safe_output($temp['name']).'">'.ui_print_truncate_text(io_safe_output($temp['name']), 20).'</div>',
+                        ],
+                        true
+                    );
+
+                    echo sprintf('<th class="th_class_module_r header_table_caption_cell" style="width:%s">%s</th>', $thSize, $outputLine);
+                }
+            }
+        }
+
+        if (($this->horOffset + $block) < $ntemplates) {
+            $new_hor_offset = ($this->horOffset + $block);
+            echo "<th class='next_previous_step' rowspan='".($nagents + 1)."'>";
+            html_print_anchor(
+                [
+                    'href'    => sprintf(
+                        'index.php?sec=extensions&sec2=extensions/agents_alerts&hor_offset=%s&offset=%s&group-id=%s&pure=%s',
+                        $new_hor_offset,
+                        $this->offset,
+                        $this->groupId,
+                        $this->pure
+                    ),
+                    'content' => html_print_image(
+                        'images/arrow_right_green.png',
+                        true,
+                        [
+                            'style' => 'float: right;',
+                            'title' => __('More alerts'),
+                        ]
+                    ),
+                ]
+            );
+            echo '</th>';
+        }
+
+        echo '</tr>';
+
+        foreach ($agents as $agent) {
+            // Flag for fired alerts.
+            $anyfired = false;
+            // Get aliases.
+            $alias = db_get_row('tagente', 'id_agente', $agent['id_agente']);
+            echo '<tr>';
+            // Name of the agent.
+            echo '<td style="font-weight:bold;text-align: right;">'.$alias['alias'].'</td>';
+            // Alerts of the agent.
+            foreach ($templates as $tid => $tname) {
+                $anyfired = 0;
+
+                if ($tname == '') {
+                    continue;
+                }
+
+                echo '<td class="center">';
+
+                if (isset($agent_alerts[$alias['alias']][$tid])) {
+                    foreach ($agent_alerts[$alias['alias']][$tid] as $alert) {
+                        if ((int) $alert['times_fired'] > 0) {
+                            $anyfired = true;
+                        }
+                    }
+
+                    if ($anyfired) {
+                        $cellstyle = 'background:'.COL_ALERTFIRED.';';
+                    } else {
+                        $cellstyle = 'background:'.COL_NORMAL.';';
+                    }
+
+                    $uniqid = uniqid();
+
+                    html_print_anchor(
+                        [
+                            'href'    => sprintf('javascript:show_alerts_details(\'%s\')', $uniqid),
+                            'content' => html_print_div(
+                                [
+                                    'id'      => 'line_header_'.$temp['id'],
+                                    'class'   => 'status_rounded_rectangles text_inside',
+                                    'style'   => $cellstyle,
+                                    'content' => count($agent_alerts[$alias['alias']][$tid]),
+                                ],
+                                true
+                            ),
+                        ]
+                    );
+
+                    $this->printAlertsSummaryModalWindow($uniqid, $agent_alerts[$alias['alias']][$tid]);
+                }
+
+                echo '</td>';
+            }
+
+            echo '</tr>';
+        }
+
+        echo '</table>';
+
+        ui_pagination(
+            $nagents,
+            false,
+            0,
+            0,
+            false,
+            'offset',
+            true,
+            'pagination-bottom',
+            '',
+            [
+                'count'  => '',
+                'offset' => 'offset_param',
+            ],
+            'alerts_agents'
+        );
+    }
+
+
+    /**
+     * Show headers and filters
+     *
+     * @return void
+     */
+    public function loadHeader()
+    {
+        if ($this->pure == 0) {
+            // Breadcrums.
+            $this->setBreadcrum([]);
+
+            $this->prepareBreadcrum(
+                [
+                    [
+                        'link'     => '',
+                        'label'    => __('Monitoring'),
+                        'selected' => false,
+                    ],
+                    [
+                        'link'     => '',
+                        'label'    => __('Views'),
+                        'selected' => true,
+                    ],
+                ],
+                true
+            );
+
+            ui_print_page_header(
+                __('Agents/Alerts'),
+                '',
+                false,
+                '',
+                true,
+                '',
+                false,
+                '',
+                GENERIC_SIZE_TEXT,
+                '',
+                $this->printHeader(true)
+            );
+        }
+
+        // Start Header form.
+        $headerForm = [
+            'action'   => ui_get_full_url(),
+            'id'       => 'form-header-filters',
+            'method'   => 'POST',
+            'class'    => 'modal flex flex-row',
+            'extra'    => '',
+            'onsubmit' => '',
+        ];
+
+        $headerInputs = [];
+
+        $headerInputs[] = [
+            'label'     => __('Group'),
+            'id'        => 'select-group-id',
+            'arguments' => [
+                'name'        => 'group-id',
+                'type'        => 'select_groups',
+                'input_class' => 'flex-row',
+                'class'       => '',
+                'privilege'   => 'AR',
+                'nothing'     => false,
+                'selected'    => $this->groupId,
+                'return'      => true,
+                'script'      => 'this.form.submit()',
+                'size'        => '100%',
+            ],
+        ];
+
+        $headerInputs[] = [
+            'label'     => __('Show modules without alerts'),
+            'id'        => 'txt-use-agent-ip',
+            'arguments' => [
+                'name'            => 'show-modules-without-alerts',
+                'checked'         => $this->showWithoutAlertModules,
+                'input_class'     => 'flex-row',
+                'type'            => 'checkbox',
+                'class'           => '',
+                'disabled_hidden' => true,
+                'return'          => true,
+            ],
+        ];
+
+        if ($this->pure == 0) {
+            $screenSwitchTitle  = __('Full screen mode');
+            $screenSwitchClass  = 'pure_full';
+            $screenSwitchPure   = 1;
+            $refreshVisibility   = false;
+        } else {
+            $screenSwitchTitle  = __('Back to normal mode');
+            $screenSwitchClass  = 'pure_normal';
+            $screenSwitchPure   = 0;
+            $refreshVisibility   = true;
+        }
+
+        $refreshComboRates = [
+            '30'                       => __('30 seconds'),
+            (string) SECONDS_1MINUTE   => __('1 minute'),
+            (string) SECONDS_2MINUTES  => __('2 minutes'),
+            (string) SECONDS_5MINUTES  => __('5 minutes'),
+            (string) SECONDS_10MINUTES => __('10 minutes'),
+        ];
+
+        $headerInputs[] = [
+            'id'        => 'pure',
+            'arguments' => [
+                'name'   => 'pure',
+                'type'   => 'hidden',
+                'value'  => $this->pure,
+                'return' => true,
+            ],
+        ];
+
+        $headerInputs[] = [
+            'label'          => __('Full screen'),
+            'id'             => 'img-full-screen',
+            'surround_start' => '<div id="full_screen_refresh_box">',
+            'arguments'      => [
+                'type'       => 'button',
+                'return'     => true,
+                'name'       => 'pure',
+                'attributes' => 'class="full_screen_button '.$screenSwitchClass.'" title="'.$screenSwitchTitle.'"',
+            ],
+        ];
+
+        $headerInputs[] = [
+            'label'        => __('Refresh'),
+            'id'           => 'slc-refresh-rate',
+            'class'        => ($refreshVisibility === true) ? '' : 'invisible',
+            'surround_end' => '</div>',
+            'arguments'    => [
+                'name'        => 'refresh-rate',
+                'input_class' => 'flex-row',
+                'type'        => 'select',
+                'fields'      => $refreshComboRates,
+                'selected'    => $this->refreshSelectedRate,
+                'return'      => true,
+                'script'      => 'this.form.submit()',
+                'sort'        => false,
+            ],
+        ];
+
+        $filterForm = $this->printForm(
+            [
+                'form'   => $headerForm,
+                'inputs' => $headerInputs,
+                true
+            ],
+            true
+        );
+
+        // Prints the header controls.
+        $header = html_print_div(
+            [
+                'class'   => 'white_box agents_alerts_header',
+                'content' => $filterForm,
+            ],
+            true
+        );
+
+        echo $header;
+    }
+
+
+    /**
+     * Prints the modal window for summary of each alerts group.
+     *
+     * @param string $id     Id of the agent-alert.
+     * @param array  $alerts Alerts.
+     *
+     * @return void
+     */
+    private function printAlertsSummaryModalWindow(string $id, array $alerts)
+    {
+        // Definition of table class.
+        $table = new stdClass();
+
+        $table->width = '98%';
+        $table->class = 'info_table';
+        $table->data = [];
+
+        $table->head[0] = __('Module');
+        $table->head[1] = __('Action');
+        $table->head[2] = __('Last fired');
+        $table->head[3] = __('Status');
+
+        foreach ($alerts as $alert) {
+            $data[0] = modules_get_agentmodule_name($alert['id_agent_module']);
+
+            $actions = alerts_get_alert_agent_module_actions($alert['id']);
+
+            $actionDefault = db_get_value_sql(
+                '
+                SELECT id_alert_action
+                FROM talert_templates
+                WHERE id = '.$alert['id_alert_template']
+            );
+
+            $actionText = '';
+
+            if (!empty($actions)) {
+                $actionText = '<div style="margin-left: 10px;"><ul class="action_list">';
+                foreach ($actions as $action) {
+                    $actionText .= '<div><span class="action_name"><li>'.$action['name'];
+                    if ($action['fires_min'] != $action['fires_max']) {
+                        $actionText .= ' ('.$action['fires_min'].' / '.$action['fires_max'].')';
+                    }
+
+                    $actionText .= '</li></span><br /></div>';
+                }
+
+                $actionText .= '</ul></div>';
+            } else {
+                if (!empty($actionDefault)) {
+                    $actionText = db_get_sql(
+                        "SELECT name
+                        FROM talert_actions
+                        WHERE id = $actionDefault"
+                    ).' <i>('.__('Default').')</i>';
+                }
+            }
+
+            $data[1] = $actionText;
+            $data[2] = ui_print_timestamp($alert['last_fired'], true);
+
+            if ($alert['times_fired'] > 0) {
+                $status = STATUS_ALERT_FIRED;
+                $title = __('Alert fired').' '.$alert['internal_counter'].' '.__('time(s)');
+            } else if ($alert['disabled'] > 0) {
+                $status = STATUS_ALERT_DISABLED;
+                $title = __('Alert disabled');
+            } else {
+                $status = STATUS_ALERT_NOT_FIRED;
+                $title = __('Alert not fired');
+            }
+
+            $data[3] = ui_print_status_image($status, $title, true);
+
+            array_push($table->data, $data);
+        }
+
+        $content = html_print_table($table, true);
+
+        $agent = modules_get_agentmodule_agent_alias($alerts[0]['id_agent_module']);
+        $template = alerts_get_alert_template_name($alerts[0]['id_alert_template']);
+
+        // Prints the modal window hidden for default.
+        echo html_print_div(
+            [
+                'id'      => 'alerts_details_'.$id,
+                'title'   => sprintf(
+                    '%s: %s / %s: %s',
+                    __('Agent'),
+                    $agent,
+                    __('Template'),
+                    $template
+                ),
+                'style'   => 'display:none;',
+                'content' => $content,
+            ],
+            true
+        );
+    }
+
+
+    /**
+     * Load the JS.
+     *
+     * @return string Formed string with script.
+     */
+    public function loadJS()
+    {
+        $str = '';
+        ob_start();
+        ?>
+
+        <script type='text/javascript'>
+            $(document).ready(function () {
+                var pure = $('#hidden-pure');
+                var mainForm = $('#form-header-filters');
+                var timeout;
+
+                <?php if ($this->pure == 1) { ?>
+                    $('.agents_alerts_header').addClass('agent_alerts_header_pure');
+                    $('.agents_alerts_header').attr('style', 'display: none');
+
+                    document.onmousemove = function(){
+                        clearTimeout(timeout);
+                        $('.agents_alerts_header').attr('style', 'display: block');
+                        timeout = setTimeout(function(){
+                            $('.agents_alerts_header').attr('style', 'display: none');
+                        }, 1000)
+                    }
+
+                    setTimeout(function(){
+                        mainForm.submit();
+                    },
+                    ($('#refresh-rate').val() * 1000));
+                <?php } ?>
+
+                $('.full_screen_button').click(function(){
+                    if (pure.val() == '1') {
+                        pure.val('0');
+                    } else {
+                        pure.val('1');
+                    }
+                    
+                    mainForm.submit();
+                });
+
+                $('#checkbox-show-modules-without-alerts').click(function(){
+                    mainForm.submit();
+                });
+
+            });
+
+            function show_alerts_details(id) {
+                $("#alerts_details_"+id).dialog({
+                    resizable: true,
+                    draggable: true,
+                    modal: true,
+                    height: 280,
+                    width: 800,
+                    overlay: {
+                        opacity: 0.5,
+                        background: "black"
+                    }
+                });
+            }
+            
+            function show_add_alerts(id) {
+                $("#add_alerts_dialog_"+id).dialog({
+                    resizable: true,
+                    draggable: true,
+                    modal: true,
+                    height: 270,
+                    width: 600,
+                    overlay: {
+                        opacity: 0.5,
+                        background: "black"
+                    }
+                });
+            }       
+        </script>
+
+        <?php
+        // Get the JS script.
+        $str = ob_get_clean();
+        // Return the loaded JS.
+        echo $str;
+        return $str;
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index 473a5d3be5..2d14003ba2 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -86,17 +86,17 @@ class ConsoleSupervisor
      *
      * @var boolean
      */
-    public $verbose;
+    public $interactive;
 
 
     /**
      * Constructor.
      *
-     * @param boolean $verbose Show output while executing or not.
+     * @param boolean $interactive Show output while executing or not.
      *
      * @return class This object
      */
-    public function __construct(bool $verbose=true)
+    public function __construct(bool $interactive=true)
     {
         $source = db_get_row(
             'tnotification_source',
@@ -104,16 +104,16 @@ class ConsoleSupervisor
             io_safe_input('System status')
         );
 
-        $this->verbose = $verbose;
+        $this->interactive = $interactive;
 
         if ($source === false) {
-            $this->notificationsEnabled = false;
+            $this->enabled = false;
             $this->sourceId = null;
 
             $this->targetGroups = null;
             $this->targetUsers = null;
         } else {
-            $this->notificationsEnabled = (bool) $source['enabled'];
+            $this->enabled = (bool) $source['enabled'];
             $this->sourceId = $source['id'];
 
             // Assign targets.
@@ -153,42 +153,42 @@ class ConsoleSupervisor
 
         /*
          * PHP configuration warnings:
-         *   NOTIF.PHP.SAFE_MODE
-         *   NOTIF.PHP.INPUT_TIME
-         *   NOTIF.PHP.EXECUTION_TIME
-         *   NOTIF.PHP.UPLOAD_MAX_FILESIZE
-         *   NOTIF.PHP.MEMORY_LIMIT
-         *   NOTIF.PHP.DISABLE_FUNCTIONS
-         *   NOTIF.PHP.PHANTOMJS
-         *   NOTIF.PHP.VERSION
+         *  NOTIF.PHP.SAFE_MODE
+         *  NOTIF.PHP.INPUT_TIME
+         *  NOTIF.PHP.EXECUTION_TIME
+         *  NOTIF.PHP.UPLOAD_MAX_FILESIZE
+         *  NOTIF.PHP.MEMORY_LIMIT
+         *  NOTIF.PHP.DISABLE_FUNCTIONS
+         *  NOTIF.PHP.PHANTOMJS
+         *  NOTIF.PHP.VERSION
          */
 
         $this->checkPHPSettings();
 
         /*
          * Check license.
-         *   NOTIF.LICENSE.EXPIRATION
+         *  NOTIF.LICENSE.EXPIRATION
          */
 
         $this->checkLicense();
 
         /*
          * Check component statuses (servers down - frozen).
-         *    NOTIF.SERVER.STATUS.ID_SERVER
+         *  NOTIF.SERVER.STATUS.ID_SERVER
          */
 
         $this->checkPandoraServers();
 
         /*
          * Check at least 1 server running in master mode.
-         *   NOTIF.SERVER.MASTER
+         *  NOTIF.SERVER.MASTER
          */
 
         $this->checkPandoraServerMasterAvailable();
 
         /*
          * Check if CRON is running.
-         *    NOTIF.CRON.CONFIGURED
+         *  NOTIF.CRON.CONFIGURED
          */
 
         if (enterprise_installed()) {
@@ -197,14 +197,14 @@ class ConsoleSupervisor
 
         /*
          * Check if instance is registered.
-         *     NOTIF.UPDATEMANAGER.REGISTRATION
+         *  NOTIF.UPDATEMANAGER.REGISTRATION
          */
 
         $this->checkUpdateManagerRegistration();
 
         /*
          * Check if there're new messages in UM.
-         *     NOTIF.UPDATEMANAGER.MESSAGES
+         *  NOTIF.UPDATEMANAGER.MESSAGES
          */
 
         $this->getUMMessages();
@@ -212,31 +212,32 @@ class ConsoleSupervisor
         /*
          * Check if the Server and Console has
          * the same versions.
+         *  NOTIF.SERVER.MISALIGNED
          */
+
         $this->checkConsoleServerVersions();
 
         /*
          * Check if AllowOverride is None or All.
          *  NOTIF.ALLOWOVERIDE.MESSAGE
          */
-        $this->checkAllowOverrideEnabled();
 
-        /*
-         * Check if AllowOverride is None or All.
-         *  NOTIF.HAMASTER.MESSAGE
-         */
-        $this->checkHaStatus();
+        $this->checkAllowOverrideEnabled();
 
         /*
          * Check if the Pandora Console log
          * file remains in old location.
+         *  NOTIF.PANDORACONSOLE.LOG.OLD
          */
+
         $this->checkPandoraConsoleLogOldLocation();
 
         /*
          * Check if the audit log file
          * remains in old location.
+         *  NOTIF.AUDIT.LOG.OLD
          */
+
         $this->checkAuditLogOldLocation();
 
     }
@@ -253,7 +254,7 @@ class ConsoleSupervisor
 
         $this->maintenanceOperations();
 
-        if ($this->notificationsEnabled === false) {
+        if ($this->enabled === false) {
             // Notifications not enabled.
             return;
         }
@@ -280,65 +281,65 @@ class ConsoleSupervisor
 
         /*
          * Check license.
-         *   NOTIF.LICENSE.EXPIRATION
-         *   NOTIF.LICENSE.LIMITED
+         *  NOTIF.LICENSE.EXPIRATION
+         *  NOTIF.LICENSE.LIMITED
          */
 
         $this->checkLicense();
 
         /*
          * Check number of files in attachment:
-         *   NOTIF.FILES.ATTACHMENT
+         *  NOTIF.FILES.ATTACHMENT
          */
 
         $this->checkAttachment();
 
         /*
          * Files in data_in:
-         *   NOTIF.FILES.DATAIN  (>1000)
-         *   NOTIF.FILES.DATAIN.BADXML (>150)
+         *  NOTIF.FILES.DATAIN  (>1000)
+         *  NOTIF.FILES.DATAIN.BADXML (>150)
          */
 
         $this->checkDataIn();
 
         /*
          * Check module queues not growing:
-         *   NOTIF.SERVER.QUEUE.ID_SERVER
+         *  NOTIF.SERVER.QUEUE.ID_SERVER
          */
 
         $this->checkServers();
 
         /*
          * Check component statuses (servers down - frozen).
-         *    NOTIF.SERVER.STATUS.ID_SERVER
+         *  NOTIF.SERVER.STATUS.ID_SERVER
          */
 
         $this->checkPandoraServers();
 
         /*
          * Check at least 1 server running in master mode.
-         *   NOTIF.SERVER.MASTER
+         *  NOTIF.SERVER.MASTER
          */
 
         $this->checkPandoraServerMasterAvailable();
 
         /*
          * PHP configuration warnings:
-         *   NOTIF.PHP.SAFE_MODE
-         *   NOTIF.PHP.INPUT_TIME
-         *   NOTIF.PHP.EXECUTION_TIME
-         *   NOTIF.PHP.UPLOAD_MAX_FILESIZE
-         *   NOTIF.PHP.MEMORY_LIMIT
-         *   NOTIF.PHP.DISABLE_FUNCTIONS
-         *   NOTIF.PHP.PHANTOMJS
-         *   NOTIF.PHP.VERSION
+         *  NOTIF.PHP.SAFE_MODE
+         *  NOTIF.PHP.INPUT_TIME
+         *  NOTIF.PHP.EXECUTION_TIME
+         *  NOTIF.PHP.UPLOAD_MAX_FILESIZE
+         *  NOTIF.PHP.MEMORY_LIMIT
+         *  NOTIF.PHP.DISABLE_FUNCTIONS
+         *  NOTIF.PHP.PHANTOMJS
+         *  NOTIF.PHP.VERSION
          */
 
         $this->checkPHPSettings();
 
         /*
          *  Check connection with historical DB (if enabled).
-         *    NOTIF.HISTORYDB
+         *  NOTIF.HISTORYDB
          */
 
         $this->checkPandoraHistoryDB();
@@ -346,23 +347,23 @@ class ConsoleSupervisor
         /*
          * Check pandoradb running in main DB.
          * Check pandoradb running in historical DB.
-         *   NOTIF.PANDORADB
-         *   NOTIF.PANDORADB.HISTORICAL
+         *  NOTIF.PANDORADB
+         *  NOTIF.PANDORADB.HISTORICAL
          */
 
         $this->checkPandoraDBMaintenance();
 
         /*
          * Check historical DB MR version.
-         *    NOTIF.HISTORYDB.MR
+         *  NOTIF.HISTORYDB.MR
          */
 
         $this->checkPandoraHistoryDBMR();
 
         /*
          * Check external components.
-         *    NOTIF.EXT.ELASTICSEARCH
-         *    NOTIF.EXT.LOGSTASH
+         *  NOTIF.EXT.ELASTICSEARCH
+         *  NOTIF.EXT.LOGSTASH
          *
          */
 
@@ -370,76 +371,76 @@ class ConsoleSupervisor
 
         /*
          * Check Metaconsole synchronization issues.
-         *    NOTIF.METACONSOLE.DB_CONNECTION
+         *  NOTIF.METACONSOLE.DB_CONNECTION
          */
 
         $this->checkMetaconsole();
 
         /*
          * Check incoming scheduled downtimes (< 15d).
-         *    NOTIF.DOWNTIME
+         *  NOTIF.DOWNTIME
          */
 
         $this->checkDowntimes();
 
         /*
          * Check if instance is registered.
-         *     NOTIF.UPDATEMANAGER.REGISTRATION
+         *  NOTIF.UPDATEMANAGER.REGISTRATION
          */
 
         $this->checkUpdateManagerRegistration();
 
         /*
          * Check if event storm protection is activated.
-         *    NOTIF.MISC.EVENTSTORMPROTECTION
+         *  NOTIF.MISC.EVENTSTORMPROTECTION
          */
 
         $this->checkEventStormProtection();
 
         /*
          * Check if develop_bypass is enabled.
-         *    NOTIF.MISC.DEVELOPBYPASS
+         *  NOTIF.MISC.DEVELOPBYPASS
          */
 
         $this->checkDevelopBypass();
 
         /*
          * Check if fontpath exists.
-         *    NOTIF.MISC.FONTPATH
+         *  NOTIF.MISC.FONTPATH
          */
 
         $this->checkFont();
 
         /*
          * Check if default user and password exists.
-         *    NOTIF.SECURITY.DEFAULT_PASSWORD
+         *  NOTIF.SECURITY.DEFAULT_PASSWORD
          */
 
         $this->checkDefaultPassword();
 
         /*
          * Check if there're new updates.
-         *    NOTIF.UPDATEMANAGER.OPENSETUP
-         *    NOTIF.UPDATEMANAGER.UPDATE
+         *  NOTIF.UPDATEMANAGER.OPENSETUP
+         *  NOTIF.UPDATEMANAGER.UPDATE
          */
 
         $this->checkUpdates();
 
         /*
          * Check if there're new minor updates available.
-         *    NOTIF.UPDATEMANAGER.MINOR
+         *  NOTIF.UPDATEMANAGER.MINOR
          */
 
         $this->checkMinorRelease();
 
-        if (enterprise_installed()) {
+        if ((bool) enterprise_installed() === true) {
             // Release the lock.
             enterprise_hook('cron_supervisor_release_lock');
         }
 
         /*
          * Check if CRON is running.
-         *    NOTIF.CRON.CONFIGURED
+         *  NOTIF.CRON.CONFIGURED
          */
 
         if (enterprise_installed()) {
@@ -448,14 +449,14 @@ class ConsoleSupervisor
 
         /*
          * Check if instance is registered.
-         *     NOTIF.UPDATEMANAGER.REGISTRATION
+         *  NOTIF.UPDATEMANAGER.REGISTRATION
          */
 
         $this->checkUpdateManagerRegistration();
 
         /*
          * Check if there're new messages in UM.
-         *     NOTIF.UPDATEMANAGER.MESSAGES
+         *  NOTIF.UPDATEMANAGER.MESSAGES
          */
 
         $this->getUMMessages();
@@ -463,18 +464,23 @@ class ConsoleSupervisor
         /*
          * Check if the Server and Console has
          * the same versions.
+         *  NOTIF.SERVER.MISALIGNED
          */
+
         $this->checkConsoleServerVersions();
 
         /*
          * Check if AllowOverride is None or All.
+         *  NOTIF.ALLOWOVERRIDE.MESSAGE
          */
+
         $this->checkAllowOverrideEnabled();
 
-          /*
-           * Check if HA status.
-           */
-        if (enterprise_installed()) {
+        /*
+         * Check if HA status.
+         */
+
+        if ((bool) enterprise_installed() === true) {
             $this->checkHaStatus();
         }
 
@@ -482,13 +488,8 @@ class ConsoleSupervisor
          * Check if the audit log file
          * remains in old location.
          */
+
         $this->checkAuditLogOldLocation();
-
-        /*
-            Check if AllowOverride is None or All.
-        */
-        $this->checkAllowOverrideEnabled();
-
     }
 
 
@@ -511,13 +512,13 @@ class ConsoleSupervisor
      * Update targets for given notification using object targets.
      *
      * @param array   $notification Current notification.
-     * @param boolean $update       Only update db targets, no email.
+     * @param boolean $send_mails   Only update db targets, no email.
      *
      * @return void
      */
     public function updateTargets(
         array $notification,
-        bool $update=false
+        bool $send_mails=true
     ) {
         $notification_id = $notification['id_mensaje'];
         $blacklist = [];
@@ -536,7 +537,7 @@ class ConsoleSupervisor
                 );
                 $insertion_string .= ',';
 
-                if ($update === false) {
+                if ($send_mails === true) {
                     // Send mail.
                     if (isset($user['also_mail']) && $user['also_mail'] == 1) {
                         enterprise_hook(
@@ -570,7 +571,7 @@ class ConsoleSupervisor
                 );
                 $insertion_string .= ',';
 
-                if ($update === false) {
+                if ($send_mails === true) {
                     // Send mail.
                     if (isset($group['also_mail']) && $group['also_mail'] == 1) {
                         enterprise_hook(
@@ -611,7 +612,7 @@ class ConsoleSupervisor
     public function notify(
         array $data,
         int $source_id=0,
-        int $max_age=86400
+        int $max_age=SECONDS_1DAY
     ) {
         // Uses 'check failed' logic.
         if (is_array($data) === false) {
@@ -680,8 +681,8 @@ class ConsoleSupervisor
                 // NOTIF.SERVER.MASTER.
                 // NOTIF.SERVER.STATUS.ID_SERVER.
                 if (preg_match('/^NOTIF.SERVER/', $data['type']) === true) {
-                    // Component notifications require be inmediate.
-                    $max_age = 0;
+                    // Send notification once a day.
+                    $max_age = SECONDS_1DAY;
                 }
 
                 // Else ignored.
@@ -692,7 +693,9 @@ class ConsoleSupervisor
         $prev = db_get_row(
             'tmensajes',
             'subtype',
-            $data['type']
+            $data['type'],
+            false,
+            false
         );
 
         if ($prev !== false
@@ -711,7 +714,7 @@ class ConsoleSupervisor
                 ],
                 ['id_mensaje' => $prev['id_mensaje']]
             );
-            $this->updateTargets($prev, true);
+            $this->updateTargets($prev, false);
             return;
         }
 
@@ -960,7 +963,7 @@ class ConsoleSupervisor
     {
         global $config;
 
-        $remote_config_dir = io_safe_output($config['remote_config']);
+        $remote_config_dir = (string) io_safe_output($config['remote_config']);
 
         if (enterprise_installed()
             && isset($config['license_nms'])
@@ -1200,6 +1203,8 @@ class ConsoleSupervisor
      */
     public function checkPandoraServers()
     {
+        global $config;
+
         $servers = db_get_all_rows_sql(
             'SELECT
                 id_server,
@@ -1239,8 +1244,29 @@ class ConsoleSupervisor
             $this->cleanNotifications('NOTIF.SERVER.STATUS%');
             return;
         } else {
-            // Clean notifications. Only show notif for down servers.
-            $this->cleanNotifications('NOTIF.SERVER.STATUS%');
+            // Clean notifications. Only show notif for down servers
+            // ONLY FOR RECOVERED ONES.
+            $servers_working = db_get_all_rows_sql(
+                'SELECT
+                    id_server,
+                    name,
+                    server_type,
+                    server_keepalive,
+                    status,
+                    unix_timestamp() - unix_timestamp(keepalive) as downtime
+                FROM tserver
+                WHERE 
+                    unix_timestamp() - unix_timestamp(keepalive) <= server_keepalive
+                    OR status != 0'
+            );
+
+            if (is_array($servers_working) === true) {
+                foreach ($servers_working as $server) {
+                    $this->cleanNotifications(
+                        'NOTIF.SERVER.STATUS'.$server['id_server']
+                    );
+                }
+            }
         }
 
         foreach ($servers as $server) {
@@ -1297,6 +1323,8 @@ class ConsoleSupervisor
      */
     public function checkPandoraServerMasterAvailable()
     {
+        global $config;
+
         $n_masters = db_get_value_sql(
             'SELECT
                 count(*) as n
@@ -2541,7 +2569,7 @@ class ConsoleSupervisor
     }
 
 
-    /*
+    /**
      * Check if Pandora console log file remains in old location.
      *
      * @return void
diff --git a/pandora_console/include/class/CredentialStore.class.php b/pandora_console/include/class/CredentialStore.class.php
index 073f0831a3..d14314a6b4 100644
--- a/pandora_console/include/class/CredentialStore.class.php
+++ b/pandora_console/include/class/CredentialStore.class.php
@@ -248,7 +248,7 @@ class CredentialStore extends Wizard
                 );
             } else {
                 $groups = [ $filter['filter_id_group'] ];
-                $childrens = groups_get_childrens($id_group, null, true);
+                $childrens = groups_get_children($id_group, null, true);
                 if (!empty($childrens)) {
                     foreach ($childrens as $child) {
                         $groups[] = (int) $child['id_grupo'];
diff --git a/pandora_console/include/class/HTML.class.php b/pandora_console/include/class/HTML.class.php
index 376afc4bfd..4382896fc3 100644
--- a/pandora_console/include/class/HTML.class.php
+++ b/pandora_console/include/class/HTML.class.php
@@ -547,7 +547,13 @@ class HTML
         } else {
             if ($input['arguments']['type'] != 'hidden'
                 && $input['arguments']['type'] != 'hidden_extended'
+                && $input['arguments']['type'] != 'datalist'
             ) {
+                // Raw content for attach at the start of the input.
+                if (isset($input['surround_start']) === true) {
+                    $output .= $input['surround_start'];
+                }
+
                 if (!$direct) {
                     $output .= '<li id="'.$input['id'].'" class="'.$class.'">';
                 }
@@ -562,6 +568,11 @@ class HTML
                 if (!$direct) {
                     $output .= '</li>';
                 }
+
+                // Raw content for attach at the end of the input.
+                if (isset($input['surround_end']) === true) {
+                    $output .= $input['surround_end'];
+                }
             } else {
                 $output .= self::printInput($input['arguments']);
                 // Allow dynamic content.
diff --git a/pandora_console/include/class/ModuleTemplates.class.php b/pandora_console/include/class/ModuleTemplates.class.php
index f9573b6c0e..8d89519486 100644
--- a/pandora_console/include/class/ModuleTemplates.class.php
+++ b/pandora_console/include/class/ModuleTemplates.class.php
@@ -409,6 +409,8 @@ class ModuleTemplates extends HTML
                 case 'export':
                     global $config;
 
+                    enterprise_include_once('include/functions_reporting_csv.php');
+
                     $id_network_profile = safe_int($this->id_np);
                     if (empty($id_network_profile)) {
                         return false;
@@ -500,7 +502,7 @@ class ModuleTemplates extends HTML
                     }
 
                     // Then print the first line (row names)
-                    echo '"'.implode('","', $row_names).'"';
+                    echo '"'.implode('"'.$config['csv_divider'].'"', $row_names).'"';
                     echo "\n";
 
                     // Then print the rest of the data. Encapsulate in quotes in case we have comma's in any of the descriptions
@@ -509,7 +511,19 @@ class ModuleTemplates extends HTML
                             unset($row[$bad_key]);
                         }
 
-                        echo '"'.implode('","', $row).'"';
+                        if ($config['csv_decimal_separator'] !== '.') {
+                            foreach ($row as $name => $data) {
+                                if (is_numeric($data)) {
+                                    // Get the number of decimals, if > 0, format dec comma.
+                                    $decimals = strlen(substr(strrchr($data, '.'), 1));
+                                    if ($decimals !== 0) {
+                                        $row[$name] = csv_format_numeric((float) $data, $decimals, true);
+                                    }
+                                }
+                            }
+                        }
+
+                        echo '"'.implode('"'.$config['csv_divider'].'"', $row).'"';
                         echo "\n";
                     }
 
@@ -845,7 +859,7 @@ class ModuleTemplates extends HTML
                 $row['id_np'],
                 '',
                 true,
-                ['title' => 'Export to CSV']
+                ['title' => 'Export tdaso CSV']
             );
             $data[3] = '<a href="'.$this->baseUrl.'&action=delete&id_np='.$row['id_np'].'" onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
             $data[3] .= '<a href="'.$this->baseUrl.'&action=export&id_np='.$row['id_np'].'">'.html_print_image('images/csv.png', true, ['title' => __('Export to CSV')]).'</a>';
diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index a14e2b80c4..0eaea52134 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -810,7 +810,7 @@ class NetworkMap
                 $filter['id_grupo'] = $this->idGroup;
             } else {
                 // Show current group and children.
-                $childrens = groups_get_childrens($this->idGroup, null, true);
+                $childrens = groups_get_children($this->idGroup, null, true);
                 if (!empty($childrens)) {
                     $childrens = array_keys($childrens);
 
diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php
index a5f754866d..9d7dbd6555 100644
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@@ -565,7 +565,6 @@ class Tree
         $module['id_module_type'] = (int) $module['id_tipo_modulo'];
         $module['server_type'] = (int) $module['id_modulo'];
         $module['status'] = $module['estado'];
-        $module['value'] = modules_get_agentmodule_data_for_humans($module);
 
         if (is_metaconsole()) {
             $module['serverID'] = $this->serverID;
@@ -575,6 +574,8 @@ class Tree
             $module['serverID'] = false;
         }
 
+        $module['value'] = modules_get_agentmodule_data_for_humans($module);
+
         if (!isset($module['value'])) {
             $module['value'] = modules_get_last_value($module['id']);
         }
diff --git a/pandora_console/include/class/TreeService.class.php b/pandora_console/include/class/TreeService.class.php
index b9721b3eb0..0afa46af73 100644
--- a/pandora_console/include/class/TreeService.class.php
+++ b/pandora_console/include/class/TreeService.class.php
@@ -264,6 +264,7 @@ class TreeService extends Tree
                 ts.id_agent_module,
                 ts.name,
                 ts.name as `alias`,
+                ts.description as `description`,
                 ts.id as `rootID`,
                 "services" as `rootType`,
                 "services" as `type`,
@@ -311,6 +312,7 @@ class TreeService extends Tree
             ];
             $services[$service['id']]['name'] = $service['name'];
             $services[$service['id']]['id'] = $service['id'];
+            $services[$service['id']]['description'] = $service['description'];
             $services[$service['id']]['serviceDetail'] = 'index.php?sec=network&sec2=enterprise/operation/services/services&tab=service_map&id_service='.(int) $service['id'];
         }
 
@@ -512,6 +514,8 @@ class TreeService extends Tree
                     $tmp['id'] = (int) $item->service()->id();
                     $tmp['name'] = $item->service()->name();
                     $tmp['alias'] = $item->service()->name();
+                    $tmp['description'] = $item->service()->description();
+                    $tmp['elementDescription'] = $item->description();
 
                     if ($this->connectedToNode === false
                         && is_metaconsole() === true
@@ -643,6 +647,8 @@ class TreeService extends Tree
                 ts.id_agent_module,
                 ts.name,
                 ts.name as `alias`,
+                ts.description as `description`,
+                tse.description as `elementDescription`,
                 tse.id_service as `rootID`,
                 "services" as `rootType`,
                 "services" as `type`,
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index b722c6a24a..ef1086f605 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC201015';
+$build_version = 'PC201202';
 $pandora_version = 'v7.0NG.750';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index d32dacb1fe..66b784d712 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -309,7 +309,7 @@ define('STATUS_ALERT_DISABLED', 'alert_disabled.png');
 // For servers.
 define('STATUS_SERVER_OK', 'server_ok.png');
 define('STATUS_SERVER_DOWN', 'server_down.png');
-
+define('STATUS_SERVER_CRASH', 'server_crash.png');
 
 
 // Status images (ball).
@@ -335,6 +335,7 @@ define('STATUS_ALERT_DISABLED_BALL', 'alert_disabled_ball.png');
 // For servers.
 define('STATUS_SERVER_OK_BALL', 'server_ok_ball.png');
 define('STATUS_SERVER_DOWN_BALL', 'server_down_ball.png');
+define('STATUS_SERVER_CRASH_BALL', 'server_crash_ball.png');
 
 
 
@@ -456,6 +457,9 @@ define('REPORT_OLD_TYPE_SUMATORY', 10);
 define('REPORT_GENERAL_NOT_GROUP_BY_AGENT', 0);
 define('REPORT_GENERAL_GROUP_BY_AGENT', 1);
 
+define('REPORT_PERMISSIONS_NOT_GROUP_BY_GROUP', 0);
+define('REPORT_PERMISSIONS_GROUP_BY_GROUP', 1);
+
 define('REPORTING_CUSTOM_GRAPH_LEGEND_EACH_MODULE_VERTICAL_SIZE', 15);
 
 // POLICIES.
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 0147168ebf..f79c56b764 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -1342,6 +1342,73 @@ function get_priority_name($priority)
 }
 
 
+/**
+ * Translates status into string.
+ *
+ * @param integer $status Agent status.
+ *
+ * @return string Translation.
+ */
+function get_agent_status_string($status)
+{
+    switch ($status) {
+        case AGENT_STATUS_CRITICAL:
+        return __('CRITICAL');
+
+        case AGENT_STATUS_WARNING:
+        return __('WARNING');
+
+        case AGENT_STATUS_ALERT_FIRED:
+        return __('ALERT FIRED');
+
+        case AGENT_STATUS_NOT_INIT:
+        return __('NO DATA');
+
+        case AGENT_STATUS_NORMAL:
+        return __('NORMAL');
+
+        case AGENT_STATUS_UNKNOWN:
+        default:
+        return __('UNKNOWN');
+    }
+}
+
+
+/**
+ * Translates status into string.
+ *
+ * @param integer $status Module status.
+ *
+ * @return string Translation.
+ */
+function get_module_status_string($status)
+{
+    switch ($status) {
+        case AGENT_MODULE_STATUS_CRITICAL_BAD:
+        return __('CRITICAL');
+
+        case AGENT_MODULE_STATUS_WARNING_ALERT:
+        case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+        return __('ALERT FIRED');
+
+        case AGENT_MODULE_STATUS_WARNING:
+        return __('WARNING');
+
+        case AGENT_MODULE_STATUS_UNKNOWN:
+        return __('UNKNOWN');
+
+        case AGENT_MODULE_STATUS_NO_DATA:
+        case AGENT_MODULE_STATUS_NOT_INIT:
+        return __('NO DATA');
+
+        case AGENT_MODULE_STATUS_NORMAL_ALERT:
+        case AGENT_MODULE_STATUS_NORMAL:
+        default:
+        return __('NORMAL');
+    }
+}
+
+
 /**
  * Get priority class (CSS class) from priority value.
  *
@@ -2222,13 +2289,19 @@ function check_login($output=true)
  * @param integer $id_group     Agents group id to check from
  * @param string  $access       Access privilege
  * @param boolean $onlyOneGroup Flag to check acl for specified group only (not to roots up, or check acl for 'All' group when $id_group is 0).
+ * @param boolean $cache        Use cache.
  *
  * @return boolean 1 if the user has privileges, 0 if not.
  */
-function check_acl($id_user, $id_group, $access, $onlyOneGroup=false)
-{
+function check_acl(
+    $id_user,
+    $id_group,
+    $access,
+    $onlyOneGroup=false,
+    $cache=true
+) {
     if (empty($id_user)) {
-        // User ID needs to be specified
+        // User ID needs to be specified.
         trigger_error('Security error: check_acl got an empty string for user id', E_USER_WARNING);
         return 0;
     } else if (is_user_admin($id_user)) {
@@ -2238,7 +2311,15 @@ function check_acl($id_user, $id_group, $access, $onlyOneGroup=false)
     }
 
     if ($id_group != 0 || $onlyOneGroup === true) {
-        $groups_list_acl = users_get_groups($id_user, $access, false, true, null);
+        $groups_list_acl = users_get_groups(
+            $id_user,
+            $access,
+            false,
+            true,
+            null,
+            'id_grupo',
+            $cache
+        );
     } else {
         $groups_list_acl = get_users_acl($id_user);
     }
@@ -2263,16 +2344,17 @@ function check_acl($id_user, $id_group, $access, $onlyOneGroup=false)
 /**
  * Check the ACL of a list of groups.
  *
- * @param string $id_user to check the ACL
- * @param array  $groups. All groups to check
- * @param string $access. Profile to check
+ * @param string  $id_user to check the ACL
+ * @param array   $groups. All groups to check
+ * @param string  $access. Profile to check
+ * @param boolean $cache   Use cached group information.
  *
  * @return boolean True if at least one of this groups check the ACL
  */
-function check_acl_one_of_groups($id_user, $groups, $access)
+function check_acl_one_of_groups($id_user, $groups, $access, $cache=true)
 {
     foreach ($groups as $group) {
-        if (check_acl($id_user, $group, $access)) {
+        if (check_acl($id_user, $group, $access, false, $cache)) {
             return true;
         }
     }
@@ -3753,7 +3835,16 @@ function series_type_graph_array($data, $show_elements_graph)
                         $name_legend .= __('Unit ').' ';
                         $name_legend .= $show_elements_graph['unit'].': ';
                     } else {
-                        $name_legend = $show_elements_graph['labels'][$value['agent_module_id']].': ';
+                        if (isset($show_elements_graph['from_interface']) === true
+                            && (bool) $show_elements_graph['from_interface'] === true
+                        ) {
+                            $label_interfaces = array_flip($show_elements_graph['modules_series']);
+                            $name_legend = $show_elements_graph['labels'][$value['agent_module_id']][$label_interfaces[$value['agent_module_id']]].': ';
+                        } else if (is_array($show_elements_graph['labels'][$value['agent_module_id']]) === true) {
+                            $name_legend = 'Avg: ';
+                        } else {
+                            $name_legend = $show_elements_graph['labels'][$value['agent_module_id']].': ';
+                        }
                     }
                 } else {
                     if (strpos($key, 'baseline') !== false) {
@@ -3813,17 +3904,23 @@ function series_type_graph_array($data, $show_elements_graph)
                 $data_return['legend'][$key] .= __('Min:').remove_right_zeros(
                     number_format(
                         $value['min'],
-                        $config['graph_precision']
+                        $config['graph_precision'],
+                        $config['csv_decimal_separator'],
+                        $config['csv_decimal_separator'] == ',' ? '.' : ','
                     )
                 ).' '.__('Max:').remove_right_zeros(
                     number_format(
                         $value['max'],
-                        $config['graph_precision']
+                        $config['graph_precision'],
+                        $config['csv_decimal_separator'],
+                        $config['csv_decimal_separator'] == ',' ? '.' : ','
                     )
                 ).' '._('Avg:').remove_right_zeros(
                     number_format(
                         $value['avg'],
-                        $config['graph_precision']
+                        $config['graph_precision'],
+                        $config['csv_decimal_separator'],
+                        $config['csv_decimal_separator'] == ',' ? '.' : ','
                     )
                 ).' '.$str;
 
@@ -3887,7 +3984,8 @@ function series_type_graph_array($data, $show_elements_graph)
                     $data_return['legend'][$key] .= remove_right_zeros(
                         number_format(
                             $value['avg'],
-                            $config['graph_precision']
+                            $config['graph_precision'],
+                            $config['csv_decimal_separator']
                         )
                     ).' '.$str;
                 }
@@ -5820,4 +5918,5 @@ function send_test_email(
     }
 
     return $result;
+
 }
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index beff278dc1..c9d93b6e36 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -19,17 +19,18 @@
 
 require_once $config['homedir'].'/include/functions.php';
 require_once $config['homedir'].'/include/functions_modules.php';
-require_once $config['homedir'].'/include/functions_users.php';/**
-                                                                * Return the agent if exists in the DB.
-                                                                *
-                                                                * @param integer $id_agent      The agent id.
-                                                                * @param boolean $show_disabled Show the agent found althought it is disabled. By default false.
-                                                                * @param boolean $force_meta
-                                                                *
-                                                                * @return boolean The result to check if the agent is in the DB.
-                                                                */
+require_once $config['homedir'].'/include/functions_users.php';
 
 
+/**
+ * Return the agent if exists in the DB.
+ *
+ * @param integer $id_agent      The agent id.
+ * @param boolean $show_disabled Show the agent found althought it is disabled. By default false.
+ * @param boolean $force_meta
+ *
+ * @return boolean The result to check if the agent is in the DB.
+ */
 function agents_get_agent($id_agent, $show_disabled=true, $force_meta=false)
 {
     $agent = db_get_row_filter(
@@ -335,6 +336,11 @@ function agents_get_alerts_simple($id_agent=false, $filter='', $options=false, $
 
         // Filter by agents id.
         $id_agents_list = implode(',', $id_agent);
+
+        if ($id_agents_list === '') {
+            $id_agents_list = '0';
+        }
+
         $subQuery .= ' AND id_agente in ('.$id_agents_list.')';
     } else if ($id_agent === false || empty($id_agent)) {
         if ($allModules) {
@@ -1108,11 +1114,14 @@ function agents_get_group_agents(
             foreach ($id_group as $parent) {
                 $id_group = array_merge(
                     $id_group,
-                    groups_get_id_recursive($parent, false)
+                    groups_get_children_ids($parent, $noACL)
                 );
             }
         } else {
-            $id_group = groups_get_id_recursive($id_group, false);
+            $id_group = array_merge(
+                [$id_group],
+                groups_get_children_ids($id_group, $noACL)
+            );
         }
 
         // Check available groups for target user only if asking for 'All' group.
@@ -1292,6 +1301,17 @@ function agents_get_group_agents(
             $key = $row['id_agente'];
         }
 
+        if ($row['id_server'] !== '') {
+            if (is_metaconsole()) {
+                $server_name = db_get_row_filter(
+                    'tmetaconsole_setup',
+                    'id = '.$row['id_server'].'',
+                    'server_name'
+                );
+                $row['alias'] .= ' ('.$server_name['server_name'].')';
+            }
+        }
+
         switch ($case) {
             case 'lower':
                 $value = mb_strtolower($row['alias'], 'UTF-8');
diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 2566e265be..74a024d866 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -2871,17 +2871,8 @@ function alerts_get_agent_modules(
         );
         $agent_modules = db_get_all_rows_sql($sql);
     } else {
-        $groups = groups_get_children($id_grupo, true);
+        $groups = groups_get_children_ids($id_grupo, true);
         if (empty($groups) === false) {
-            $groups = array_reduce(
-                $groups,
-                function ($carry, $item) {
-                    $carry[] = $item['id_grupo'];
-                    return $carry;
-                },
-                [$id_grupo]
-            );
-
             $sql = sprintf(
                 'SELECT distinct(atm.id_agent_module)
                     FROM talert_template_modules atm
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 6401910faa..f3f976e183 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -194,6 +194,7 @@ function returnData($returnType, $data, $separator=';')
             if (is_array($data['data'])) {
                 if (array_key_exists('list_index', $data)) {
                     if ($returnType == 'csv_head') {
+                        header('Content-type: text/csv');
                         foreach ($data['list_index'] as $index) {
                             echo $index;
                             if (end($data['list_index']) == $index) {
@@ -1570,7 +1571,9 @@ function api_set_new_agent($thrash1, $thrash2, $other, $thrash3)
             $nombre_agente = $alias;
         }
 
-        if ($direccion_agente != '') {
+        $exists_ip = false;
+
+        if ($config['unique_ip'] && $direccion_agente != '') {
             $exists_ip = db_get_row_sql('SELECT direccion FROM tagente WHERE direccion = "'.$direccion_agente.'"');
         }
 
@@ -1973,7 +1976,7 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType)
             $ag_groups = $other['data'][1];
             // Recursion.
             if ($other['data'][6] === '1') {
-                $ag_groups = groups_get_id_recursive($ag_groups, true);
+                $ag_groups = groups_get_children_ids($ag_groups, true);
             }
 
             $ag_groups = implode(',', (array) $ag_groups);
@@ -8443,10 +8446,16 @@ function api_get_module_data($id, $thrash1, $other, $returnType)
         return;
     }
 
-    $separator = $other['data'][0];
-    $periodSeconds = $other['data'][1];
-    $tstart = $other['data'][2];
-    $tend = $other['data'][3];
+    $separator = ';';
+    $tstart = null;
+    $tend = null;
+    $periodSeconds = null;
+    if (is_array($other) === true && is_array($other['data']) === true) {
+        $separator = $other['data'][0];
+        $periodSeconds = $other['data'][1];
+        $tstart = $other['data'][2];
+        $tend = $other['data'][3];
+    }
 
     if (($tstart != '') && ($tend != '')) {
         try {
@@ -8467,36 +8476,18 @@ function api_get_module_data($id, $thrash1, $other, $returnType)
             $date_end = $date_end->format('U');
         } catch (Exception $e) {
             returnError('error_query_module_data', 'Error in date format. ');
+            return;
         }
-
-        $sql = sprintf(
-            'SELECT utimestamp, datos 
-            FROM tagente_datos 
-            WHERE id_agente_modulo = %d AND utimestamp > %d 
-            AND utimestamp < %d 
-            ORDER BY utimestamp DESC',
-            $id,
-            $date_start,
-            $date_end
-        );
     } else {
-        if ($periodSeconds == null) {
-            $sql = sprintf(
-                'SELECT utimestamp, datos 
-                FROM tagente_datos 
-                WHERE id_agente_modulo = %d 
-                ORDER BY utimestamp DESC',
-                $id
-            );
+        if ($periodSeconds !== null) {
+            $date_end = get_system_time();
+            $date_start = (get_system_time() - $periodSeconds);
         } else {
-            $sql = sprintf(
-                'SELECT utimestamp, datos 
-                FROM tagente_datos 
-                WHERE id_agente_modulo = %d AND utimestamp > %d 
-                ORDER BY utimestamp DESC',
-                $id,
-                (get_system_time() - $periodSeconds)
-            );
+            $date_end = get_system_time();
+            $result = modules_get_first_date($id, $tstart);
+            if ($result !== false) {
+                $date_start = $result['first_utimestamp'];
+            }
         }
     }
 
@@ -8505,13 +8496,30 @@ function api_get_module_data($id, $thrash1, $other, $returnType)
         'utimestamp',
         'datos',
     ];
-    $data['data'] = db_get_all_rows_sql($sql);
+
+    $data['data'] = array_reduce(
+        db_uncompress_module_data($id, $date_start, $date_end),
+        function ($carry, $item) {
+            if (is_array($item['data']) === true) {
+                foreach ($item['data'] as $i => $v) {
+                    $carry[] = [
+                        'utimestamp' => $v['utimestamp'],
+                        'datos'      => $v['datos'],
+                    ];
+                }
+            }
+
+            return $carry;
+        },
+        []
+    );
 
     if ($data === false) {
         returnError('error_query_module_data', 'Error in the query of module data.');
     } else if ($data['data'] == '') {
         returnError('error_query_module_data', 'No data to show.');
     } else {
+        // returnData('csv_head', $data, $separator);
         returnData('csv', $data, $separator);
     }
 }
@@ -12513,7 +12521,13 @@ function api_set_create_event($id, $trash1, $other, $returnType)
 
         if ($other['data'][18] != '') {
             $values['id_extra'] = $other['data'][18];
-            $sql_validation = 'SELECT id_evento FROM tevento where estado IN (0,2) and id_extra ="'.$other['data'][18].'";';
+            if (is_metaconsole()) {
+                $table_event = 'tmetaconsole_event';
+            } else {
+                $table_event = 'tevento';
+            }
+
+            $sql_validation = 'SELECT id_evento FROM '.$table_event.' where estado IN (0,2) and id_extra ="'.$other['data'][18].'";';
             $validation = db_get_all_rows_sql($sql_validation);
             if ($validation) {
                 foreach ($validation as $val) {
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index eda0e37770..3edda7e357 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -721,6 +721,10 @@ function config_update_config()
                         $error_update[] = __('Double authentication');
                     }
 
+                    if (!config_update_value('2FA_all_users', get_parameter('2FA_all_users'))) {
+                        $error_update[] = __('2FA all users');
+                    }
+
                     if (!config_update_value('session_timeout', get_parameter('session_timeout'))) {
                         $error_update[] = __('Session timeout');
                     }
@@ -2008,6 +2012,10 @@ function config_process_config()
         config_update_value('welcome_state', WELCOME_STARTED);
     }
 
+    if (!isset($config['2Fa_auth'])) {
+        config_update_value('2Fa_auth', '');
+    }
+
      /*
       * Parse the ACL IP list for access API
       */
diff --git a/pandora_console/include/functions_custom_fields.php b/pandora_console/include/functions_custom_fields.php
index d1f661e874..c15b0cae95 100644
--- a/pandora_console/include/functions_custom_fields.php
+++ b/pandora_console/include/functions_custom_fields.php
@@ -367,7 +367,7 @@ function agent_counters_custom_fields($filters)
     if ($filters['group']) {
         // Recursion check acl.
         if ($filters['recursion']) {
-            $recursion_groups = groups_get_id_recursive($filters['group'], true);
+            $recursion_groups = groups_get_children_ids($filters['group'], true);
             if (!users_can_manage_group_all('AR')) {
                 if (isset($user_groups) && is_array($user_groups)) {
                     $groups_intersect = array_intersect($user_groups, $recursion_groups);
diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php
index 1e2a5d79f8..1f9d6883d0 100644
--- a/pandora_console/include/functions_db.php
+++ b/pandora_console/include/functions_db.php
@@ -702,7 +702,7 @@ function db_get_module_ranges_unknown(
  * @param utimestamp $tend             End of the catch.
  * @param integer    $slice_size       Size of slice(default-> module_interval).
  *
- * @return hash with the data uncompressed in blocks of module_interval
+ * @return array with the data uncompressed in blocks of module_interval
  * false in case of empty result
  *
  * Note: All "unknown" data are marked as NULL
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 7a337fbdab..20d71fd02b 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -673,15 +673,16 @@ function events_update_status($id_evento, $status, $filter=null, $history=false)
 /**
  * Retrieve all events filtered.
  *
- * @param array   $fields     Fields to retrieve.
- * @param array   $filter     Filters to be applied.
- * @param integer $offset     Offset (pagination).
- * @param integer $limit      Limit (pagination).
- * @param string  $order      Sort order.
- * @param string  $sort_field Sort field.
- * @param boolean $history    Apply on historical table.
- * @param boolean $return_sql Return SQL (true) or execute it (false).
- * @param string  $having     Having filter.
+ * @param array   $fields          Fields to retrieve.
+ * @param array   $filter          Filters to be applied.
+ * @param integer $offset          Offset (pagination).
+ * @param integer $limit           Limit (pagination).
+ * @param string  $order           Sort order.
+ * @param string  $sort_field      Sort field.
+ * @param boolean $history         Apply on historical table.
+ * @param boolean $return_sql      Return SQL (true) or execute it (false).
+ * @param string  $having          Having filter.
+ * @param boolean $validatedEvents If true, evaluate validated events.
  *
  * @return array Events.
  * @throws Exception On error.
@@ -695,7 +696,8 @@ function events_get_all(
     $sort_field=null,
     $history=false,
     $return_sql=false,
-    $having=''
+    $having='',
+    $validatedEvents=false
 ) {
     global $config;
 
@@ -871,37 +873,23 @@ function events_get_all(
     }
 
     $groups = $filter['id_group_filter'];
-    if (isset($groups) && $groups > 0) {
-        $propagate = db_get_value(
-            'propagate',
-            'tgrupo',
-            'id_grupo',
-            $groups
-        );
+    if (isset($groups) === true && $groups > 0) {
+        $children = groups_get_children($groups);
 
-        if (!$propagate && isset($groups)) {
-            $sql_filters[] = sprintf(
-                ' AND (te.id_grupo = %d OR tasg.id_group = %d)',
-                $groups,
-                $groups
-            );
-        } else {
-            $children = groups_get_children($groups);
-            $_groups = [ $groups ];
-            if (!empty($children)) {
-                foreach ($children as $child) {
-                    $_groups[] = (int) $child['id_grupo'];
-                }
+        $_groups = [ $groups ];
+        if (empty($children) === false) {
+            foreach ($children as $child) {
+                $_groups[] = (int) $child['id_grupo'];
             }
-
-            $groups = $_groups;
-
-            $sql_filters[] = sprintf(
-                ' AND (te.id_grupo IN (%s) OR tasg.id_group IN (%s))',
-                join(',', $groups),
-                join(',', $groups)
-            );
         }
+
+        $groups = $_groups;
+
+        $sql_filters[] = sprintf(
+            ' AND (te.id_grupo IN (%s) OR tasg.id_group IN (%s))',
+            join(',', $groups),
+            join(',', $groups)
+        );
     }
 
     // Skip system messages if user is not PM.
@@ -926,10 +914,20 @@ function events_get_all(
             break;
 
             case EVENT_NO_VALIDATED:
+                // Show comments in validated events.
+                $validatedState = '';
+                if ($validatedEvents === true) {
+                    $validatedState = sprintf(
+                        'OR estado = %d',
+                        EVENT_VALIDATE
+                    );
+                }
+
                 $sql_filters[] = sprintf(
-                    ' AND (estado = %d OR estado = %d)',
+                    ' AND (estado = %d OR estado = %d %s)',
                     EVENT_NEW,
-                    EVENT_PROCESS
+                    EVENT_PROCESS,
+                    $validatedState
                 );
             break;
         }
@@ -1258,7 +1256,11 @@ function events_get_all(
     // Order.
     $order_by = '';
     if (isset($order, $sort_field)) {
-        $order_by = events_get_sql_order($sort_field, $order);
+        if (isset($filter['group_rep']) && $filter['group_rep'] == 1) {
+            $order_by = events_get_sql_order('MAX('.$sort_field.')', $order);
+        } else {
+            $order_by = events_get_sql_order($sort_field, $order);
+        }
     }
 
     // Pagination.
@@ -1550,26 +1552,18 @@ function events_get_event($id, $fields=false, $meta=false, $history=false)
 /**
  * Retrieve all events ungrouped.
  *
- * @param string  $sql_post   Sql_post.
- * @param integer $offset     Offset.
- * @param integer $pagination Pagination.
- * @param boolean $meta       Meta.
- * @param boolean $history    History.
- * @param boolean $total      Total.
- * @param boolean $history_db History_db.
- * @param string  $order      Order.
+ * @param string  $sql_post  Sql_post.
+ * @param boolean $meta      Meta.
+ * @param boolean $history   History.
+ * @param boolean $returnSql Only Query.
  *
  * @return mixed Array of events or false.
  */
 function events_get_events_no_grouped(
     $sql_post,
-    $offset=0,
-    $pagination=1,
     $meta=false,
     $history=false,
-    $total=false,
-    $history_db=false,
-    $order='ASC'
+    $returnSql=false
 ) {
     global $config;
 
@@ -1579,7 +1573,11 @@ function events_get_events_no_grouped(
     $sql .= events_get_secondary_groups_left_join($table);
     $sql .= $sql_post;
 
-    $events = db_get_all_rows_sql($sql, $history_db);
+    if ($returnSql === true) {
+        return $sql;
+    }
+
+    $events = db_get_all_rows_sql($sql, $history);
 
     return $events;
 }
@@ -1632,29 +1630,59 @@ function events_get_events_grouped(
     $event_lj = events_get_secondary_groups_left_join($table);
     if ($total) {
         $sql = "SELECT COUNT(*) FROM (SELECT id_evento
-            FROM $table te $event_lj
-            WHERE 1=1 ".$sql_post.'
+            FROM $table te $event_lj ".$sql_post.'
             GROUP BY estado, evento, id_agente, id_agentmodule'.$groupby_extra.') AS t';
     } else {
-        $sql = "SELECT *, MAX(id_evento) AS id_evento,
-            GROUP_CONCAT(DISTINCT user_comment SEPARATOR '<br>') AS user_comment,
-            GROUP_CONCAT(DISTINCT id_evento SEPARATOR ',') AS similar_ids,
-            COUNT(id_evento) AS event_rep, MAX(utimestamp) AS timestamp_rep, 
-            MIN(utimestamp) AS timestamp_rep_min,
-            (SELECT owner_user FROM $table WHERE id_evento = MAX(te.id_evento)) owner_user,
-            (SELECT id_usuario FROM $table WHERE id_evento = MAX(te.id_evento)) id_usuario,
-            (SELECT id_agente FROM $table WHERE id_evento = MAX(te.id_evento)) id_agente,
-            (SELECT criticity FROM $table WHERE id_evento = MAX(te.id_evento)) AS criticity,
-            (SELECT ack_utimestamp FROM $table WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp,
-            (SELECT nombre FROM tagente_modulo WHERE id_agente_modulo = te.id_agentmodule) AS module_name
-            FROM $table te $event_lj
-            WHERE 1=1 ".$sql_post.'
-            GROUP BY estado, evento, id_agente, id_agentmodule'.$groupby_extra;
-        $sql .= ' '.events_get_sql_order($sort_field, $order, 2);
-        $sql .= ' LIMIT '.$offset.','.$pagination;
+        $sql = sprintf(
+            'SELECT *,
+                MAX(id_evento) AS id_evento,
+                GROUP_CONCAT(
+                    DISTINCT user_comment SEPARATOR "<br>"
+                ) AS user_comment,
+                GROUP_CONCAT(
+                    DISTINCT id_evento SEPARATOR ","
+                ) AS similar_ids,
+                COUNT(id_evento) AS event_rep, MAX(utimestamp) AS timestamp_rep,
+                MIN(utimestamp) AS timestamp_rep_min,
+                (SELECT owner_user
+                    FROM %s
+                    WHERE id_evento = MAX(te.id_evento)) AS owner_user,
+                (SELECT id_usuario
+                    FROM %s
+                    WHERE id_evento = MAX(te.id_evento)) AS id_usuario,
+                (SELECT id_agente
+                    FROM %s
+                    WHERE id_evento = MAX(te.id_evento)) AS id_agente,
+                (SELECT criticity
+                    FROM %s
+                    WHERE id_evento = MAX(te.id_evento)) AS criticity,
+                (SELECT ack_utimestamp
+                    FROM %s
+                    WHERE id_evento = MAX(te.id_evento)) AS ack_utimestamp,
+                (SELECT nombre
+                    FROM tagente_modulo
+                    WHERE id_agente_modulo = te.id_agentmodule) AS module_name
+            FROM %s te %s
+            %s
+            GROUP BY estado, evento, id_agente, id_agentmodule %s
+                %s
+            LIMIT %d, %d',
+            $table,
+            $table,
+            $table,
+            $table,
+            $table,
+            $table,
+            $event_lj,
+            $sql_post,
+            $groupby_extra,
+            events_get_sql_order($sort_field, $order, 2),
+            $offset,
+            $pagination
+        );
     }
 
-    // Extract the events by filter (or not) from db
+    // Extract the events by filter (or not) from db.
     $events = db_get_all_rows_sql($sql, $history_db);
 
     if ($total) {
@@ -2969,7 +2997,8 @@ function events_get_agent(
         $type = [];
         foreach ($filter_event_type as $event_type) {
             if ($event_type != '') {
-                // If normal, warning, could be several (going_up_warning, going_down_warning... too complex.
+                // If normal, warning, could be several
+                // (going_up_warning, going_down_warning... too complex.
                 // Shown to user only "warning, critical and normal".
                 if ($event_type == 'warning' || $event_type == 'critical' || $event_type == 'normal') {
                     $type[] = " event_type LIKE '%".$event_type."%' ";
@@ -2989,10 +3018,10 @@ function events_get_agent(
     }
 
     if ($events_group) {
-        $sql_where .= sprintf(
+        $secondary_groups = sprintf(
             ' INNER JOIN tgrupo tg
-               ON  (te.id_grupo = tg.id_grupo AND tg.id_grupo = %s)
-               OR (tg.id_grupo = tasg.id_group AND tasg.id_group = %s)
+               ON  (te.id_grupo = tg.id_grupo AND tg.id_grupo IN (%s))
+               OR (tg.id_grupo = tasg.id_group AND tasg.id_group IN (%s))
             WHERE utimestamp > %d
             AND utimestamp <= %d ',
             join(',', $id_group),
@@ -3000,22 +3029,27 @@ function events_get_agent(
             $datelimit,
             $date
         );
-    } else if ($events_module) {
-        $sql_where .= sprintf(
-            ' AND id_agentmodule = %d AND utimestamp > %d
-			AND utimestamp <= %d ',
-            $id_agent_module,
-            $datelimit,
-            $date
-        );
+        $sql_where = $secondary_groups.' '.$sql_where;
     } else {
-        $sql_where .= sprintf(
-            ' AND id_agente = %d AND utimestamp > %d
-			AND utimestamp <= %d ',
-            $id_agent,
-            $datelimit,
-            $date
-        );
+        $sql_where = ' WHERE 1=1 '.$sql_where;
+
+        if ($events_module) {
+            $sql_where .= sprintf(
+                ' AND id_agentmodule = %d AND utimestamp > %d
+                AND utimestamp <= %d ',
+                $id_agent_module,
+                $datelimit,
+                $date
+            );
+        } else {
+            $sql_where .= sprintf(
+                ' AND id_agente = %d AND utimestamp > %d
+                AND utimestamp <= %d ',
+                $id_agent,
+                $datelimit,
+                $date
+            );
+        }
     }
 
     if (is_metaconsole() && $id_server) {
@@ -3035,11 +3069,7 @@ function events_get_agent(
     } else {
         return events_get_events_no_grouped(
             $sql_where,
-            0,
-            1000,
             (is_metaconsole() && $id_server) ? true : false,
-            false,
-            false,
             $history
         );
     }
@@ -3692,6 +3722,38 @@ function events_get_response_target(
     $event_response = db_get_row('tevent_response', 'id', $response_id);
     $target = io_safe_output($event_response['target']);
 
+    if (strpos($target, '_agent_alias_') !== false) {
+        if ($meta) {
+            $agente_table_name = 'tmetaconsole_agent';
+            $filter = [
+                'id_tagente'            => $event['id_agente'],
+                'id_tmetaconsole_setup' => $server_id,
+            ];
+        } else {
+            $agente_table_name = 'tagente';
+            $filter = ['id_agente' => $event['id_agente']];
+        }
+
+        $alias = db_get_value_filter('alias', $agente_table_name, $filter);
+        $target = str_replace('_agent_alias_', io_safe_output($alias), $target);
+    }
+
+    if (strpos($target, '_agent_name_') !== false) {
+        if ($meta) {
+            $agente_table_name = 'tmetaconsole_agent';
+            $filter = [
+                'id_tagente'            => $event['id_agente'],
+                'id_tmetaconsole_setup' => $server_id,
+            ];
+        } else {
+            $agente_table_name = 'tagente';
+            $filter = ['id_agente' => $event['id_agente']];
+        }
+
+        $name = db_get_value_filter('nombre', $agente_table_name, $filter);
+        $target = str_replace('_agent_name_', io_safe_output($name), $target);
+    }
+
     // Substitute each macro.
     if (strpos($target, '_agent_address_') !== false) {
         if ($meta) {
@@ -3771,7 +3833,7 @@ function events_get_response_target(
     if (strpos($target, '_group_name_') !== false) {
         $target = str_replace(
             '_group_name_',
-            groups_get_name($event['id_grupo'], true),
+            io_safe_output(groups_get_name($event['id_grupo'], true)),
             $target
         );
     }
@@ -3787,7 +3849,7 @@ function events_get_response_target(
     if (strpos($target, '_event_date_') !== false) {
         $target = str_replace(
             '_event_date_',
-            date($config['date_format'], $event['utimestamp']),
+            io_safe_output(date($config['date_format'], $event['utimestamp'])),
             $target
         );
     }
@@ -3811,7 +3873,7 @@ function events_get_response_target(
     if (strpos($target, '_alert_id_') !== false) {
         $target = str_replace(
             '_alert_id_',
-            empty($event['is_alert_am']) ? __('N/A') : $event['is_alert_am'],
+            empty($event['id_alert_am']) ? __('N/A') : $event['id_alert_am'],
             $target
         );
     }
@@ -3893,6 +3955,15 @@ function events_get_response_target(
         $target = str_replace('_current_user_', $config['id_user'], $target);
     }
 
+    // This will replace the macro with the command timeout value.
+    if (strpos($target, '_command_timeout_') !== false) {
+        $target = str_replace(
+            '_command_timeout_',
+            $event_response['command_timeout'],
+            $target
+        );
+    }
+
     return $target;
 }
 
@@ -4095,7 +4166,15 @@ function events_page_details($event, $server='')
     if (!empty($agent)) {
         $data = [];
         $data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('Name').'</div>';
-        if (can_user_access_node()) {
+        if (can_user_access_node() && is_metaconsole() && empty($event['server_id']) === true) {
+            $data[1] = ui_print_truncate_text(
+                $agent['alias'],
+                'agent_medium',
+                true,
+                true,
+                true
+            ).ui_print_help_tip(__('This agent belongs to metaconsole, is not possible display it'), true);
+        } else if (can_user_access_node()) {
             $data[1] = ui_print_agent_name(
                 $event['id_agente'],
                 true,
@@ -4630,16 +4709,24 @@ function events_page_general($event)
     $table_general->data[] = $data;
 
     // If event is validated, show who and when acknowleded it.
+    $table_general->cellclass[8][1] = 'general_acknowleded';
+
     $data = [];
     $data[0] = __('Acknowledged by');
 
     if ($event['estado'] == 1) {
-        $user_ack = db_get_value('fullname', 'tusuario', 'id_user', $event['id_usuario']);
-        if (empty($user_ack)) {
+        $user_ack = db_get_value(
+            'fullname',
+            'tusuario',
+            'id_user',
+            $event['id_usuario']
+        );
+
+        if (empty($user_ack) === true) {
             $user_ack = $event['id_usuario'];
         }
 
-        $date_ack = date($config['date_format'], $event['ack_utimestamp']);
+        $date_ack = io_safe_output($event['ack_utimestamp']);
         $data[1] = $user_ack.' ('.$date_ack.')';
     } else {
         $data[1] = '<i>'.__('N/A').'</i>';
@@ -6973,7 +7060,7 @@ function events_get_field_value_by_event_id(
     if (strpos($value, '_group_name_') !== false) {
         $value = str_replace(
             '_group_name_',
-            groups_get_name($event['id_grupo'], true),
+            io_safe_output(groups_get_name($event['id_grupo'], true)),
             $value
         );
     }
@@ -6989,7 +7076,9 @@ function events_get_field_value_by_event_id(
     if (strpos($value, '_event_date_') !== false) {
         $value = str_replace(
             '_event_date_',
-            date($config['date_format'], $event['utimestamp']),
+            io_safe_output(
+                date($config['date_format'], $event['utimestamp'])
+            ),
             $value
         );
     }
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 4fd1439f8f..f40b75e3b2 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -2541,13 +2541,9 @@ function graphic_agentaccess(
     } else {
         $options['generals']['pdf']['width'] = 350;
         $options['generals']['pdf']['height'] = 125;
-        if (!empty($data_array)) {
-            $imgbase64 = '<img src="data:image/jpg;base64,';
-            $imgbase64 .= vbar_graph($data_array, $options, 2);
-            $imgbase64 .= '" />';
-        } else {
-            $imgbase64 .= vbar_graph($data_array, $options, 2);
-        }
+        $imgbase64 = '<img src="data:image/jpg;base64,';
+        $imgbase64 .= vbar_graph($data_array, $options, 2);
+        $imgbase64 .= '" />';
 
         return $imgbase64;
     }
diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php
index b6c1a5e6c9..bfbf8b5193 100644
--- a/pandora_console/include/functions_groups.php
+++ b/pandora_console/include/functions_groups.php
@@ -104,7 +104,7 @@ function groups_check_used($idGroup)
 
     if ($numRows > 0) {
         $return['return'] = true;
-        $return['tables'][] = __('Recon task');
+        $return['tables'][] = __('Discovery task');
     }
 
     switch ($config['dbtype']) {
@@ -266,48 +266,25 @@ function groups_check_used($idGroup)
 
 
 /**
- * Return a array of id_group of childrens (to branches down)
- *
- * @param integer $parent The id_group parent to search the childrens.
- * @param array   $groups The groups, its for optimize the querys to DB.
- */
-function groups_get_childrens_ids($parent, $groups=null)
-{
-    if (empty($groups)) {
-        $groups = db_get_all_rows_in_table('tgrupo');
-    }
-
-    $return = '';
-
-    foreach ($groups as $key => $group) {
-        if ($group['id_grupo'] == 0) {
-            continue;
-        }
-
-        if ($group['parent'] == $parent) {
-            $return .= $group['id_grupo'].',';
-            $propagate = db_get_value('propagate', 'tgrupo', 'id_grupo', $group['id_grupo']);
-            if ($propagate) {
-                $return .= groups_get_childrens_ids($group['id_grupo']);
-            }
-        }
-    }
-
-    return $return;
-}
-
-
-/**
- * Return a array of id_group of children of given parent.
+ * Return a array of id_group of children of given parent INCLUDING PARENT!!.
  *
  * @param integer $parent          The id_grupo parent to search its children.
  * @param array   $ignorePropagate Ignore propagate.
+ * @param string  $privilege       Default privilege.
+ * @param boolean $selfInclude     Include group "id_parent" in return.
+ *
+ * @return array Of Groups, children of $parent.
  */
-function groups_get_children($parent, $ignorePropagate=false)
-{
+function groups_get_children(
+    $parent,
+    $ignorePropagate=false,
+    $privilege='AR',
+    $selfInclude=true
+) {
     static $groups;
+    static $user_groups;
 
-    if (empty($groups)) {
+    if (empty($groups) === true) {
         $aux_groups = [];
         $groups = db_get_all_rows_in_table('tgrupo');
         foreach ($groups as $key => $value) {
@@ -317,19 +294,45 @@ function groups_get_children($parent, $ignorePropagate=false)
         $groups = $aux_groups;
     }
 
+    if (empty($user_groups) === true) {
+        $user_groups = users_get_groups(false, $privilege, true);
+    }
+
+    // Admin see always all groups.
+    $ignorePropagate = users_is_admin() || $ignorePropagate;
+
+    // Prepare array.
     $return = [];
+
+    if ($selfInclude === true) {
+        if (array_key_exists($parent, $user_groups) === true) {
+            $return[$parent] = $groups[$parent];
+        }
+    }
+
     foreach ($groups as $key => $g) {
         if ($g['id_grupo'] == 0) {
             continue;
         }
 
-        if ($ignorePropagate || $parent == 0 || $groups[$parent]['propagate']) {
+        // IgnorePropagate will be true if user can access child.
+        $allowed = $ignorePropagate || array_key_exists(
+            $g['id_grupo'],
+            $user_groups
+        );
+
+        if ($allowed === true
+            || (int) $parent === 0
+            || (bool) $groups[$parent]['propagate'] === true
+        ) {
             if ($g['parent'] == $parent) {
                 $return += [$g['id_grupo'] => $g];
                 if ($g['propagate'] || $ignorePropagate) {
                     $return += groups_get_children(
                         $g['id_grupo'],
-                        $ignorePropagate
+                        $ignorePropagate,
+                        $privilege,
+                        $selfInclude
                     );
                 }
             }
@@ -340,38 +343,6 @@ function groups_get_children($parent, $ignorePropagate=false)
 }
 
 
-/**
- * @deprecated This is not working. Expects 'propagate' on CHILD not on PARENT!!!
- *
- * Return a array of id_group of childrens (to branches down)
- *
- * @param integer $parent The id_group parent to search the childrens.
- * @param array   $groups The groups, its for optimize the querys to DB.
- */
-function groups_get_childrens($parent, $groups=null, $onlyPropagate=false)
-{
-    if (empty($groups)) {
-        $groups = db_get_all_rows_in_table('tgrupo');
-    }
-
-    $return = [];
-
-    foreach ($groups as $key => $group) {
-        if ($group['id_grupo'] == 0) {
-            continue;
-        }
-
-        if ($group['propagate'] || $onlyPropagate) {
-            if ($group['parent'] == $parent) {
-                $return = ($return + [$group['id_grupo'] => $group] + groups_get_childrens($group['id_grupo'], $groups, $onlyPropagate));
-            }
-        }
-    }
-
-    return $return;
-}
-
-
 /**
  * Return a array of id_group of parents (to roots up).
  *
@@ -534,42 +505,30 @@ function groups_get_all($groupWithAgents=false)
 
 
 /**
- * Get all groups recursive from an initial group.
+ * Get all groups recursive from an initial group  INCLUDING PARENT!!.
  *
- * @param int Id of the parent group
- * @param bool Whether to force recursive search ignoring propagation (true) or not (false)
+ * @param integer $id_parent       Id of the parent group.
+ * @param boolean $ignorePropagate Whether to force recursive search ignoring
+ *                                 propagation (true) or not (false).
+ * @param boolean $selfInclude     Include group "id_parent" in return.
+ * @param string  $privilege       Privilege flag to search for default 'AR'.
  *
- * @return array with all result groups
+ * @return array With all result groups.
  */
-function groups_get_id_recursive($id_parent, $all=false)
-{
-    $return = [];
+function groups_get_children_ids(
+    $id_parent,
+    $ignorePropagate=false,
+    $selfInclude=true,
+    $privilege='AR'
+) {
+    $return = groups_get_children(
+        $id_parent,
+        $ignorePropagate,
+        $privilege,
+        $selfInclude
+    );
 
-    $return = array_merge($return, [$id_parent]);
-
-    // Check propagate
-    $propagate = db_get_value_filter('propagate', 'tgrupo', ['id_grupo' => $id_parent]);
-
-    if (($propagate == 1) || $all) {
-        $children = db_get_all_rows_filter('tgrupo', ['parent' => $id_parent, 'disabled' => 0], ['id_grupo']);
-
-        if ($children === false) {
-            $children = [];
-        } else {
-            $temp = [];
-            foreach ($children as $id_children) {
-                $temp = array_merge($temp, [$id_children['id_grupo']]);
-            }
-
-            $children = $temp;
-        }
-
-        foreach ($children as $id_children) {
-            $return = array_merge($return, groups_get_id_recursive($id_children, $all));
-        }
-    }
-
-    return $return;
+    return array_keys($return);
 }
 
 
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 092044765c..3edbea17d3 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -428,7 +428,7 @@ function html_print_select_style($fields, $name, $selected='', $style='', $scrip
  * @param boolean $disabled                Disabled or enabled.
  * @param boolean $style                   CSS inline style.
  * @param string  $option_style            CSS inline style in array format.
- * @param array   $id_group                Groups to be manually added.
+ * @param integer $id_group                Exclude group branch from id_group.
  * @param string  $keys_field              Field to be used as array key, (id).
  * @param boolean $strict_user             Strict.
  * @param array   $delete_groups           Remove groups from select.
@@ -500,6 +500,15 @@ function html_print_select_groups(
         $name = 'group_select'.$idcounter[$name];
     }
 
+    if ($id_group !== false) {
+        $children = groups_get_children($id_group);
+        foreach ($children as $child) {
+            $delete_groups[] = $child['id_grupo'];
+        }
+
+        $delete_groups[] = $id_group;
+    }
+
     $fields = [];
     // Preload selector.
     if (is_array($selected) === false) {
@@ -510,7 +519,15 @@ function html_print_select_groups(
         }
     } else {
         foreach ($selected as $k) {
-            $fields[$k] = groups_get_name($k);
+            if ($k === null || $k === '') {
+                continue;
+            }
+
+            $fields[$k] = groups_get_name($k, $returnAllGroup);
+        }
+
+        if (empty($fields) === true && $returnAllGroup) {
+            $fields[0] = groups_get_name(null, true);
         }
     }
 
@@ -896,28 +913,45 @@ function html_print_select_multiple_filtered(
         $sections = [];
     }
 
-    if (empty($sections['filters']) === true) {
+    if (isset($sections['filters']) === false) {
         $sections['filters'] = 1;
     }
 
-    if (empty($sections['group-filter']) === true) {
+    // Show/hide all left/rigth sfilters.
+    if (isset($sections['item-selected-filters']) === false) {
+        $sections['item-selected-filters'] = 1;
+    }
+
+    if (isset($sections['item-available-filters']) === false) {
+        $sections['item-available-filters'] = 1;
+    }
+
+    if (isset($sections['group-filter']) == false) {
         $sections['group-filter'] = 1;
     }
 
-    if (empty($sections['item-available-filter']) === true) {
+    if (isset($sections['item-available-filter']) === false) {
         $sections['item-available-filter'] = 1;
     }
 
-    if (empty($sections['item-selected-filter']) === true) {
+    if (isset($sections['item-selected-filter']) === false) {
         $sections['item-selected-filter'] = 1;
     }
 
-    if (empty($group_filter) === true) {
+    if (isset($group_filter) === false) {
         $sections['group-filter'] = 0;
     }
 
+    if (isset($group_filter['nothing']) === false) {
+        $group_filter['nothing'] = '';
+    }
+
+    if (isset($group_filter['nothing_value']) === false) {
+        $group_filter['nothing_value'] = 0;
+    }
+
     // Main container.
-    $output = '<div class="multi-select flex-row-vcenter '.$class.'">';
+    $output = '<div class="multi-select flex-row-end '.$class.'">';
 
     // Left box.
     $output .= '<div class="multi-select-container flex-column">';
@@ -926,6 +960,7 @@ function html_print_select_multiple_filtered(
     // Filtering.
     if (isset($sections['filters']) === true
         && $sections['filters'] === 1
+        && $sections['item-available-filters'] === 1
     ) {
         // Filtering.
         if (isset($sections['group-filter']) === true
@@ -945,6 +980,7 @@ function html_print_select_multiple_filtered(
 
             $output .= html_print_input(
                 [
+                    'input_class'    => 'flex-row-vcenter',
                     'label'          => __('Filter group'),
                     'name'           => 'id-group-available-select-'.$rid,
                     'returnAllGroup' => true,
@@ -952,16 +988,20 @@ function html_print_select_multiple_filtered(
                     'type'           => 'select_groups',
                     'return'         => true,
                     'script'         => $reload_content,
+                    'nothing'        => $group_filter['nothing'],
+                    'nothing_value'  => $group_filter['nothing_value'],
                 ]
             );
 
             $output .= html_print_input(
                 [
-                    'label'  => __('Group recursion'),
-                    'name'   => 'id-group-recursion-available-select-'.$rid,
-                    'type'   => 'checkbox',
-                    'script' => $reload_content,
-                    'return' => true,
+                    'label'       => __('Group recursion'),
+                    'input_class' => 'flex-row-vcenter',
+                    'name'        => 'id-group-recursion-available-select-'.$rid,
+                    'id'          => 'checkbox-id-group-recursion-available-select-'.$rid,
+                    'type'        => 'switch',
+                    'onchange'    => $reload_content,
+                    'return'      => true,
                 ]
             );
 
@@ -1070,6 +1110,7 @@ function html_print_select_multiple_filtered(
     // Filtering.
     if (isset($sections['filters']) === true
         && $sections['filters'] === 1
+        && $sections['item-selected-filters']
     ) {
         if (isset($sections['group-filter']) === true
             && $sections['group-filter'] === 1
@@ -1088,6 +1129,7 @@ function html_print_select_multiple_filtered(
 
             $output .= html_print_input(
                 [
+                    'input_class'    => 'flex-row-vcenter',
                     'label'          => __('Filter group'),
                     'name'           => 'id-group-selected-select-'.$rid,
                     'returnAllGroup' => true,
@@ -1100,11 +1142,12 @@ function html_print_select_multiple_filtered(
 
             $output .= html_print_input(
                 [
-                    'label'  => __('Group recursion'),
-                    'name'   => 'id-group-recursion-selected-select-'.$rid,
-                    'type'   => 'checkbox',
-                    'script' => $reload_content,
-                    'return' => true,
+                    'input_class' => 'flex-row-vcenter',
+                    'label'       => __('Group recursion'),
+                    'name'        => 'id-group-recursion-selected-select-'.$rid,
+                    'type'        => 'checkbox',
+                    'script'      => $reload_content,
+                    'return'      => true,
                 ]
             );
 
@@ -1135,7 +1178,7 @@ function html_print_select_multiple_filtered(
                     'label'       => __($texts['filter-item']),
                     'name'        => 'filter-item-selected-'.$rid,
                     'onKeyUp'     => $f,
-                    'input_class' => 'filter w100p',
+                    'input_class' => 'flex-row-vcenter filter w100p',
                     'size'        => 20,
                     'type'        => 'text',
                     'return'      => true,
@@ -1351,6 +1394,7 @@ function html_print_select_multiple_modules_filtered(array $data):string
  * @param mixed   $size           Max elements showed in select or default (size=10)
  * @param integer $truncante_size Truncate size of the element, by default is set to GENERIC_SIZE_TEXT constant
  * @param integer $class          Class to apply.
+ * @param boolean $required       Select is required or not.
  *
  * @return string HTML code if return parameter is true.
  */
@@ -1368,7 +1412,8 @@ function html_print_select_from_sql(
     $style=false,
     $size=false,
     $trucate_size=GENERIC_SIZE_TEXT,
-    $class=''
+    $class='',
+    $required=false
 ) {
     global $config;
 
@@ -1404,7 +1449,17 @@ function html_print_select_from_sql(
         $disabled,
         $style,
         '',
-        $size
+        $size,
+        // Modal.
+        false,
+        // Message.
+        '',
+        // Select_all.
+        false,
+        // Simple_multiple_options.
+        false,
+        // Required.
+        $required
     );
 }
 
@@ -2015,6 +2070,7 @@ function html_print_input_text_extended(
         'required',
         'autocomplete',
         'form',
+        'list',
     ];
 
     $output = '<input '.($password ? 'type="password" autocomplete="'.$autocomplete.'" ' : 'type="text" ');
@@ -2150,6 +2206,55 @@ function html_print_div($options, $return=false)
 }
 
 
+/**
+ * Render an anchor html element.
+ *
+ * @param array   $options Parameters
+ *                - id: string
+ *                - style: string
+ *                - title: string
+ *                - href: string.
+ * @param boolean $return  Return or echo flag.
+ *
+ * @return string HTML code if return parameter is true.
+ */
+function html_print_anchor(
+    array $options,
+    bool $return=false
+) {
+    $output = '<a ';
+
+    // Valid attributes (invalid attributes get skipped).
+    $attrs = [
+        'id',
+        'style',
+        'class',
+        'title',
+    ];
+
+    $output .= (isset($options['href']) === true) ? 'href="'.io_safe_input_html($options['href']).'"' : ui_get_full_url();
+
+    foreach ($attrs as $attribute) {
+        if (isset($options[$attribute])) {
+            $output .= ' '.$attribute.'="'.io_safe_input_html($options[$attribute]).'"';
+        }
+    }
+
+    $output .= '>';
+
+    $output .= (isset($options['content']) === true) ? io_safe_input_html($options['content']) : '';
+
+    $output .= '</a>';
+
+    if ($return === true) {
+        return $output;
+    } else {
+        echo $output;
+    }
+
+}
+
+
 /**
  * Render an input password element.
  *
@@ -2240,7 +2345,8 @@ function html_print_input_text(
     $onKeyDown='',
     $formTo='',
     $onKeyUp='',
-    $disabled=false
+    $disabled=false,
+    $list=''
 ) {
     if ($maxlength == 0) {
         $maxlength = 255;
@@ -2285,6 +2391,10 @@ function html_print_input_text(
         $attr['form'] = $formTo;
     }
 
+    if ($list != '') {
+        $attr['list'] = $list;
+    }
+
     return html_print_input_text_extended(
         $name,
         $value,
@@ -4194,8 +4304,16 @@ function html_print_input($data, $wrapper='div', $input_only=false)
         }
     }
 
+    // If wrapper has attributes.
+    // TODO. There is possible improve this handle of attributes.
+    if (isset($data['wrapper_attributes'])) {
+        $wrapper_attributes = $data['wrapper_attributes'];
+    } else {
+        $wrapper_attributes = '';
+    }
+
     if (isset($data['wrapper']) === true) {
-        $output = '<'.$data['wrapper'].' id="wr_'.$data['name'].'" ';
+        $output = '<'.$data['wrapper'].' '.$wrapper_attributes.' id="wr_'.$data['name'].'" ';
         $output .= ' class="'.$data['input_class'].'">';
     }
 
@@ -4217,7 +4335,9 @@ function html_print_input($data, $wrapper='div', $input_only=false)
                 ((isset($data['autofocus']) === true) ? $data['autofocus'] : false),
                 ((isset($data['onKeyDown']) === true) ? $data['onKeyDown'] : ''),
                 ((isset($data['form']) === true) ? $data['form'] : ''),
-                ((isset($data['onKeyUp']) === true) ? $data['onKeyUp'] : '')
+                ((isset($data['onKeyUp']) === true) ? $data['onKeyUp'] : ''),
+                ((isset($data['disabled']) === true) ? $data['disabled'] : false),
+                ((isset($data['list']) === true) ? $data['list'] : '')
             );
         break;
 
@@ -4363,7 +4483,8 @@ function html_print_input($data, $wrapper='div', $input_only=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),
-                ((isset($data['class']) === true) ? $data['class'] : '')
+                ((isset($data['class']) === true) ? $data['class'] : ''),
+                ((isset($data['required']) === true) ? $data['required'] : false)
             );
         break;
 
@@ -4714,6 +4835,14 @@ function html_print_input($data, $wrapper='div', $input_only=false)
             $output .= html_print_select_multiple_modules_filtered($data);
         break;
 
+        case 'datalist':
+            $output .= html_print_datalist(
+                $data['name'],
+                $data['value'],
+                ((isset($data['return']) === true) ? $data['return'] : true)
+            );
+        break;
+
         default:
             // Ignore.
         break;
@@ -4894,3 +5023,32 @@ function html_print_tabs(array $tabs)
 
     return $result;
 }
+
+
+/**
+ * Create a datalist.
+ *
+ * @param string $id          Use custom id.
+ * @param string $values      Input values.
+ * @param string $returnparam Whether to return an output string or echo now (optional, echo by default).
+ *
+ * @return string HTML code if return parameter is true.
+ */
+function html_print_datalist(
+    $id,
+    $values,
+    $return=false
+) {
+    $result = '<datalist id="'.$id.'">';
+    foreach ($values as $key => $value) {
+        $result .= '<option value="'.$value.'">';
+    }
+
+    $result .= '</datalist>';
+
+    if ($return) {
+        return $result;
+    } else {
+        echo $result;
+    }
+}
diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php
index 6390f78f96..336e9480dd 100755
--- a/pandora_console/include/functions_io.php
+++ b/pandora_console/include/functions_io.php
@@ -116,6 +116,13 @@ function io_safe_input($value)
     // TICKET: 1223
     $valueHtmlEncode = str_replace('&deg;', '&#176;', $valueHtmlEncode);
 
+    // Fixed the ¿ charater.
+    $valueHtmlEncode = str_replace('&iquest;', '¿', $valueHtmlEncode);
+    // Fixed the ¡ charater.
+    $valueHtmlEncode = str_replace('&iexcl;', '¡', $valueHtmlEncode);
+    // Fixed the € charater.
+    $valueHtmlEncode = str_replace('&euro;', '€', $valueHtmlEncode);
+
     // Replace some characteres for html entities
     for ($i = 0; $i < 33; $i++) {
         $valueHtmlEncode = str_ireplace(
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 9a5ea93f92..ec58db59e7 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -2359,9 +2359,10 @@ function modules_get_agentmodule_data_for_humans($module)
         } else {
             $salida = ui_print_module_string_value(
                 $module['datos'],
-                $module['id_agente_modulo'],
+                $module['id'],
                 $module['current_interval'],
-                $module['module_name']
+                $module['module_name'],
+                $module['serverID'] ? $module['serverID'] : 0
             );
         }
     }
@@ -2494,6 +2495,8 @@ function modules_get_color_status($status, $force_module=false)
         case STATUS_AGENT_CRITICAL:
         case STATUS_MODULE_CRITICAL_BALL:
         case STATUS_AGENT_CRITICAL_BALL:
+        case STATUS_SERVER_CRASH:
+        case STATUS_SERVER_CRASH_BALL:
         return COL_CRITICAL;
 
         case AGENT_MODULE_STATUS_WARNING:
@@ -3393,16 +3396,16 @@ function recursive_get_dt_from_modules_tree(&$f_modules, $modules, $deep)
 
 /**
  * @brief Get the button with the link to open realtime stats into a new window
- *        Only to native (not satellite discovered) snmp modules.
+ * Only to native (not satellite discovered) snmp modules.
  *
- * @param  array With all the module info
- * @return string All the HTML code to paint the button
+ * @param  array $module With all the module info.
+ * @return string Link to chart.
  */
 function get_module_realtime_link_graph($module)
 {
     global $config;
 
-    // Sometimes some parameters are renamed
+    // Sometimes some parameters are renamed.
     if (!isset($module['id_tipo_modulo'])) {
         $module['id_tipo_modulo'] = $module['module_type'];
     }
@@ -3411,36 +3414,51 @@ function get_module_realtime_link_graph($module)
         $module['nombre'] = $module['module_name'];
     }
 
-    // Avoid to show on metaconsole
+    // Avoid to show on metaconsole.
     if (is_metaconsole()) {
         return '';
     }
 
-    // Realtime graph is an extension and it should be enabled
+    // Realtime graph is an extension and it should be enabled.
     if (!extensions_is_enabled_extension('realtime_graphs.php')) {
         return '';
     }
 
-    // Only to remote_snmp, remote_snmp_proc. snmp_snmp_inc
-    if ($module['id_tipo_modulo'] != 15 && $module['id_tipo_modulo'] != 16 && $module['id_tipo_modulo'] != 18) {
+    // Only to remote_snmp, remote_snmp_proc. snmp_snmp_inc.
+    if ($module['id_tipo_modulo'] != 15
+        && $module['id_tipo_modulo'] != 16
+        && $module['id_tipo_modulo'] != 18
+    ) {
         return '';
     }
 
-    // Only version 1, 2 and 2c
-    if ($module['tcp_send'] != '1' && $module['tcp_send'] != '2' && $module['tcp_send'] != '2c') {
+    // Only version 1, 2, 2c and 3
+    if ($module['tcp_send'] != '1'
+        && $module['tcp_send'] != '2'
+        && $module['tcp_send'] != '2c'
+        && $module['tcp_send'] != '3'
+    ) {
         return '';
     }
 
     $params = [
-        'graph'          => 'snmp_module',
-        'agent_alias'    => urlencode(modules_get_agentmodule_agent_alias($module['id_agente_modulo'])),
-        'module_name'    => urlencode($module['nombre']),
-        'snmp_address'   => $module['ip_target'],
-        'snmp_community' => urlencode($module['snmp_community']),
-        'snmp_oid'       => $module['snmp_oid'],
-        'snmp_ver'       => $module['tcp_send'],
-        'hide_header'    => 1,
-        'rel_path'       => '../../',
+        'graph'                => 'snmp_module',
+        'agent_alias'          => urlencode(
+            modules_get_agentmodule_agent_alias($module['id_agente_modulo'])
+        ),
+        'module_name'          => urlencode($module['nombre']),
+        'target_ip'            => $module['ip_target'],
+        'community'            => urlencode($module['snmp_community']),
+        'starting_oid'         => urlencode($module['snmp_oid']),
+        'snmp_browser_version' => urlencode($module['tcp_send']),
+        'snmp3_auth_user'      => urlencode($module['plugin_user']),
+        'snmp3_security_level' => urlencode($module['custom_string_3']),
+        'snmp3_auth_method'    => urlencode($module['plugin_parameters']),
+        'snmp3_auth_pass'      => urlencode($module['plugin_pass']),
+        'snmp3_privacy_method' => urlencode($module['custom_string_1']),
+        'snmp3_privacy_pass'   => urlencode($module['custom_string_2']),
+        'hide_header'          => 1,
+        'rel_path'             => '../../',
     ];
     // Incremental type
     if ($module['id_tipo_modulo'] == 16) {
@@ -3454,9 +3472,13 @@ function get_module_realtime_link_graph($module)
 
     $link = substr($link, 0, -1);
 
-    $win_handle = 'realtime_'.dechex(crc32($module['id_agente_modulo'].$module['nombre']));
+    $win_handle = 'realtime_';
+    $win_handle .= dechex(
+        crc32($module['id_agente_modulo'].$module['nombre'])
+    );
 
-    $link_button = '<a href="javascript:winopeng_var(\''.$link.'\',\''.$win_handle.'\', 900, 480)">'.html_print_image(
+    $link_button = '<a href="javascript:winopeng_var(\''.$link.'\',\''.$win_handle.'\', 900, 480)">';
+    $link_button .= html_print_image(
         'images/realtime_shortcut.png',
         true,
         [
@@ -3464,7 +3486,8 @@ function get_module_realtime_link_graph($module)
             'alt'    => '',
             'title'  => __('Realtime SNMP graph'),
         ]
-    ).'</a>';
+    );
+    $link_button .= '</a>';
 
     return $link_button;
 }
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index 56172331c6..bd5152576d 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -319,7 +319,7 @@ function networkmap_generate_dot(
         if ($dont_show_subgroups) {
             $filter['id_grupo'] = $group;
         } else {
-            $childrens = groups_get_childrens($group, null, true);
+            $childrens = groups_get_children($group, null, true);
             if (!empty($childrens)) {
                 $childrens = array_keys($childrens);
 
diff --git a/pandora_console/include/functions_planned_downtimes.php b/pandora_console/include/functions_planned_downtimes.php
index a9b701241b..7ce2b424ad 100644
--- a/pandora_console/include/functions_planned_downtimes.php
+++ b/pandora_console/include/functions_planned_downtimes.php
@@ -246,12 +246,10 @@ function planned_downtimes_get_malformed()
     $sql = "SELECT *
 			FROM tplanned_downtime
 			WHERE type_execution = 'periodically'
-				AND ((type_periodicity = 'monthly'
+				AND (type_periodicity = 'monthly'
 						AND (periodically_day_from > periodically_day_to
 							OR (periodically_day_from = periodically_day_to
-								AND periodically_time_from >= periodically_time_to)))
-					OR (type_periodicity = 'weekly'
-						AND periodically_time_from >= periodically_time_to))";
+								AND periodically_time_from >= periodically_time_to)))";
     $malformed_downtimes = db_get_all_rows_sql($sql);
 
     if ($malformed_downtimes === false) {
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 0bfe96e864..e5e7d42c46 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -694,6 +694,13 @@ function reporting_make_reporting_data(
                 );
             break;
 
+            case 'permissions_report':
+                $report['contents'][] = reporting_permissions(
+                    $report,
+                    $content
+                );
+            break;
+
             case 'group_report':
                 $report['contents'][] = reporting_group_report(
                     $report,
@@ -1840,10 +1847,23 @@ function reporting_event_report_group(
         $history = true;
     }
 
-    $return['title'] = $content['name'];
+    $group_name = groups_get_name($content['id_group'], true);
+
+    $items_label = ['agent_group' => $group_name];
+
+    // Apply macros.
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
-    $return['subtitle'] = groups_get_name($content['id_group'], true);
+    $return['subtitle'] = $group_name;
     if (!empty($content['style']['event_filter_search'])) {
         $return['subtitle'] .= ' ('.$content['style']['event_filter_search'].')';
     }
@@ -2122,7 +2142,16 @@ function reporting_event_report_module(
         'module_description' => $module_description,
     ];
 
-    $return['title'] = $content['name'];
+    // Apply macros.
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_alias.' - '.io_safe_output($module_name);
@@ -2230,18 +2259,44 @@ function reporting_inventory_changes($report, $content, $type)
         metaconsole_connect($server);
     }
 
-    $return['title'] = $content['name'];
+    $es = json_decode($content['external_source'], true);
+
+    $id_agent = $es['id_agents'];
+    $module_name = $es['inventory_modules'];
+    $id_agent_module = modules_get_agentmodule_id($module_name, $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);
+    $module_description = modules_get_agentmodule_descripcion(
+        $id_agent_module
+    );
+
+    $items_label = [
+        '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,
+    ];
+
+     // Apply macros.
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = agents_get_alias($content['id_agent']);
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
 
-    $es = json_decode($content['external_source'], true);
-
-    $id_agent = $es['id_agents'];
-    $module_name = $es['inventory_modules'];
-
     switch ($type) {
         case 'data':
             $inventory_changes = inventory_get_changes(
@@ -2299,12 +2354,6 @@ function reporting_inventory($report, $content, $type)
         metaconsole_connect($server);
     }
 
-    $return['title'] = $content['name'];
-    $return['landscape'] = $content['landscape'];
-    $return['pagebreak'] = $content['pagebreak'];
-    $return['description'] = $content['description'];
-    $return['date'] = reporting_get_date_text($report, $content);
-
     $es = json_decode($content['external_source'], true);
 
     $id_agent = $es['id_agents'];
@@ -2313,6 +2362,35 @@ function reporting_inventory($report, $content, $type)
         $module_name = [0 => 0];
     }
 
+    $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,
+    ];
+
+    // Apply macros.
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
+    $return['landscape'] = $content['landscape'];
+    $return['pagebreak'] = $content['pagebreak'];
+    $return['description'] = $content['description'];
+    $return['date'] = reporting_get_date_text($report, $content);
+
     $date = $es['date'];
     $description = $content['description'];
 
@@ -2942,8 +3020,21 @@ function reporting_group_report($report, $content)
         $connection = metaconsole_get_connection($server);
     }
 
+    $items_label = [
+        'agent_group' => groups_get_name($content['id_group'], true),
+    ];
+
+     // Apply macros
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
     $return['server_name'] = $server[0];
-    $return['title'] = io_safe_output($content['name']);
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = groups_get_name($content['id_group'], true);
@@ -2957,7 +3048,7 @@ function reporting_group_report($report, $content)
     if (empty($id_group)) {
         $events = [];
     } else {
-        $sql_where = sprintf(' AND id_grupo IN (%s) AND estado<>1 ', implode(',', $id_group));
+        $sql_where = sprintf(' WHERE id_grupo IN (%s) AND estado<>1 ', implode(',', $id_group));
         $events = events_get_events_grouped(
             $sql_where,
             0,
@@ -2972,7 +3063,11 @@ function reporting_group_report($report, $content)
 
     $return['data']['count_events'] = count($events);
 
-    $return['data']['group_stats'] = reporting_get_group_stats($content['id_group']);
+    $return['data']['group_stats'] = reporting_get_group_stats(
+        $content['id_group'],
+        'AR',
+        (bool) $content['recursion']
+    );
 
     if ($config['metaconsole']) {
         metaconsole_restore_db();
@@ -3034,6 +3129,15 @@ function reporting_event_report_agent(
         'agent_alias'       => $agent_alias,
     ];
 
+    // Apply macros.
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
     if ($config['metaconsole']) {
         metaconsole_restore_db();
     }
@@ -3047,7 +3151,7 @@ function reporting_event_report_agent(
     }
 
     $return['label'] = $label;
-    $return['title'] = io_safe_output($content['name']);
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = io_safe_output($agent_alias);
@@ -3258,7 +3362,16 @@ function reporting_historical_data($report, $content)
         'module_description' => $module_description,
     ];
 
-    $return['title'] = $content['name'];
+    // Apply macros.
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_alias.' - '.$module_name;
@@ -3383,7 +3496,16 @@ function reporting_database_serialized($report, $content)
         'module_description' => $module_description,
     ];
 
-    $return['title'] = $content['name'];
+    // Apply macros.
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_alias.' - '.$module_name;
@@ -3537,7 +3659,37 @@ function reporting_last_value($report, $content)
         $content['id_agent_module']
     );
 
-    $return['title'] = $content['name'];
+    $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);
+
+    $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,
+    ];
+
+     // Apply macros
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_alias.' - '.$module_name;
@@ -3573,6 +3725,128 @@ function reporting_last_value($report, $content)
 }
 
 
+function reporting_permissions($report, $content)
+{
+    global $config;
+
+    $return['type'] = 'permissions_report';
+
+    if (empty($content['name'])) {
+        $content['name'] = __('Permissions report');
+    }
+
+    $return['title'] = $content['name'];
+    $return['landscape'] = $content['landscape'];
+    $return['pagebreak'] = $content['pagebreak'];
+    $return['description'] = $content['description'];
+    $return['date'] = reporting_get_date_text($report, $content);
+
+    $external_source = io_safe_input(json_decode($content['external_source'], true));
+    $id_users = $external_source['id_users'];
+    $id_groups = $external_source['users_groups'];
+
+    // Select subtype: group by user or by group.
+    $select_by_group = $external_source['select_by_group'];
+    $return['subtype'] = (int) $select_by_group;
+
+    if ($select_by_group === REPORT_PERMISSIONS_NOT_GROUP_BY_GROUP) {
+        foreach ($id_users as $id_user) {
+            $user_name = db_get_value_filter('fullname', 'tusuario', ['id_user' => $id_user]);
+
+            $sql = sprintf(
+                "SELECT name, id_grupo FROM tusuario_perfil
+                INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil
+                WHERE tusuario_perfil.id_usuario like '%s'",
+                $id_user
+            );
+
+            $profiles = db_get_all_rows_sql($sql);
+
+            $user_profiles = [];
+            if (empty($profiles)) {
+                $user_profiles[] = __('The user doesn\'t have any assigned profile/group');
+            } else {
+                foreach ($profiles as $user_profile) {
+                    $user_profiles[] = $user_profile['name'].' / '.groups_get_name($user_profile['id_grupo'], true);
+                }
+            }
+
+            $data[] = [
+                'user_id'       => io_safe_output($id_user),
+                'user_name'     => io_safe_output($user_name),
+                'user_profiles' => io_safe_output($user_profiles),
+            ];
+        }
+    } else {
+        $group_users = [];
+        foreach ($id_groups as $id_group) {
+            if ($id_group === '') {
+                $group_name = __('Unnasigned group');
+                $sql = 'SELECT tusuario.id_user, tusuario.fullname FROM tusuario 
+                        LEFT OUTER JOIN tusuario_perfil
+                        ON tusuario.id_user = tusuario_perfil.id_usuario
+                        WHERE tusuario_perfil.id_usuario IS NULL';
+                $group_users = db_get_all_rows_sql($sql);
+                $group_name = __('Unassigned group');
+            } else {
+                $group_name = groups_get_name($id_group, true);
+                $group_users = users_get_user_users(
+                    $id_group,
+                    'AR',
+                    false,
+                    [
+                        'id_user',
+                        'fullname',
+
+                    ],
+                    [$id_group]
+                );
+            }
+
+            $row['users'] = [];
+            foreach ($group_users as $user) {
+                 $id_user = $user['id_user'];
+
+                // Get user fullanme.
+                $row['users'][$id_user]['fullname'] = $user['fullname'];
+
+                if ($id_group === '') {
+                    $row['users'][$id_user]['profiles'][] = __('The user doesn\'t have any assigned profile/group');
+                } else {
+                    // Incluide id group = 0 for 'All' profile.
+                    $sql = sprintf(
+                        "SELECT id_perfil FROM tusuario_perfil 
+                            WHERE id_usuario LIKE '%s' 
+                            AND (
+                                id_grupo LIKE '%s'
+                                OR id_grupo LIKE '0'
+                                )",
+                        $id_user,
+                        $id_group
+                    );
+
+                    $user_profiles_id  = db_get_all_rows_sql($sql);
+
+                    foreach ($user_profiles_id as $profile_id) {
+                        $row['users'][$id_user]['profiles'][] = profile_get_name($profile_id['id_perfil']);
+                    }
+                }
+            }
+
+            $data[] = [
+                'group_name' => $group_name,
+                'users'      => $row['users'],
+            ];
+        }
+    }
+
+    $return['data'] = [];
+    $return['data'] = $data;
+
+    return reporting_check_structure_content($return);
+}
+
+
 function reporting_group_configuration($report, $content)
 {
     global $config;
@@ -3592,7 +3866,18 @@ function reporting_group_configuration($report, $content)
 
     $group_name = groups_get_name($content['id_group'], true);
 
-    $return['title'] = $content['name'];
+    $items_label = ['agent_group' => $group_name];
+
+    // Apply macros.
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $group_name;
@@ -3667,7 +3952,18 @@ function reporting_network_interfaces_report($report, $content, $type='dinamic',
 
     $group_name = groups_get_name($content['id_group']);
 
-    $return['title'] = $content['name'];
+    $items_label = ['_agentgroup_' => $group_name];
+
+      // Apply macros
+      $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $group_name;
@@ -3903,7 +4199,18 @@ function reporting_alert_report_group($report, $content)
 
     $group_name = groups_get_name($content['id_group'], true);
 
-    $return['title'] = $content['name'];
+    $items_label = ['agent_group' => $group_name];
+
+    // Apply macros.
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $group_name;
@@ -3912,7 +4219,7 @@ function reporting_alert_report_group($report, $content)
 
     $agent_modules = alerts_get_agent_modules(
         $content['id_group'],
-        $content['recursion']
+        (((string) $content['id_group'] === '0') ? true : $content['recursion'])
     );
 
     if (empty($alerts)) {
@@ -4086,7 +4393,16 @@ function reporting_alert_report_agent($report, $content)
         'agent_alias'       => $agent_alias,
     ];
 
-    $return['title'] = $content['name'];
+     // Apply macros.
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_alias;
@@ -4256,7 +4572,16 @@ function reporting_alert_report_module($report, $content)
         'module_description' => $module_description,
     ];
 
-    $return['title'] = $content['name'];
+     // Apply macros.
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_alias.' - '.$module_name;
@@ -4539,7 +4864,16 @@ function reporting_monitor_report($report, $content)
         'module_description' => $module_description,
     ];
 
-    $return['title'] = $content['name'];
+    // Apply macros.
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_alias.' - '.$module_name;
@@ -4731,11 +5065,57 @@ function reporting_prediction_date($report, $content)
     );
     $agent_name_db = io_safe_output(modules_get_agentmodule_agent_name($content['id_agent_module']));
 
-    $return['title'] = $content['name'];
+    $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,
+    ];
+
+     // Apply macros
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $description = (isset($content['description'])) ? $content['description'] : '';
+    if ($description != '') {
+        $description = reporting_label_macro(
+            $items_label,
+            $description
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_name.' - '.$module_name;
-    $return['description'] = $content['description'];
+    $return['description'] = $description;
     $return['date'] = reporting_get_date_text($report, $content);
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
 
@@ -4786,7 +5166,45 @@ function reporting_projection_graph(
     $agent_name = io_safe_output(modules_get_agentmodule_agent_alias($content['id_agent_module']));
     $agent_name_db = io_safe_output(modules_get_agentmodule_agent_name($content['id_agent_module']));
 
-    $return['title']       = $content['name'];
+    $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,
+    ];
+
+     // Apply macros
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title']       = $title;
     $return['subtitle']    = $agent_name.' - '.$module_name;
     $return['description'] = $content['description'];
     $return['date']        = reporting_get_date_text($report, $content);
@@ -4865,7 +5283,36 @@ function reporting_agent_configuration($report, $content)
         $content['name'] = __('Agent configuration');
     }
 
-    $return['title'] = $content['name'];
+    $sql = '
+    SELECT *
+    FROM tagente
+    WHERE id_agente='.$content['id_agent'];
+    $agent_data = db_get_row_sql($sql);
+
+    $id_agent = $content['id_agent'];
+    $agent_alias = $agent_data['alias'];
+    $agent_group = groups_get_name($agent_data['id_grupo']);
+    $agent_description = $agent_data['comentarios'];
+    $agent_address = $agent_data['direccion'];
+
+    $items_label = [
+        'id_agent'          => $id_agent,
+        'agent_description' => $agent_description,
+        'agent_group'       => $agent_group,
+        'agent_address'     => $agent_address,
+        'agent_alias'       => $agent_alias,
+    ];
+
+    // Apply macros.
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['description'] = $content['description'];
@@ -4879,20 +5326,14 @@ function reporting_agent_configuration($report, $content)
         metaconsole_connect($server);
     }
 
-    $sql = '
-        SELECT *
-        FROM tagente
-        WHERE id_agente='.$content['id_agent'];
-    $agent_data = db_get_row_sql($sql);
-
     $agent_configuration = [];
-    $agent_configuration['name'] = $agent_data['alias'];
-    $agent_configuration['group'] = groups_get_name($agent_data['id_grupo']);
+    $agent_configuration['name'] = $agent_alias;
+    $agent_configuration['group'] = $agent_group;
     $agent_configuration['group_icon'] = ui_print_group_icon($agent_data['id_grupo'], true, '', '', false);
     $agent_configuration['os'] = os_get_name($agent_data['id_os']);
     $agent_configuration['os_icon'] = ui_print_os_icon($agent_data['id_os'], true, true);
-    $agent_configuration['address'] = $agent_data['direccion'];
-    $agent_configuration['description'] = $agent_data['comentarios'];
+    $agent_configuration['address'] = $agent_address;
+    $agent_configuration['description'] = $agent_description;
     $agent_configuration['enabled'] = (int) !$agent_data['disabled'];
     $agent_configuration['group'] = $report['group'];
     $modules = agents_get_modules($content['id_agent']);
@@ -4979,6 +5420,16 @@ function reporting_agent_configuration($report, $content)
 }
 
 
+/**
+ * Report Min, Max and Avg.
+ *
+ * @param array   $report  Info report.
+ * @param array   $content Content report.
+ * @param string  $type    Type report.
+ * @param boolean $pdf     Is pdf.
+ *
+ * @return array Data draw report.
+ */
 function reporting_value($report, $content, $type, $pdf=false)
 {
     global $config;
@@ -4993,16 +5444,17 @@ function reporting_value($report, $content, $type, $pdf=false)
             $return['type'] = 'min_value';
         break;
 
-        case 'avg':
-            $return['type'] = 'avg_value';
-        break;
-
         case 'sum':
             $return['type'] = 'sumatory';
         break;
+
+        case 'avg':
+        default:
+            $return['type'] = 'avg_value';
+        break;
     }
 
-    if (empty($content['name'])) {
+    if (empty($content['name']) === true) {
         switch ($type) {
             case 'max':
                 $content['name'] = __('Max. Value');
@@ -5012,17 +5464,18 @@ function reporting_value($report, $content, $type, $pdf=false)
                 $content['name'] = __('Min. Value');
             break;
 
-            case 'avg':
-                $content['name'] = __('AVG. Value');
-            break;
-
             case 'sum':
                 $content['name'] = __('Summatory');
             break;
+
+            case 'avg':
+            default:
+                $content['name'] = __('AVG. Value');
+            break;
         }
     }
 
-    if ($config['metaconsole']) {
+    if (is_metaconsole() === true) {
         $id_meta = metaconsole_get_id_server($content['server_name']);
 
         $server = metaconsole_get_connection_by_id($id_meta);
@@ -5045,13 +5498,59 @@ function reporting_value($report, $content, $type, $pdf=false)
         $content['id_agent_module']
     );
 
-    $return['title'] = $content['name'];
+    $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,
+    ];
+
+     // Apply macros
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $label = (isset($content['name'])) ? $content['name'] : '';
+    if ($label != '') {
+        $label = reporting_label_macro(
+            $items_label,
+            $label
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_name.' - '.$module_name;
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
-    $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    $return['label'] = $label;
     $return['agents'] = [$content['id_agent']];
     $return['id_agent'] = $content['id_agent'];
     $return['id_agent_module'] = $content['id_agent_module'];
@@ -5060,14 +5559,15 @@ function reporting_value($report, $content, $type, $pdf=false)
     $return['agent_name'] = $agent_name;
     $return['module_name'] = $module_name;
 
+    $only_image = false;
     if ($pdf) {
-        $only_image = 1;
+        $only_image = true;
     }
 
     $params = [
         'agent_module_id'    => $content['id_agent_module'],
         'period'             => $content['period'],
-        'width'              => '600px',
+        'width'              => '90%',
         'pure'               => false,
         'date'               => $report['datetime'],
         'only_image'         => $only_image,
@@ -5086,6 +5586,7 @@ function reporting_value($report, $content, $type, $pdf=false)
         case 'max':
         case 'min':
         case 'avg':
+        default:
             $divisor = get_data_multiplier($unit);
 
             if ($content['lapse_calc'] == 0) {
@@ -5107,6 +5608,7 @@ function reporting_value($report, $content, $type, $pdf=false)
                     break;
 
                     case 'avg':
+                    default:
                         $value = reporting_get_agentmodule_data_average(
                             $content['id_agent_module'],
                             $content['period'],
@@ -5118,7 +5620,14 @@ function reporting_value($report, $content, $type, $pdf=false)
                 if (!$config['simple_module_value']) {
                     $formated_value = $value;
                 } else {
-                    $formated_value = format_for_graph($value, $config['graph_precision'], '.', ',', $divisor, $unit);
+                    $formated_value = format_for_graph(
+                        $value,
+                        $config['graph_precision'],
+                        '.',
+                        ',',
+                        $divisor,
+                        $unit
+                    );
                 }
             } else {
                 $return['visual_format'] = $content['visual_format'];
@@ -5126,17 +5635,51 @@ function reporting_value($report, $content, $type, $pdf=false)
                 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'], '.', ',', $divisor, $unit);
+                        $value = format_for_graph(
+                            reporting_get_agentmodule_data_max(
+                                $content['id_agent_module'],
+                                $content['period'],
+                                $report['datetime']
+                            ),
+                            $config['graph_precision'],
+                            '.',
+                            ',',
+                            $divisor,
+                            $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'], '.', ',', $divisor, $unit);
+                        $value = format_for_graph(
+                            reporting_get_agentmodule_data_min(
+                                $content['id_agent_module'],
+                                $content['period'],
+                                $report['datetime']
+                            ),
+                            $config['graph_precision'],
+                            '.',
+                            ',',
+                            $divisor,
+                            $unit
+                        );
                     break;
 
                     case 'avg':
+                    default:
                         $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'], '.', ',', $divisor, $unit);
+                        $value = format_for_graph(
+                            reporting_get_agentmodule_data_average(
+                                $content['id_agent_module'],
+                                $content['period'],
+                                $report['datetime']
+                            ),
+                            $config['graph_precision'],
+                            '.',
+                            ',',
+                            $divisor,
+                            $unit
+                        );
                     break;
                 }
 
@@ -5166,15 +5709,49 @@ function reporting_value($report, $content, $type, $pdf=false)
                         if ($i > $time_begin['utimestamp']) {
                             switch ($type) {
                                 case 'max':
-                                    $row[__('Maximun')] = format_for_graph(reporting_get_agentmodule_data_max($content['id_agent_module'], $content['lapse'], ($i + $content['lapse'])), $config['graph_precision'], '.', ',', $divisor, $unit);
+                                    $row[__('Maximun')] = format_for_graph(
+                                        reporting_get_agentmodule_data_max(
+                                            $content['id_agent_module'],
+                                            $content['lapse'],
+                                            ($i + $content['lapse'])
+                                        ),
+                                        $config['graph_precision'],
+                                        '.',
+                                        ',',
+                                        $divisor,
+                                        $unit
+                                    );
                                 break;
 
                                 case 'min':
-                                    $row[__('Maximun')] = format_for_graph(reporting_get_agentmodule_data_min($content['id_agent_module'], $content['lapse'], ($i + $content['lapse'])), $config['graph_precision'], '.', ',', $divisor, $unit);
+                                    $row[__('Maximun')] = format_for_graph(
+                                        reporting_get_agentmodule_data_min(
+                                            $content['id_agent_module'],
+                                            $content['lapse'],
+                                            ($i + $content['lapse'])
+                                        ),
+                                        $config['graph_precision'],
+                                        '.',
+                                        ',',
+                                        $divisor,
+                                        $unit
+                                    );
                                 break;
 
                                 case 'avg':
-                                    $row[__('Maximun')] = format_for_graph(reporting_get_agentmodule_data_average($content['id_agent_module'], $content['lapse'], ($i + $content['lapse'])), $config['graph_precision'], '.', ',', $divisor, $unit);
+                                default:
+                                    $row[__('Maximun')] = format_for_graph(
+                                        reporting_get_agentmodule_data_average(
+                                            $content['id_agent_module'],
+                                            $content['lapse'],
+                                            ($i + $content['lapse'])
+                                        ),
+                                        $config['graph_precision'],
+                                        '.',
+                                        ',',
+                                        $divisor,
+                                        $unit
+                                    );
                                 break;
                             }
                         } else {
@@ -5185,7 +5762,7 @@ function reporting_value($report, $content, $type, $pdf=false)
                     }
                 }
 
-                if ($config['metaconsole']) {
+                if (is_metaconsole() === true) {
                     metaconsole_restore_db();
                 }
 
@@ -5205,7 +5782,14 @@ function reporting_value($report, $content, $type, $pdf=false)
             } else {
                 $divisor = get_data_multiplier($unit);
 
-                $formated_value = format_for_graph($value, $config['graph_precision'], '.', ',', $divisor, $unit);
+                $formated_value = format_for_graph(
+                    $value,
+                    $config['graph_precision'],
+                    '.',
+                    ',',
+                    $divisor,
+                    $unit
+                );
             }
         break;
     }
@@ -5215,7 +5799,7 @@ function reporting_value($report, $content, $type, $pdf=false)
         'formated_value' => $formated_value,
     ];
 
-    if ($config['metaconsole']) {
+    if (is_metaconsole() === true) {
         metaconsole_restore_db();
     }
 
@@ -5320,7 +5904,7 @@ function reporting_sql($report, $content)
             )
         );
     } else {
-        $sql = io_safe_output($content['external_source']);
+        $sql = $content['external_source'];
     }
 
     // Check if exist sql macro
@@ -7592,7 +8176,42 @@ function reporting_increment($report, $content)
         $content['name'] = __('Increment');
     }
 
-    $return['title'] = $content['name'];
+    $id_agent = $content['id_agent'];
+    $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,
+    ];
+
+     // Apply macros
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['description'] = $content['description'];
@@ -8216,6 +8835,10 @@ function reporting_custom_graph(
         $content['name'] = __('Simple graph');
     }
 
+    $id_agent = agents_get_module_id(
+        $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);
@@ -8228,13 +8851,42 @@ function reporting_custom_graph(
         $id_agent_module
     );
 
-    $return['title'] = $content['name'];
+    $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,
+    ];
+
+    // Apply macros
+    $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $description = (isset($content['description'])) ? $content['description'] : '';
+    if ($description != '') {
+        $description = reporting_label_macro(
+            $items_label,
+            $description
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $graphs[0]['name'];
     $return['agent_name'] = $agent_alias;
     $return['module_name'] = $module_name;
-    $return['description'] = $content['description'];
+    $return['description'] = $description;
     $return['date'] = reporting_get_date_text(
         $report,
         $content
@@ -8378,6 +9030,23 @@ function reporting_simple_graph(
         'module_description' => $module_description,
     ];
 
+     // Apply macros
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $description = (isset($content['description'])) ? $content['description'] : '';
+    if ($description != '') {
+        $description = reporting_label_macro(
+            $items_label,
+            $description
+        );
+    }
+
     $label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
     if ($label != '') {
         $label = reporting_label_macro(
@@ -8386,14 +9055,14 @@ function reporting_simple_graph(
         );
     }
 
-    $return['title'] = io_safe_output($content['name']);
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_alias.' - '.$module_name;
     $return['agent_name_db'] = agents_get_name($id_agent);
     $return['agent_name'] = $agent_alias;
     $return['module_name'] = $module_name;
-    $return['description'] = io_safe_output($content['description']);
+    $return['description'] = $description;
     $return['date'] = reporting_get_date_text(
         $report,
         $content
@@ -8969,7 +9638,7 @@ function reporting_get_agents_detailed_event(
  *
  * @return array Group statistics
  */
-function reporting_get_group_stats($id_group=0, $access='AR')
+function reporting_get_group_stats($id_group=0, $access='AR', $recursion=true)
 {
     global $config;
 
@@ -9071,16 +9740,19 @@ function reporting_get_group_stats($id_group=0, $access='AR')
         // Store the groups where we are quering
         $covered_groups = [];
         $group_array = [];
-        foreach ($id_group as $group) {
-            $children = groups_get_childrens($group);
 
-            // Show empty groups only if they have children with agents
-            // $group_array = array();
-            foreach ($children as $sub) {
-                // If the group is quering previously, we ingore it
-                if (!in_array($sub['id_grupo'], $covered_groups)) {
-                    array_push($covered_groups, $sub['id_grupo']);
-                    array_push($group_array, $sub['id_grupo']);
+        foreach ($id_group as $group) {
+            if ($recursion === true) {
+                $children = groups_get_children($group);
+
+                // Show empty groups only if they have children with agents
+                // $group_array = array();
+                foreach ($children as $sub) {
+                    // If the group is quering previously, we ingore it
+                    if (!in_array($sub['id_grupo'], $covered_groups)) {
+                        array_push($covered_groups, $sub['id_grupo']);
+                        array_push($group_array, $sub['id_grupo']);
+                    }
                 }
             }
 
@@ -12872,11 +13544,57 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
         )
     );
 
-    $return['title'] = $content['name'];
+    $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,
+    ];
+
+     // Apply macros
+     $title = (isset($content['name'])) ? $content['name'] : '';
+    if ($title != '') {
+        $title = reporting_label_macro(
+            $items_label,
+            $title
+        );
+    }
+
+    $description = (isset($content['description'])) ? $content['description'] : '';
+    if ($description != '') {
+        $description = reporting_label_macro(
+            $items_label,
+            $description
+        );
+    }
+
+    $return['title'] = $title;
     $return['landscape'] = $content['landscape'];
     $return['pagebreak'] = $content['pagebreak'];
     $return['subtitle'] = $agent_name.' - '.$module_name;
-    $return['description'] = $content['description'];
+    $return['description'] = $description;
     $return['date'] = reporting_get_date_text(
         $report,
         $content
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 0de6b542bd..48a09385d5 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -236,6 +236,10 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
                 reporting_html_log($table, $item);
             break;
 
+            case 'permissions_report':
+                reporting_html_permissions($table, $item);
+            break;
+
             case 'availability_graph':
                 reporting_html_availability_graph($table, $item);
             break;
@@ -501,6 +505,8 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
             $table1->head[5] = __('Status');
 
             $table1->headstyle = [];
+            $table1->headstyle[0] = 'text-align: left';
+            $table1->headstyle[1] = 'text-align: left';
             $table1->headstyle[2] = 'text-align: right';
             $table1->headstyle[3] = 'text-align: right';
             $table1->headstyle[4] = 'text-align: right';
@@ -536,6 +542,8 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
             $table2->head[6] = __('Downtime');
 
             $table2->headstyle = [];
+            $table2->headstyle[0] = 'text-align: left';
+            $table2->headstyle[1] = 'text-align: left';
             $table2->headstyle[2] = 'text-align: right';
             $table2->headstyle[3] = 'text-align: right';
             $table2->headstyle[4] = 'text-align: right';
@@ -548,7 +556,7 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
 
             $table3->align = [];
             $table3->align[0] = 'left';
-            $table3->align[1] = 'left';
+            $table3->align[1] = 'right';
             $table3->align[2] = 'right';
             $table3->align[3] = 'right';
             $table3->align[4] = 'right';
@@ -565,6 +573,8 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
             $table3->head[4] = __('Checks Unknown');
 
             $table3->headstyle = [];
+            $table3->headstyle[0] = 'text-align: left';
+            $table3->headstyle[1] = 'text-align: right';
             $table3->headstyle[2] = 'text-align: right';
             $table3->headstyle[3] = 'text-align: right';
             $table3->headstyle[4] = 'text-align: right';
@@ -721,23 +731,23 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
                     true
                 );
             } else {
-                $table1->title = $item['title'];
-                $table1->titleclass = 'title_table_pdf';
-                $table1->titlestyle = 'text-align:left;';
+                // $table1->title = $item['title'];
+                // $table1->titleclass = 'title_table_pdf';
+                // $table1->titlestyle = 'text-align:left;';
                 $return_pdf .= html_print_table(
                     $table1,
                     true
                 );
-                $table2->title = $item['title'];
-                $table2->titleclass = 'title_table_pdf';
-                $table2->titlestyle = 'text-align:left;';
+                // $table2->title = $item['title'];
+                // $table2->titleclass = 'title_table_pdf';
+                // $table2->titlestyle = 'text-align:left;';
                 $return_pdf .= html_print_table(
                     $table2,
                     true
                 );
-                $table3->title = $item['title'];
-                $table3->titleclass = 'title_table_pdf';
-                $table3->titlestyle = 'text-align:left;';
+                // $table3->title = $item['title'];
+                // $table3->titleclass = 'title_table_pdf';
+                // $table3->titlestyle = 'text-align:left;';
                 $return_pdf .= html_print_table(
                     $table3,
                     true
@@ -782,9 +792,9 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
                     true
                 );
             } else {
-                $table1->title = $item['title'];
-                $table1->titleclass = 'title_table_pdf';
-                $table1->titlestyle = 'text-align:left;';
+                // $table1->title = $item['title'];
+                // $table1->titleclass = 'title_table_pdf';
+                // $table1->titlestyle = 'text-align:left;';
                 $return_pdf .= html_print_table(
                     $table1,
                     true
@@ -1486,7 +1496,7 @@ function reporting_html_inventory_changes($table, $item, $pdf=0)
 function reporting_html_inventory($table, $item, $pdf=0)
 {
     $return_pdf = '';
-    if (!empty($item['failed'])) {
+    if (empty($item['failed']) === false) {
         if ($pdf === 0) {
             $table->colspan['failed']['cell'] = 3;
             $table->cellstyle['failed']['cell'] = 'text-align: center;';
@@ -1495,59 +1505,76 @@ function reporting_html_inventory($table, $item, $pdf=0)
             $return_pdf .= $item['failed'];
         }
     } else {
-        foreach ($item['data'] as $module_item) {
-            $table1 = new stdClass();
-            $table1->width = '99%';
+        // Grouped type inventory.
+        $type_modules = array_reduce(
+            $item['data'],
+            function ($carry, $it) {
+                $carry[$it['name']][] = $it;
+                return $carry;
+            },
+            []
+        );
 
-            $first = reset($module_item['data']);
-            $count_columns = count($first);
+        if (isset($type_modules) === true
+            && is_array($type_modules) === true
+        ) {
+            foreach ($type_modules as $key_type_module => $type_module) {
+                $table1 = new stdClass();
+                $table1->width = '99%';
+                $table1->data = [];
+                $table1->head = [];
+                $table1->cellstyle = [];
+                $table1->headstyle = [];
+                if (isset($type_module) === true
+                    && is_array($type_module) === true
+                ) {
+                    foreach ($type_module as $key_type => $module) {
+                        if (isset($module['data']) === true
+                            && is_array($module['data']) === true
+                        ) {
+                            array_pop($module['data']);
+                            foreach ($module['data'] as $k_module => $v_module) {
+                                $str_key = $key_type_module.'-'.$key_type.'-'.$k_module;
+                                $table1->head[0] = __('Agent');
+                                $table1->head[1] = __('Module');
+                                $table1->head[2] = __('Date');
+                                $table1->headstyle[0] = 'text-align: left';
+                                $table1->headstyle[1] = 'text-align: left';
+                                $table1->headstyle[2] = 'text-align: left';
+                                $table1->cellstyle[$str_key][0] = 'text-align: left;';
+                                $table1->cellstyle[$str_key][1] = 'text-align: left;';
+                                $table1->cellstyle[$str_key][2] = 'text-align: left;';
+                                $table1->data[$str_key][0] = $module['agent_name'];
+                                $table1->data[$str_key][1] = $key_type_module;
+                                $dateModule = explode(' ', $module['timestamp']);
+                                $table1->data[$str_key][2] = $dateModule[0];
+                                if (isset($v_module) === true
+                                    && is_array($v_module) === true
+                                ) {
+                                    foreach ($v_module as $k => $v) {
+                                        $table1->head[$k] = $k;
+                                        $table1->headstyle[$k] = 'text-align: left';
+                                        $table1->cellstyle[$str_key][$k] = 'text-align: left;';
+                                        $table1->data[$str_key][$k] = $v;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
 
-            $table1->cellstyle[0][0] = 'background: #373737; color: #FFF;';
-            $table1->data[0][0] = $module_item['agent_name'];
-            if ($count_columns == 1) {
-                $table1->colspan[0][0] = ($count_columns + 1);
-            } else {
-                $table1->colspan[0][0] = $count_columns;
-            }
-
-            $table1->cellstyle[1][0] = 'background: #373737; color: #FFF;';
-            $table1->cellstyle[1][1] = 'background: #373737; color: #FFF;';
-            $table1->data[1][0] = $module_item['name'];
-            if (($count_columns - 1) > 0) {
-                $table1->colspan[1][0] = ($count_columns - 1);
-            }
-
-            $table1->data[1][1] = $module_item['timestamp'];
-
-            $table1->cellstyle[2] = array_pad(
-                [],
-                $count_columns,
-                'background: #373737; color: #FFF;'
-            );
-            $table1->data[2] = array_keys($first);
-            if (($count_columns - 1) == 0) {
-                $table1->colspan[2][0] = ($count_columns + 1);
-            }
-
-            $table1->data = array_merge(
-                $table1->data,
-                $module_item['data']
-            );
-
-            if ($pdf === 0) {
-                $table->colspan[$module_item['name'].'_'.$module_item['id_agente']]['cell'] = 3;
-                $table->data[$module_item['name'].'_'.$module_item['id_agente']]['cell'] = html_print_table(
-                    $table1,
-                    true
-                );
-            } else {
-                $table1->title = $item['title'];
-                $table1->titleclass = 'title_table_pdf';
-                $table1->titlestyle = 'text-align:left;';
-                $return_pdf .= html_print_table(
-                    $table1,
-                    true
-                );
+                if ($pdf === 0) {
+                    $table->colspan[$key_type_module]['cell'] = 3;
+                    $table->data[$key_type_module]['cell'] = html_print_table(
+                        $table1,
+                        true
+                    );
+                } else {
+                    $return_pdf .= html_print_table(
+                        $table1,
+                        true
+                    );
+                }
             }
         }
     }
@@ -2965,8 +2992,26 @@ function reporting_html_min_value(&$table, $item, $mini)
 }
 
 
-function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
-{
+/**
+ * Htlm report AVg, min, Max, Only.
+ *
+ * @param array   $table       Table.
+ * @param array   $item        Data.
+ * @param boolean $mini        Is mini.
+ * @param boolean $only_value  Only value.
+ * @param boolean $check_empty Empty.
+ * @param integer $pdf         PDF Mode.
+ *
+ * @return string Html output.
+ */
+function reporting_html_value(
+    $table,
+    $item,
+    $mini,
+    $only_value=false,
+    $check_empty=false,
+    $pdf=0
+) {
     global $config;
 
     if ($mini) {
@@ -2975,8 +3020,12 @@ function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_e
         $font_size = $config['font_size_item_report'].'em';
     }
 
-    if (isset($item['visual_format']) && $item['visual_format'] != 0
-        && ($item['type'] == 'max_value' || $item['type'] == 'min_value' || $item['type'] == 'avg_value')
+    $return_pdf = '';
+
+    if (isset($item['visual_format']) === true && $item['visual_format'] != 0
+        && ($item['type'] == 'max_value'
+        || $item['type'] == 'min_value'
+        || $item['type'] == 'avg_value')
     ) {
         $table2 = new stdClass();
         $table2->width = '100%';
@@ -2998,6 +3047,7 @@ function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_e
             break;
 
             case 'avg_value':
+            default:
                 $table2->head = [
                     __('Agent'),
                     __('Module'),
@@ -3025,15 +3075,28 @@ function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_e
         $table->colspan[2][0] = 3;
         $table->colspan[3][0] = 3;
 
-        array_push($table->data, html_print_table($table2, true));
+        if ($pdf === 0) {
+            array_push($table->data, html_print_table($table2, true));
+        } else {
+            $return_pdf .= 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 ($pdf === 0) {
+                array_push($table->data, $value);
+            } else {
+                $style_div_pdf = 'text-align:center;margin-bottom:20px;';
+                $return_pdf .= '<div style="'.$style_div_pdf.'">';
+                $return_pdf .= $value;
+                $return_pdf .= '</div>';
+            }
         }
 
+        unset($item['data'][1]);
+
         if ($item['visual_format'] != 2) {
             $table1 = new stdClass();
             $table1->width = '100%';
@@ -3053,6 +3116,7 @@ function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_e
                 break;
 
                 case 'avg_value':
+                default:
                     $table1->head = [
                         __('Lapse'),
                         __('Average'),
@@ -3061,8 +3125,9 @@ function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_e
             }
 
             $table1->data = [];
+            $row = [];
             foreach ($item['data'] as $data) {
-                if (!is_numeric($data[__('Maximun')])) {
+                if (is_numeric($data[__('Maximun')]) === false) {
                     $row = [
                         $data[__('Lapse')],
                         $data[__('Maximun')],
@@ -3070,7 +3135,12 @@ function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_e
                 } else {
                     $row = [
                         $data[__('Lapse')],
-                        remove_right_zeros(number_format($data[__('Maximun')], $config['graph_precision'])),
+                        remove_right_zeros(
+                            number_format(
+                                $data[__('Maximun')],
+                                $config['graph_precision']
+                            )
+                        ),
                     ];
                 }
 
@@ -3080,10 +3150,22 @@ function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_e
             $table1->title = $item['title'];
             $table1->titleclass = 'title_table_pdf';
             $table1->titlestyle = 'text-align:left;';
+            if ($pdf === 0) {
+                array_push($table->data, html_print_table($table1, true));
+            } else {
+                $return_pdf .= html_print_table($table1, true);
+            }
+        }
 
-            array_push($table->data, html_print_table($table1, true));
+        if ($pdf !== 0) {
+            return $return_pdf;
         }
     } else {
+        if ($pdf !== 0) {
+            $table = new stdClass();
+            $table->width = '100%';
+        }
+
         $table->colspan['data']['cell'] = 3;
         $table->cellstyle['data']['cell'] = 'text-align: left;';
 
@@ -3098,6 +3180,10 @@ function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_e
         }
 
         $table->data['data']['cell'] .= '</p>';
+
+        if ($pdf !== 0) {
+            return html_print_table($table, true);
+        }
     }
 }
 
@@ -3617,9 +3703,9 @@ function reporting_html_availability($table, $item, $pdf=0)
         $data[0] = html_print_table($table1, true);
         array_push($table->data, $data);
     } else {
-        $table1->title = $item['title'];
-        $table1->titleclass = 'title_table_pdf';
-        $table1->titlestyle = 'text-align:left;';
+        // $table1->title = $item['title'];
+        // $table1->titleclass = 'title_table_pdf';
+        // $table1->titlestyle = 'text-align:left;';
         $return_pdf .= html_print_table($table1, true);
     }
 
@@ -3629,9 +3715,9 @@ function reporting_html_availability($table, $item, $pdf=0)
             $data2[0] = html_print_table($table2, true);
             array_push($table->data, $data2);
         } else {
-            $table2->title = $item['title'];
-            $table2->titleclass = 'title_table_pdf';
-            $table2->titlestyle = 'text-align:left;';
+            // $table2->title = $item['title'];
+            // $table2->titleclass = 'title_table_pdf';
+            // $table2->titlestyle = 'text-align:left;';
             $return_pdf .= html_print_table($table2, true);
         }
     }
@@ -3699,9 +3785,9 @@ function reporting_html_availability($table, $item, $pdf=0)
                 );
                 array_push($table->data, $data);
             } else {
-                $table1->title = $item['title'];
-                $table1->titleclass = 'title_table_pdf';
-                $table1->titlestyle = 'text-align:left;';
+                // $table1->title = $item['title'];
+                // $table1->titleclass = 'title_table_pdf';
+                // $table1->titlestyle = 'text-align:left;';
                 $return_pdf .= html_print_table(
                     $table1,
                     true
@@ -5567,3 +5653,117 @@ function reporting_html_planned_downtimes_table($planned_downtimes)
 
     return $downtimes_table;
 }
+
+
+function reporting_html_permissions($table, $item, $pdf=0)
+{
+    global $config;
+
+    $table1 = new stdClass();
+    $table1->width = '100%';
+
+    $table1->style[0] = 'text-align: left;vertical-align: top;min-width: 100px;';
+    $table1->class = 'databox data';
+    $table1->cellpadding = 1;
+    $table1->cellspacing = 1;
+    $table1->styleTable = 'overflow: wrap; table-layout: fixed;';
+
+    if ($item['subtype'] === REPORT_PERMISSIONS_NOT_GROUP_BY_GROUP) {
+        $table1->style[0] = 'text-align: left;vertical-align: top;min-width: 100px;';
+        $table1->style[1] = 'text-align: left;vertical-align: top;min-width: 100px;';
+        $table1->style[2] = 'text-align: left;vertical-align: top; min-width: 100px';
+
+        $table1->head = [
+            __('User ID'),
+            __('Full name'),
+            __('Permissions'),
+        ];
+
+        $table1->headstyle[0] = 'text-align: left';
+        $table1->headstyle[1] = 'text-align: left';
+        $table1->headstyle[2] = 'text-align: left';
+    }
+
+    if ($item['subtype'] === REPORT_PERMISSIONS_GROUP_BY_GROUP) {
+        $table1->style[0] = 'text-align: left;vertical-align: top;min-width: 150px;';
+        $table1->style[1] = 'text-align: left;vertical-align: top;min-width: 150px;';
+        $table1->style[2] = 'text-align: left;vertical-align: top;min-width: 150px;';
+        $table1->style[3] = 'text-align: left;vertical-align: top;min-width: 150px;';
+
+        $table1->headstyle[0] = 'text-align: left';
+        $table1->headstyle[1] = 'text-align: left';
+        $table1->headstyle[2] = 'text-align: left';
+        $table1->headstyle[3] = 'text-align: left';
+
+        $table1->head = [
+            __('Group'),
+            __('User ID'),
+            __('Full name'),
+            __('Permissions'),
+        ];
+    }
+
+    $table1->data = [];
+
+    foreach ($item['data'] as $data) {
+        if ($item['subtype'] === REPORT_PERMISSIONS_NOT_GROUP_BY_GROUP) {
+            $profile_group_name = '';
+            foreach ($data['user_profiles'] as $user_profile) {
+                $profile_group_name .= $user_profile.'<br />';
+            }
+
+            $row = [
+                $data['user_id'],
+                $data['user_name'],
+                $profile_group_name,
+            ];
+        }
+
+        if ($item['subtype'] === REPORT_PERMISSIONS_GROUP_BY_GROUP) {
+            $user_profile_id_users = '';
+            $user_profile_name = '';
+            $user_profile_users_name = '';
+            $group_name = $data['group_name'].'<br />';
+
+            foreach ($data['users'] as $user => $user_data) {
+                $user_profile_id_users .= $user.'<br />';
+                $user_profile_users_name .= $user_data['fullname'].'<br />';
+
+                foreach ($user_data['profiles'] as $profile) {
+                    $user_profile_id_users .= '<br />';
+                    $user_profile_users_name .= '<br />';
+                    $user_profile_name .= $profile.'<br />';
+                }
+
+                $user_profile_name .= '<br />';
+            }
+
+            $row = [
+                $group_name,
+                $user_profile_id_users,
+                $user_profile_users_name,
+                $user_profile_name,
+            ];
+        }
+
+        $table1->data[] = $row;
+
+        if ($pdf !== 0) {
+            $table1->data[] = '<br />';
+        }
+    }
+
+    if ($pdf === 0) {
+        $table->colspan['permissions']['cell'] = 3;
+        $table->cellstyle['permissions']['cell'] = 'text-align: center;';
+        $table->data['permissions']['cell'] = html_print_table(
+            $table1,
+            true
+        );
+    } else {
+        return html_print_table(
+            $table1,
+            true
+        );
+    }
+}
diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php
index 130fe4deb0..878ded7968 100755
--- a/pandora_console/include/functions_reports.php
+++ b/pandora_console/include/functions_reports.php
@@ -54,7 +54,7 @@ function reports_get_report($id_report, $filter=false, $fields=false)
         return false;
     }
 
-    if (! is_array($filter)) {
+    if (!is_array($filter)) {
         $filter = [];
     }
 
@@ -72,7 +72,7 @@ function reports_get_report($id_report, $filter=false, $fields=false)
 
     $report = db_get_row_filter('treport', $filter, $fields);
 
-    if (! check_acl($config['id_user'], $report['id_group'], 'RR')) {
+    if (!check_acl($config['id_user'], $report['id_group'], 'RR')) {
         return false;
     }
 
@@ -104,16 +104,16 @@ function reports_get_reports(
 ) {
     global $config;
 
-    if (! is_array($filter)) {
+    if (!is_array($filter)) {
         $filter = [];
     }
 
-        /*
-            if (!is_user_admin ($config["id_user"]))
+    /*
+        if (!is_user_admin ($config["id_user"]))
             $filter[] = sprintf ('private = 0 OR (private = 1 AND id_user = "%s")',
             $config['id_user']);
-        */
-        $filter['hidden'] = 0;
+    */
+    $filter['hidden'] = 0;
     if (is_array($fields)) {
         $fields[] = 'id_group';
         $fields[] = 'id_user';
@@ -146,7 +146,7 @@ function reports_get_reports(
             }
 
             if ($config['id_user'] != $report['id_user']
-                && ! check_acl($config['id_user'], $report['id_group'], $privileges)
+                && !check_acl($config['id_user'], $report['id_group'], $privileges)
             ) {
                 continue;
             }
@@ -173,7 +173,7 @@ function reports_create_report($name, $id_group, $values=false)
 {
     global $config;
 
-    if (! is_array($values)) {
+    if (!is_array($values)) {
         $values = [];
     }
 
@@ -246,7 +246,7 @@ function reports_get_content($id_report_content, $filter=false, $fields=false)
         return false;
     }
 
-    if (! is_array($filter)) {
+    if (!is_array($filter)) {
         $filter = [];
     }
 
@@ -293,7 +293,7 @@ function reports_create_content($id_report, $values)
         return false;
     }
 
-    if (! is_array($values)) {
+    if (!is_array($values)) {
         return false;
     }
 
@@ -341,7 +341,7 @@ function reports_get_contents($id_report, $filter=false, $fields=false)
         return [];
     }
 
-    if (! is_array($filter)) {
+    if (!is_array($filter)) {
         $filter = [];
     }
 
@@ -546,7 +546,7 @@ function reports_delete_content($id_report_content)
 function get_report_name($type, $template=false)
 {
     $types = reports_get_report_types($template);
-    if (! isset($types[$type])) {
+    if (!isset($types[$type])) {
         return __('Unknown');
     }
 
@@ -890,5 +890,10 @@ function reports_get_report_types($template=false, $not_editor=false)
         ];
     }
 
+    $types['permissions_report'] = [
+        'optgroup' => __('Permissions report'),
+        'name'     => __('Permissions report'),
+    ];
+
     return $types;
 }
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index c4ef3b05ab..3f66c790ae 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -669,18 +669,29 @@ function snmp_browser_print_oid(
 
 
 /**
- * Print the div that contains the SNMP browser.
+ * Print browser container.
  *
- * @param bool return The result is printed if set to true or returned if set to false.
- * @param string width Width of the SNMP browser. Units must be specified.
- * @param string height Height of the SNMP browser. Units must be specified.
- * @param string display CSS display value for the container div. Set to none to hide the div.
+ * @param boolean $return               The result is printed
+ * if set to true or returned if set to false.
+ * @param string  $width                Width of the SNMP browser.
+ * Units must be specified.
+ * @param string  $height               Height of the SNMP browser.
+ * Units must be specified.
+ * @param string  $display              CSS display value for the
+ * container div. Set to none to hide the div.
+ * @param boolean $show_massive_buttons Massive buttons.
  *
- * @return string The container div.
+ * @return string html.
  */
-function snmp_browser_print_container($return=false, $width='100%', $height='60%', $display='', $show_massive_buttons=false)
-{
-    // Target selection
+function snmp_browser_print_container(
+    $return=false,
+    $width='100%',
+    $height='60%',
+    $display='',
+    $show_massive_buttons=false
+) {
+    $snmp_version = get_parameter('snmp_browser_version', '2c');
+    // Target selection.
     $table = new stdClass();
     $table->width = '100%';
     $table->class = 'databox filters';
@@ -754,12 +765,36 @@ function snmp_browser_print_container($return=false, $width='100%', $height='60%
         }
     }
 
-    $table->data[1][1] = '<strong>'.__('Server to execute').'</strong> &nbsp;&nbsp;';
-    $table->data[1][1] .= html_print_select($servers_to_exec, 'server_to_exec', '', '', '', '', true);
+    $table->data[1][1] = '<strong>';
+    $table->data[1][1] .= __('Server to execute');
+    $table->data[1][1] .= '</strong> &nbsp;&nbsp;';
+    $table->data[1][1] .= html_print_select(
+        $servers_to_exec,
+        'server_to_exec',
+        '',
+        '',
+        '',
+        '',
+        true
+    );
 
-    $table->data[1][2] = html_print_button(__('Browse'), 'browse', false, 'snmpBrowse()', 'class="sub search" style="margin-top:0px;"', true);
+    $table->data[1][2] = html_print_button(
+        __('Browse'),
+        'browse',
+        false,
+        'snmpBrowse()',
+        'class="sub search" style="margin-top:0px;"',
+        true
+    );
+
+    // SNMP v3 options.
+    $snmp3_auth_user = get_parameter('snmp3_auth_user', '');
+    $snmp3_security_level = get_parameter('snmp3_security_level', 'authNoPriv');
+    $snmp3_auth_method = get_parameter('snmp3_auth_method', 'MD5');
+    $snmp3_auth_pass = get_parameter('snmp3_auth_pass', '');
+    $snmp3_privacy_method = get_parameter('snmp3_privacy_method', 'AES');
+    $snmp3_privacy_pass = get_parameter('snmp3_privacy_pass', '');
 
-    // SNMP v3 options
     $table3 = new stdClass();
     $table3->width = '100%';
 
@@ -767,18 +802,69 @@ function snmp_browser_print_container($return=false, $width='100%', $height='60%
     $table3->valign[1] = '';
 
     $table3->data[2][1] = '<b>'.__('Auth user').'</b>';
-    $table3->data[2][2] = html_print_input_text('snmp3_browser_auth_user', '', '', 15, 60, true);
+    $table3->data[2][2] = html_print_input_text(
+        'snmp3_browser_auth_user',
+        $snmp3_auth_user,
+        '',
+        15,
+        60,
+        true
+    );
+
     $table3->data[2][3] = '<b>'.__('Auth password').'</b>';
-    $table3->data[2][4] = html_print_input_password('snmp3_browser_auth_pass', '', '', 15, 60, true);
-    $table3->data[2][4] .= html_print_input_hidden_extended('active_snmp_v3', 0, 'active_snmp_v3_fsb', true);
+    $table3->data[2][4] = html_print_input_password(
+        'snmp3_browser_auth_pass',
+        $snmp3_auth_pass,
+        '',
+        15,
+        60,
+        true
+    );
+
+    $table3->data[2][4] .= html_print_input_hidden_extended(
+        'active_snmp_v3',
+        0,
+        'active_snmp_v3_fsb',
+        true
+    );
 
     $table3->data[5][0] = '<b>'.__('Privacy method').'</b>';
-    $table3->data[5][1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'snmp3_browser_privacy_method', '', '', '', '', true);
+    $table3->data[5][1] = html_print_select(
+        [
+            'DES' => __('DES'),
+            'AES' => __('AES'),
+        ],
+        'snmp3_browser_privacy_method',
+        $snmp3_privacy_method,
+        '',
+        '',
+        '',
+        true
+    );
+
     $table3->data[5][2] = '<b>'.__('Privacy pass').'</b>';
-    $table3->data[5][3] = html_print_input_password('snmp3_browser_privacy_pass', '', '', 15, 60, true);
+    $table3->data[5][3] = html_print_input_password(
+        'snmp3_browser_privacy_pass',
+        $snmp3_privacy_pass,
+        '',
+        15,
+        60,
+        true
+    );
 
     $table3->data[6][0] = '<b>'.__('Auth method').'</b>';
-    $table3->data[6][1] = html_print_select(['MD5' => __('MD5'), 'SHA' => __('SHA')], 'snmp3_browser_auth_method', '', '', '', '', true);
+    $table3->data[6][1] = html_print_select(
+        [
+            'MD5' => __('MD5'),
+            'SHA' => __('SHA'),
+        ],
+        'snmp3_browser_auth_method',
+        $snmp3_auth_method,
+        '',
+        '',
+        '',
+        true
+    );
     $table3->data[6][2] = '<b>'.__('Security level').'</b>';
     $table3->data[6][3] = html_print_select(
         [
@@ -787,29 +873,92 @@ function snmp_browser_print_container($return=false, $width='100%', $height='60%
             'authPriv'     => __('Auth and privacy method'),
         ],
         'snmp3_browser_security_level',
-        '',
+        $snmp3_security_level,
         '',
         '',
         '',
         true
     );
 
-    // Search tools
+    // Search tools.
     $table2 = new stdClass();
     $table2->width = '100%';
     $table2->class = 'databox filters';
     $table2->size = [];
     $table2->data = [];
 
-    $table2->data[0][0] = html_print_input_text('search_text', '', '', 25, 0, true);
-    $table2->data[0][0] .= '<a href="javascript:">'.html_print_image('images/zoom.png', true, ['title' => __('Search'), 'style' => 'vertical-align: middle;', 'onclick' => 'searchText();']).'</a>';
-    $table2->data[0][1] = '&nbsp;'.'<a href="javascript:">'.html_print_image('images/go_first.png', true, ['title' => __('First match'), 'style' => 'vertical-align: middle;', 'onclick' => 'searchFirstMatch();']).'</a>';
-    $table2->data[0][1] .= '&nbsp;'.'<a href="javascript:">'.html_print_image('images/go_previous.png', true, ['title' => __('Previous match'), 'style' => 'vertical-align: middle;', 'onclick' => 'searchPrevMatch();']).'</a>';
-    $table2->data[0][1] .= '&nbsp;'.'<a href="javascript:">'.html_print_image('images/go_next.png', true, ['title' => __('Next match'), 'style' => 'vertical-align: middle;', 'onclick' => 'searchNextMatch();']).'</a>';
-    $table2->data[0][1] .= '&nbsp;'.'<a href="javascript:">'.html_print_image('images/go_last.png', true, ['title' => __('Last match'), 'style' => 'vertical-align: middle;', 'onclick' => 'searchLastMatch();']).'</a>';
+    $table2->data[0][0] = html_print_input_text(
+        'search_text',
+        '',
+        '',
+        25,
+        0,
+        true
+    );
+    $table2->data[0][0] .= '<a href="javascript:">';
+    $table2->data[0][0] .= html_print_image(
+        'images/zoom.png',
+        true,
+        [
+            'title'   => __('Search'),
+            'style'   => 'vertical-align: middle;',
+            'onclick' => 'searchText();',
+        ]
+    );
+    $table2->data[0][0] .= '</a>';
+
+    $table2->data[0][1] = '&nbsp;';
+    $table2->data[0][1] .= '<a href="javascript:">';
+    $table2->data[0][1] .= html_print_image(
+        'images/go_first.png',
+        true,
+        [
+            'title'   => __('First match'),
+            'style'   => 'vertical-align: middle;',
+            'onclick' => 'searchFirstMatch();',
+        ]
+    );
+    $table2->data[0][1] .= '</a>';
+    $table2->data[0][1] .= '&nbsp;';
+    $table2->data[0][1] .= '<a href="javascript:">';
+    $table2->data[0][1] .= html_print_image(
+        'images/go_previous.png',
+        true,
+        [
+            'title'   => __('Previous match'),
+            'style'   => 'vertical-align: middle;',
+            'onclick' => 'searchPrevMatch();',
+        ]
+    );
+    $table2->data[0][1] .= '</a>';
+    $table2->data[0][1] .= '&nbsp;';
+    $table2->data[0][1] .= '<a href="javascript:">';
+    $table2->data[0][1] .= html_print_image(
+        'images/go_next.png',
+        true,
+        [
+            'title'   => __('Next match'),
+            'style'   => 'vertical-align: middle;',
+            'onclick' => 'searchNextMatch();',
+        ]
+    );
+    $table2->data[0][1] .= '</a>';
+    $table2->data[0][1] .= '&nbsp;';
+    $table2->data[0][1] .= '<a href="javascript:">';
+    $table2->data[0][1] .= html_print_image(
+        'images/go_last.png',
+        true,
+        [
+            'title'   => __('Last match'),
+            'style'   => 'vertical-align: middle;',
+            'onclick' => 'searchLastMatch();',
+        ]
+    );
+    $table2->data[0][1] .= '</a>';
     $table2->cellstyle[0][1] = 'text-align:center;';
 
-    $table2->data[0][2] = '&nbsp;'.'<a href="javascript:">'.html_print_image(
+    $table2->data[0][2] = '&nbsp;';
+    $table2->data[0][2] .= '<a href="javascript:">'.html_print_image(
         'images/expand.png',
         true,
         [
@@ -817,8 +966,20 @@ function snmp_browser_print_container($return=false, $width='100%', $height='60%
             'style'   => 'vertical-align: middle;',
             'onclick' => 'expandAll();',
         ]
-    ).'</a>';
-    $table2->data[0][2] .= '&nbsp;'.'<a href="javascript:">'.html_print_image('images/collapse.png', true, ['title' => __('Collapse the tree'), 'style' => 'vertical-align: middle;', 'onclick' => 'collapseAll();']).'</a>';
+    );
+    $table2->data[0][2] .= '</a>';
+    $table2->data[0][2] .= '&nbsp;';
+    $table2->data[0][2] .= '<a href="javascript:">';
+    $table2->data[0][2] .= html_print_image(
+        'images/collapse.png',
+        true,
+        [
+            'title'   => __('Collapse the tree'),
+            'style'   => 'vertical-align: middle;',
+            'onclick' => 'collapseAll();',
+        ]
+    );
+    $table2->data[0][2] .= '</a>';
     $table2->cellstyle[0][2] = 'text-align:center;';
 
     // This extra div that can be handled by jquery's dialog.
@@ -828,7 +989,7 @@ function snmp_browser_print_container($return=false, $width='100%', $height='60%
     $output .= html_print_table($table, true);
     $output .= '</div>';
 
-    if (!isset($snmp_version)) {
+    if (isset($snmp_version) === false) {
         $snmp_version = null;
     }
 
@@ -838,40 +999,61 @@ function snmp_browser_print_container($return=false, $width='100%', $height='60%
         $output .= '<div id="snmp3_browser_options" style="display: none;">';
     }
 
-    $output .= ui_toggle(html_print_table($table3, true), __('SNMP v3 options'), '', '', true, true);
+    $output .= ui_toggle(
+        html_print_table($table3, true),
+        __('SNMP v3 options'),
+        '',
+        '',
+        true,
+        true
+    );
     $output .= '</div>';
     $output .= '<div style="width: 100%; padding-top: 10px;">';
-    $output .= ui_toggle(html_print_table($table2, true), __('Search options'), '', '', true, true);
+    $output .= ui_toggle(
+        html_print_table($table2, true),
+        __('Search options'),
+        '',
+        '',
+        true,
+        true
+    );
     $output .= '</div>';
 
-    // SNMP tree container
+    // SNMP tree container.
     $output .= '<div style="width: 100%; height: 100%; margin-top: 5px; position: relative;">';
     $output .= html_print_input_hidden('search_count', 0, true);
     $output .= html_print_input_hidden('search_index', -1, true);
 
-    // Save some variables for javascript functions
-    $output .= html_print_input_hidden('ajax_url', ui_get_full_url('ajax.php'), true);
-    $output .= html_print_input_hidden('search_matches_translation', __('Search matches'), true);
+    // Save some variables for javascript functions.
+    $output .= html_print_input_hidden(
+        'ajax_url',
+        ui_get_full_url('ajax.php'),
+        true
+    );
+    $output .= html_print_input_hidden(
+        'search_matches_translation',
+        __('Search matches'),
+        true
+    );
 
     $output .= '<div id="search_results" style="display: none; padding: 5px; background-color: #EAEAEA; border: 1px solid #E2E2E2; border-radius: 4px;"></div>';
     $output .= '<div id="spinner" style="position: absolute; top:0; left:0px; display:none; padding: 5px;">'.html_print_image('images/spinner.gif', true).'</div>';
     $output .= '<div id="snmp_browser">';
     $output .= '</div>';
-    $output .= '<div class="databox" id="snmp_data" style="margin: 5px; display:    none"></div>';
+    $output .= '<div class="databox" id="snmp_data" style="margin: 5px; display: none"></div>';
     $output .= '</div>';
     $output .= '</div>';
     $output .= '</div>';
 
     if ($show_massive_buttons) {
         $output .= '<div id="snmp_create_buttons" style="display:none">';
-
-                $output .= html_print_submit_button(
-                    __('Create agent modules'),
-                    'create_modules_agent',
-                    false,
-                    ['class' => 'sub add'],
-                    true
-                );
+        $output .= html_print_submit_button(
+            __('Create agent modules'),
+            'create_modules_agent',
+            false,
+            ['class' => 'sub add'],
+            true
+        );
 
         if (enterprise_installed()) {
             $output .= html_print_submit_button(
@@ -883,15 +1065,15 @@ function snmp_browser_print_container($return=false, $width='100%', $height='60%
             );
         }
 
-                $output .= html_print_submit_button(
-                    __('Create network components'),
-                    'create_modules_network_component',
-                    false,
-                    ['class' => 'sub add'],
-                    true
-                );
+        $output .= html_print_submit_button(
+            __('Create network components'),
+            'create_modules_network_component',
+            false,
+            ['class' => 'sub add'],
+            true
+        );
 
-                $output .= '</div>';
+        $output .= '</div>';
     }
 
     if ($return) {
diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php
index 5aace86006..fe36bc34fa 100644
--- a/pandora_console/include/functions_tags.php
+++ b/pandora_console/include/functions_tags.php
@@ -941,7 +941,7 @@ function tags_get_acl_tags_event_condition(
         }
 
         // Group condition (The module belongs to an agent of the group X)
-        // $group_condition = sprintf('id_grupo IN (%s)', implode(',', array_values(groups_get_id_recursive($group_id, true))));.
+        // $group_condition = sprintf('id_grupo IN (%s)', implode(',', array_values(groups_get_children_ids($group_id, true))));.
         $group_condition = '('.$id_grupo_table_pretag.'id_grupo = '.$group_id.' OR '.$alt_id_grupo_table_pretag.'id_group = '.$group_id.')';
 
         // Tags condition (The module has at least one of the restricted tags).
@@ -1350,7 +1350,7 @@ function tags_checks_event_acl($id_user, $id_group, $access, $tags=[], $children
     foreach ($user_tags as $user_tag) {
         $tags_user = $user_tag['tags'];
         $id_group_user = $user_tag['id_grupo'];
-        $childrens = groups_get_childrens($id_group_user, null, true);
+        $childrens = groups_get_children($id_group_user, null, true);
 
         if (empty($childrens)) {
             $group_ids = $id_group_user;
@@ -1421,7 +1421,7 @@ function tags_get_agents_counter($id_tag, $groups_and_tags=[], $agent_filter=[],
                 $tags_arr = explode(',', $tags);
                 foreach ($tags_arr as $tag) {
                     if ($tag == $id_tag) {
-                        $hierarchy_groups = groups_get_id_recursive($group_id);
+                        $hierarchy_groups = groups_get_children_ids($group_id);
                         $groups_id = array_merge($groups_id, $hierarchy_groups);
                     }
                 }
@@ -1923,7 +1923,7 @@ function tags_get_monitors_counter($id_tag, $groups_and_tags=[], $agent_filter=[
                 $tags_arr = explode(',', $tags);
                 foreach ($tags_arr as $tag) {
                     if ($tag == $id_tag) {
-                        $hierarchy_groups = groups_get_id_recursive($group_id);
+                        $hierarchy_groups = groups_get_children_ids($group_id);
                         $groups_id = array_merge($groups_id, $hierarchy_groups);
                     }
                 }
@@ -2219,7 +2219,7 @@ function tags_monitors_fired_alerts($id_tag, $groups_and_tags=[], $id_agente=fal
                 $tags_arr = explode(',', $tags);
                 foreach ($tags_arr as $tag) {
                     if ($tag == $id_tag) {
-                        $hierarchy_groups = groups_get_id_recursive($group_id);
+                        $hierarchy_groups = groups_get_children_ids($group_id);
                         $groups_id = array_merge($groups_id, $hierarchy_groups);
                     }
                 }
@@ -2283,7 +2283,7 @@ function tags_get_monitors_alerts($id_tag, $groups_and_tags=[], $id_agente=false
                 $tags_arr = explode(',', $tags);
                 foreach ($tags_arr as $tag) {
                     if ($tag == $id_tag) {
-                        $hierarchy_groups = groups_get_id_recursive($group_id);
+                        $hierarchy_groups = groups_get_children_ids($group_id);
                         $groups_id = array_merge($groups_id, $hierarchy_groups);
                     }
                 }
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 25e0f67020..6663623e8b 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -537,15 +537,30 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
 
     // Check all groups
     $groups = agents_get_all_groups_agent($id_agente, $agent['id_grupo']);
-    if (! check_acl_one_of_groups($config['id_user'], $groups, 'AR') && ! check_acl_one_of_groups($config['id_user'], $groups, 'AW') && !$is_extra) {
+
+    if (is_metaconsole()) {
+        if (! check_acl_one_of_groups($config['id_user'], $groups, 'AR', false)
+            && ! check_acl_one_of_groups($config['id_user'], $groups, 'AW', false)
+        ) {
+            $grants_on_node = false;
+        } else {
+            $grants_on_node = true;
+        }
+    }
+
+    if (is_metaconsole()) {
+        metaconsole_restore_db();
+    }
+
+    if (! check_acl_one_of_groups($config['id_user'], $groups, 'AR', false)
+        && ! check_acl_one_of_groups($config['id_user'], $groups, 'AW', false)
+        && !$is_extra
+    ) {
         db_pandora_audit(
             'ACL Violation',
             'Trying to access Agent General Information'
         );
         include_once 'general/noaccess.php';
-        if (!empty($server_data) && is_metaconsole()) {
-            metaconsole_restore_db();
-        }
 
         return;
     }
@@ -586,7 +601,11 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
         $hashdata = md5($hashdata);
         $url = $server_data['server_url'].'/index.php?'.'sec=estado&'.'sec2=operation/agentes/ver_agente&'.'id_agente='.$agent['id_agente'].'&'.'loginhash=auto&'."loginhash_data=$hashdata&".'loginhash_user='.str_rot13($user);
 
-        $cellName .= '<a href="'.$url.'">'.'<b><span style="font-weight:bold;text-transform:uppercase;" title="'.$agent['nombre'].'">'.$agent['alias'].'</span></b></a>';
+        if ($grants_on_node) {
+            $cellName .= '<a href="'.$url.'">'.'<b><span style="font-weight:bold;text-transform:uppercase;" title="'.$agent['nombre'].'">'.$agent['alias'].'</span></b></a>';
+        } else {
+            $cellName .= '<b><span style="font-weight:bold;text-transform:uppercase;" title="'.$agent['nombre'].'">'.$agent['alias'].'</span></b>';
+        }
     } else {
         $url = ui_get_full_url(
             'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$agent['id_agente']
@@ -802,7 +821,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
     $events_graph = '<div style="width: 100%; height: 90px; display: flex; flex-direction: row; justify-content: center;">';
     $events_graph .= graph_graphic_agentevents(
         $id_agente,
-        '385px;',
+        '340px;margin:0',
         45,
         SECONDS_1DAY,
         '',
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 425d90a42b..b24e6fd94d 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2041,6 +2041,10 @@ function ui_pagination(
         'disable_user',
         'delete_user',
     ];
+
+    // Check if url has &#x20; blankspace and replace it.
+    preg_replace('/\&#x20;/', '%20', $url);
+
     $url = explode('&', $url);
 
     $finalUrl = [];
@@ -2118,7 +2122,7 @@ function ui_pagination(
             $output .= "<a class='pagination-arrows ".$other_class." offset_0'
 				href='javascript: ".$script_modified.";'>".html_print_image('images/go_first_g.png', true, ['class' => 'bot']).'</a>';
         } else {
-            $output .= "<a class='pagination-arrows ".$other_class." offset_0' href='".$url.'&amp;'.$offset_name."=0'>".html_print_image('images/go_first_g.png', true, ['class' => 'bot']).'</a>';
+            $output .= "<a class='pagination-arrows ".$other_class." offset_0' href='".io_safe_output($url).'&amp;'.$offset_name."=0'>".html_print_image('images/go_first_g.png', true, ['class' => 'bot']).'</a>';
         }
     }
 
@@ -2762,6 +2766,7 @@ function get_shape_status_set($type)
         // Small squares.
         case STATUS_SERVER_OK:
         case STATUS_SERVER_DOWN:
+        case STATUS_SERVER_CRASH:
             $return = ['class' => 'status_small_squares'];
         break;
 
@@ -2773,6 +2778,9 @@ function get_shape_status_set($type)
         case STATUS_AGENT_OK_BALL:
         case STATUS_AGENT_NO_DATA_BALL:
         case STATUS_AGENT_NO_MONITORS_BALL:
+        case STATUS_SERVER_OK_BALL:
+        case STATUS_SERVER_DOWN_BALL:
+        case STATUS_SERVER_CRASH_BALL:
             $return = ['class' => 'status_balls'];
         break;
 
@@ -4005,7 +4013,7 @@ function ui_get_url_refresh($params=false, $relative=true, $add_post=true)
                 $url .= $key.'['.$k.']='.$v.'&';
             }
         } else {
-            $url .= $key.'='.io_safe_input($value).'&';
+            $url .= $key.'='.io_safe_input(rawurlencode($value)).'&';
         }
     }
 
@@ -5609,7 +5617,8 @@ function ui_print_module_string_value(
     $value,
     $id_agente_module,
     $current_interval,
-    $module_name=null
+    $module_name=null,
+    $server_id=0
 ) {
     global $config;
 
@@ -5654,6 +5663,7 @@ function ui_print_module_string_value(
                 'last_data'   => $value,
                 'interval'    => $current_interval,
                 'module_name' => $module_name,
+                'id_node'     => $server_id ? $server_id : 0,
             ]
         );
         $salida = ui_get_snapshot_image($link, $is_snapshot).'&nbsp;&nbsp;';
@@ -5761,7 +5771,7 @@ function ui_get_snapshot_link($params, $only_params=false)
     $params = array_merge($default_params, $params);
 
     // First parameter of js winopeng_var.
-    $page = $config['homeurl'].'/operation/agentes/snapshot_view.php';
+    $page = ui_get_full_url('operation/agentes/snapshot_view.php', false, false, false);
 
     $url = $page.'?id='.$params['id_module'].'&label='.rawurlencode(urlencode(io_safe_output($params['module_name']))).'&id_node='.$params['id_node'];
 
@@ -6133,8 +6143,6 @@ function ui_print_message_dialog($title, $text, $id='', $img='', $text_button=''
  *
  * @return null
  */
-
-
 function ui_query_result_editor($name='default')
 {
     $editorSubContainer = html_print_div(
@@ -6224,5 +6232,30 @@ function ui_query_result_editor($name='default')
             'content' => ui_get_full_url(false, false, false, false),
         ]
     );
-
+}
+
+
+/**
+ * Generate a button for reveal the content of the password field.
+ *
+ * @param string  $name   Name of the field.
+ * @param boolean $return If true, return the string with the formed element.
+ *
+ * @return string
+ */
+function ui_print_reveal_password(string $name, bool $return=false)
+{
+    if (is_metaconsole()) {
+        $imagePath = '../../images/';
+    } else {
+        $imagePath = 'images/';
+    }
+
+    $output = '&nbsp;<img class="clickable forced_title" id="reveal_password_'.$name.'" src="'.$imagePath.'eye_show.png" onclick="reveal_password(\''.$name.'\')" data-use_title_for_force_title="1" data-title="'.__('Show password').'">';
+
+    if ($return === true) {
+        return $output;
+    }
+
+    echo $output;
 }
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 2b3dcbc093..6156e5e174 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -73,6 +73,24 @@ function update_manager_verify_trial()
 }
 
 
+/**
+ * Check if the trial license is not expired.
+ *
+ * @return boolean true if the trial license is expired, false otherwise.
+ */
+function update_manager_verify_license_expired()
+{
+    global $config;
+
+    $current_date = date('Ymd');
+    if (isset($config['license_expiry_date']) && $current_date >= $config['license_expiry_date']) {
+        return true;
+    }
+
+    return false;
+}
+
+
 /**
  * Parses responses from configuration wizard.
  *
@@ -454,13 +472,20 @@ function registration_wiz_process()
 function registration_wiz_modal(
     $return=false,
     $launch=true,
-    $callback=false
+    $callback=false,
+    $return_message=false
 ) {
     global $config;
     $output = '';
 
     // Do not show the wizard for trial licenses.
     if (update_manager_verify_trial()) {
+        ui_print_info_message('Your license is trial. Please contact Artica at info@artica.es for a valid license', '', $return_message);
+        return '';
+    }
+
+    if (update_manager_verify_license_expired()) {
+        ui_print_error_message('The license has expired. Please contact Artica at info@artica.es', '', $return_message);
         return '';
     }
 
diff --git a/pandora_console/include/functions_users.php b/pandora_console/include/functions_users.php
index 7b310889ac..73e7340838 100755
--- a/pandora_console/include/functions_users.php
+++ b/pandora_console/include/functions_users.php
@@ -616,7 +616,8 @@ function users_get_user_users(
     $id_user=false,
     $privilege='AR',
     $returnAllGroup=true,
-    $fields=null
+    $fields=null,
+    $filter_group=[]
 ) {
     global $config;
 
@@ -625,8 +626,12 @@ function users_get_user_users(
     $user_users = [];
     $array_user_group = [];
 
-    foreach ($user_groups as $id_user_group => $name_user_group) {
-        $array_user_group[] = $id_user_group;
+    if (empty($filter_group)) {
+        foreach ($user_groups as $id_user_group => $name_user_group) {
+            $array_user_group[] = $id_user_group;
+        }
+    } else {
+        $array_user_group = $filter_group;
     }
 
     $group_users = groups_get_users($array_user_group, false, $returnAllGroup);
@@ -831,3 +836,25 @@ function users_get_user_profile($id_user)
 
     return $user_profiles;
 }
+
+
+/**
+ * Obtiene una matriz con la informacion de cada usuario que pertenece a un grupo
+ *
+ * @param  string User id
+ * @return array Return .
+ */
+function users_get_users_group_by_group($id_group)
+{
+    $sql = sprintf(
+        "SELECT tusuario.* FROM tusuario 
+        LEFT JOIN tusuario_perfil ON tusuario_perfil.id_usuario = tusuario.id_user 
+        AND tusuario_perfil.id_grupo = '%s'
+        GROUP BY tusuario_perfil.id_usuario",
+        $id_group
+    );
+
+    $users = db_get_all_rows_sql($sql);
+
+    return $users;
+}
diff --git a/pandora_console/include/graphs/export_data.php b/pandora_console/include/graphs/export_data.php
index 8aca5c04b5..cab03220d5 100644
--- a/pandora_console/include/graphs/export_data.php
+++ b/pandora_console/include/graphs/export_data.php
@@ -15,6 +15,7 @@
 // This file only uses data retrieved in a request.
 require_once '../../include/config.php';
 require_once '../../include/functions.php';
+enterprise_include_once('include/functions_reporting_csv.php');
 
 global $config;
 
@@ -49,7 +50,10 @@ $filename = io_safe_output($filename);
  * );
  */
 $output_csv = function ($data, $filename) {
-    $separator = (string) get_parameter('separator', ';');
+    global $config;
+
+    $separator = (string) $config['csv_divider'];
+
     $excel_encoding = (bool) get_parameter('excel_encoding', false);
 
     // CSV Output
@@ -68,9 +72,15 @@ $output_csv = function ($data, $filename) {
                 throw new Exception(__('An error occured exporting the data'));
         }
 
+        // Get key for item value.
+        $value_key = array_search('value', $items['head']);
+
         $head_line = implode($separator, $items['head']);
         echo $head_line."\n";
         foreach ($items['data'] as $item) {
+             // Find value and replace csv decimal separator.
+            $item[$value_key] = csv_format_numeric($item[$value_key]);
+
             $item = str_replace('--> '.__('Selected'), '', $item);
             $line = implode($separator, $item);
 
diff --git a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
index 6466a72835..47b8879ace 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js
@@ -1,425 +1,424 @@
-(function ($) {
-	var options = {
-		export: {
-			export_data: false, // or true
-			labels_long: null,
-			homeurl: "",
-		},
-	};
+(function($) {
+  var options = {
+    export: {
+      export_data: false, // or true
+      labels_long: null,
+      homeurl: ""
+    }
+  };
 
-	function init(plot) {
-		plot.exportDataCSV = function (args) {
-			//amount = plot.getOptions().export.type,
-			//options = options || {};
+  function init(plot) {
+    plot.exportDataCSV = function(args) {
+      //amount = plot.getOptions().export.type,
+      //options = options || {};
 
-			// Options
-			var type = "csv";
-			type = type.toLowerCase().trim();
+      // Options
+      var type = "csv";
+      type = type.toLowerCase().trim();
 
-			var graphData,
-				dataObject,
-				dataObjects = plot.getData(),
-				result = [];
+      var graphData,
+        dataObject,
+        dataObjects = plot.getData(),
+        result = [];
 
-			// Throw errors
-			var retrieveDataOject = function (dataObjects) {
-				var result;
+      // Throw errors
+      var retrieveDataOject = function(dataObjects) {
+        var result;
 
-				if (typeof dataObjects === "undefined")
-					throw new Error("Empty parameter");
+        if (typeof dataObjects === "undefined")
+          throw new Error("Empty parameter");
 
-				// Try to retrieve the avg set (not 100% reliable, I know)
-				if (dataObjects.length == 1) {
-					result = dataObjects.shift();
-				}
-				if (dataObjects.length > 1) {
-					dataObjects.forEach(function (element) {
-						if (/^Avg.:/i.test(element.label)) result = element;
-					});
+        // Try to retrieve the avg set (not 100% reliable, I know)
+        if (dataObjects.length == 1) {
+          result = dataObjects.shift();
+        }
+        if (dataObjects.length > 1) {
+          dataObjects.forEach(function(element) {
+            if (/^Avg.:/i.test(element.label)) result = element;
+          });
 
-					// If the avg set is missing, retrieve the first set
-					if (typeof result === "undefined") result = dataObjects.shift();
-				}
+          // If the avg set is missing, retrieve the first set
+          if (typeof result === "undefined") result = dataObjects.shift();
+        }
 
-				if (typeof result === "undefined") throw new Error("Empty result");
+        if (typeof result === "undefined") throw new Error("Empty result");
 
-				return result;
-			};
+        return result;
+      };
 
-			// Throw errors
-			var processDataObject = function (dataObject) {
-				var result;
+      // Throw errors
+      var processDataObject = function(dataObject) {
+        var result;
 
-				if (typeof dataObject === "undefined")
-					throw new Error("Empty parameter");
+        if (typeof dataObject === "undefined")
+          throw new Error("Empty parameter");
 
-				if (
-					typeof dataObject.data === "undefined" ||
-					!(dataObject.data instanceof Array)
-				)
-					throw new Error("Object malformed");
+        if (
+          typeof dataObject.data === "undefined" ||
+          !(dataObject.data instanceof Array)
+        )
+          throw new Error("Object malformed");
 
-				/* {
-				 *   head: [<column>,<column>,...,<column>],
-				 *   data: [
-				 *     [<data>,<data>,...,<data>],
-				 *     [<data>,<data>,...,<data>],
-				 *     ...,
-				 *     [<data>,<data>,...,<data>],
-				 *   ]
-				 * }
-				 */
-				if (type === "csv") {
-					result = {
-						head: ["timestap", "date", "value", "label"],
-						data: [],
-					};
+        /* {
+         *   head: [<column>,<column>,...,<column>],
+         *   data: [
+         *     [<data>,<data>,...,<data>],
+         *     [<data>,<data>,...,<data>],
+         *     ...,
+         *     [<data>,<data>,...,<data>],
+         *   ]
+         * }
+         */
+        if (type === "csv") {
+          result = {
+            head: ["timestamp", "date", "value", "label"],
+            data: []
+          };
 
-					dataObject.data.forEach(function (item, index) {
-						var timestap = item[0];
+          dataObject.data.forEach(function(item, index) {
+            var timestamp = item[0];
 
-						var d = new Date(item[0]);
-						var monthNames = [
-							"Jan",
-							"Feb",
-							"Mar",
-							"Apr",
-							"May",
-							"Jun",
-							"Jul",
-							"Aug",
-							"Sep",
-							"Oct",
-							"Nov",
-							"Dec",
-						];
+            var d = new Date(item[0]);
+            var monthNames = [
+              "Jan",
+              "Feb",
+              "Mar",
+              "Apr",
+              "May",
+              "Jun",
+              "Jul",
+              "Aug",
+              "Sep",
+              "Oct",
+              "Nov",
+              "Dec"
+            ];
 
-						date_format =
-							(d.getDate() < 10 ? "0" : "") +
-							d.getDate() +
-							" " +
-							monthNames[d.getMonth()] +
-							" " +
-							d.getFullYear() +
-							" " +
-							(d.getHours() < 10 ? "0" : "") +
-							d.getHours() +
-							":" +
-							(d.getMinutes() < 10 ? "0" : "") +
-							d.getMinutes() +
-							":" +
-							(d.getSeconds() < 10 ? "0" : "") +
-							d.getSeconds();
+            date_format =
+              (d.getDate() < 10 ? "0" : "") +
+              d.getDate() +
+              " " +
+              monthNames[d.getMonth()] +
+              " " +
+              d.getFullYear() +
+              " " +
+              (d.getHours() < 10 ? "0" : "") +
+              d.getHours() +
+              ":" +
+              (d.getMinutes() < 10 ? "0" : "") +
+              d.getMinutes() +
+              ":" +
+              (d.getSeconds() < 10 ? "0" : "") +
+              d.getSeconds();
 
-						var date = date_format;
+            var date = date_format;
 
-						var value = item[1];
+            var value = item[1];
 
-						var clean_label = plot.getOptions().export.labels_long[
-							dataObject.label
-						];
-						clean_label = clean_label.replace(new RegExp("&#x20;", "g"), " ");
-						result.data.push([timestap, date, value, clean_label]);
-					});
-				} else if (type === "json") {
-					/* [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ],
-					 * [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ],
-					 * ...,
-					 * [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ]
-					 */
-					result = [];
+            var clean_label = plot.getOptions().export.labels_long[
+              dataObject.label
+            ];
+            clean_label = clean_label.replace(new RegExp("&#x20;", "g"), " ");
+            result.data.push([timestamp, date, value, clean_label]);
+          });
+        } else if (type === "json") {
+          /* [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ],
+           * [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ],
+           * ...,
+           * [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ]
+           */
+          result = [];
 
-					dataObject.data.forEach(function (item, index) {
-						var date = "",
-							value = item[1];
+          dataObject.data.forEach(function(item, index) {
+            var date = "",
+              value = item[1];
 
-						// Long labels are preferred
-						if (typeof labels_long[index] !== "undefined")
-							date = labels_long[index];
-						else if (typeof labels[index] !== "undefined") date = labels[index];
+            // Long labels are preferred
+            if (typeof labels_long[index] !== "undefined")
+              date = labels_long[index];
+            else if (typeof labels[index] !== "undefined") date = labels[index];
 
-						result.push({
-							date: date,
-							value: value,
-							label: dataObject.label,
-						});
-					});
-				}
+            result.push({
+              date: date,
+              value: value,
+              label: dataObject.label
+            });
+          });
+        }
 
-				if (typeof result === "undefined") throw new Error("Empty result");
+        if (typeof result === "undefined") throw new Error("Empty result");
 
-				return result;
-			};
+        return result;
+      };
 
-			try {
-				var elements = [];
-				dataObject = retrieveDataOject(dataObjects);
-				if (dataObject) {
-					elements.push(processDataObject(dataObject));
-				}
-				dataObjects.forEach(function (element) {
-					elements.push(processDataObject(element));
-				});
-				graphData = elements;
+      try {
+        var elements = [];
+        dataObject = retrieveDataOject(dataObjects);
+        if (dataObject) {
+          elements.push(processDataObject(dataObject));
+        }
+        dataObjects.forEach(function(element) {
+          elements.push(processDataObject(element));
+        });
+        graphData = elements;
 
+        // Transform the object data into a string
+        // cause PHP has limitations in the number
+        // of POST params received.
+        var graphDataStr = JSON.stringify(graphData);
 
-				// Transform the object data into a string
-				// cause PHP has limitations in the number
-				// of POST params received.
-				var graphDataStr = JSON.stringify(graphData);
+        // Build form
+        var $form = $("<form></form>"),
+          $dataInput = $("<input>"),
+          $typeInput = $("<input>"),
+          $separatorInput = $("<input>"),
+          $excelInput = $("<input>");
 
-				// Build form
-				var $form = $("<form></form>"),
-					$dataInput = $("<input>"),
-					$typeInput = $("<input>"),
-					$separatorInput = $("<input>"),
-					$excelInput = $("<input>");
+        $dataInput
+          .prop("name", "data")
+          .prop("type", "text")
+          .prop("value", graphDataStr);
 
-				$dataInput
-					.prop("name", "data")
-					.prop("type", "text")
-					.prop("value", graphDataStr);
+        $typeInput
+          .prop("name", "type")
+          .prop("type", "text")
+          .prop("value", type);
 
-				$typeInput
-					.prop("name", "type")
-					.prop("type", "text")
-					.prop("value", type);
+        $separatorInput
+          .prop("name", "separator")
+          .prop("type", "text")
+          .prop("value", ";");
 
-				$separatorInput
-					.prop("name", "separator")
-					.prop("type", "text")
-					.prop("value", ";");
+        $excelInput
+          .prop("name", "excel_encoding")
+          .prop("type", "text")
+          .prop("value", 0);
 
-				$excelInput
-					.prop("name", "excel_encoding")
-					.prop("type", "text")
-					.prop("value", 0);
+        $form
+          .prop("method", "POST")
+          .prop(
+            "action",
+            plot.getOptions().export.homeurl + "include/graphs/export_data.php"
+          )
+          .append($dataInput, $typeInput, $separatorInput, $excelInput)
+          .hide()
+          // Firefox made me write into the DOM for this :(
+          .appendTo("body")
+          .submit();
+      } catch (e) {
+        alert("There was an error exporting the data");
+      }
+    };
 
-				$form
-					.prop("method", "POST")
-					.prop(
-						"action",
-						plot.getOptions().export.homeurl + "include/graphs/export_data.php"
-					)
-					.append($dataInput, $typeInput, $separatorInput, $excelInput)
-					.hide()
-					// Firefox made me write into the DOM for this :(
-					.appendTo("body")
-					.submit();
-			} catch (e) {
-				alert("There was an error exporting the data");
-			}
-		};
+    plot.exportDataJSON = function(args) {
+      //amount = plot.getOptions().export.type,
+      //options = options || {};
 
-		plot.exportDataJSON = function (args) {
-			//amount = plot.getOptions().export.type,
-			//options = options || {};
+      // Options
+      var type = "json";
+      type = type.toLowerCase().trim();
 
-			// Options
-			var type = "json";
-			type = type.toLowerCase().trim();
+      var graphData,
+        dataObject,
+        dataObjects = plot.getData(),
+        result = [];
 
-			var graphData,
-				dataObject,
-				dataObjects = plot.getData(),
-				result = [];
+      // Throw errors
+      var retrieveDataOject = function(dataObjects) {
+        var result;
 
-			// Throw errors
-			var retrieveDataOject = function (dataObjects) {
-				var result;
+        if (typeof dataObjects === "undefined")
+          throw new Error("Empty parameter");
 
-				if (typeof dataObjects === "undefined")
-					throw new Error("Empty parameter");
+        // Try to retrieve the avg set (not 100% reliable, I know)
+        if (dataObjects.length == 1) {
+          result = dataObjects.shift();
+        }
+        if (dataObjects.length > 1) {
+          dataObjects.forEach(function(element) {
+            if (/^Avg.:/i.test(element.label)) result = element;
+          });
 
-				// Try to retrieve the avg set (not 100% reliable, I know)
-				if (dataObjects.length == 1) {
-					result = dataObjects.shift();
-				}
-				if (dataObjects.length > 1) {
-					dataObjects.forEach(function (element) {
-						if (/^Avg.:/i.test(element.label)) result = element;
-					});
+          // If the avg set is missing, retrieve the first set
+          if (typeof result === "undefined") result = dataObjects.shift();
+        }
 
-					// If the avg set is missing, retrieve the first set
-					if (typeof result === "undefined") result = dataObjects.shift();
-				}
+        if (typeof result === "undefined") throw new Error("Empty result");
 
-				if (typeof result === "undefined") throw new Error("Empty result");
+        return result;
+      };
 
-				return result;
-			};
+      // Throw errors
+      var processDataObject = function(dataObject) {
+        var result;
 
-			// Throw errors
-			var processDataObject = function (dataObject) {
-				var result;
+        if (typeof dataObject === "undefined")
+          throw new Error("Empty parameter");
 
-				if (typeof dataObject === "undefined")
-					throw new Error("Empty parameter");
+        if (
+          typeof dataObject.data === "undefined" ||
+          !(dataObject.data instanceof Array)
+        )
+          throw new Error("Object malformed");
 
-				if (
-					typeof dataObject.data === "undefined" ||
-					!(dataObject.data instanceof Array)
-				)
-					throw new Error("Object malformed");
+        /* {
+         *   head: [<column>,<column>,...,<column>],
+         *   data: [
+         *     [<data>,<data>,...,<data>],
+         *     [<data>,<data>,...,<data>],
+         *     ...,
+         *     [<data>,<data>,...,<data>],
+         *   ]
+         * }
+         */
+        if (type === "csv") {
+          result = {
+            head: ["date", "value", "label"],
+            data: []
+          };
 
-				/* {
-				 *   head: [<column>,<column>,...,<column>],
-				 *   data: [
-				 *     [<data>,<data>,...,<data>],
-				 *     [<data>,<data>,...,<data>],
-				 *     ...,
-				 *     [<data>,<data>,...,<data>],
-				 *   ]
-				 * }
-				 */
-				if (type === "csv") {
-					result = {
-						head: ["date", "value", "label"],
-						data: [],
-					};
+          dataObject.data.forEach(function(item, index) {
+            var date = "",
+              value = item[1];
 
-					dataObject.data.forEach(function (item, index) {
-						var date = "",
-							value = item[1];
+            // Long labels are preferred
+            if (
+              typeof plot.getOptions().export.labels_long[index] !== "undefined"
+            )
+              date = plot.getOptions().export.labels_long[index];
+            else if (typeof labels[index] !== "undefined") date = labels[index];
 
-						// Long labels are preferred
-						if (
-							typeof plot.getOptions().export.labels_long[index] !== "undefined"
-						)
-							date = plot.getOptions().export.labels_long[index];
-						else if (typeof labels[index] !== "undefined") date = labels[index];
+            result.data.push([date, value, dataObject.label]);
+          });
+        } else if (type === "json") {
+          /* [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ],
+           * [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ],
+           * ...,
+           * [
+           *   {
+           *     'date': <date>,
+           *     'value': <value>
+           *   }
+           * ]
+           */
+          result = [];
 
-						result.data.push([date, value, dataObject.label]);
-					});
-				} else if (type === "json") {
-					/* [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ],
-					 * [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ],
-					 * ...,
-					 * [
-					 *   {
-					 *     'date': <date>,
-					 *     'value': <value>
-					 *   }
-					 * ]
-					 */
-					result = [];
+          dataObject.data.forEach(function(item, index) {
+            var date = "",
+              value = item[1];
 
-					dataObject.data.forEach(function (item, index) {
-						var date = "",
-							value = item[1];
+            // Long labels are preferred
+            if (typeof labels_long[index] !== "undefined")
+              date = labels_long[index];
+            else if (typeof labels[index] !== "undefined") date = labels[index];
 
-						// Long labels are preferred
-						if (typeof labels_long[index] !== "undefined")
-							date = labels_long[index];
-						else if (typeof labels[index] !== "undefined") date = labels[index];
+            result.push({
+              date: date,
+              value: value,
+              label: dataObject.label
+            });
+          });
+        }
 
-						result.push({
-							date: date,
-							value: value,
-							label: dataObject.label,
-						});
-					});
-				}
+        if (typeof result === "undefined") throw new Error("Empty result");
 
-				if (typeof result === "undefined") throw new Error("Empty result");
+        return result;
+      };
 
-				return result;
-			};
+      try {
+        var elements = [];
+        var custom_graph = $("input:hidden[name=custom_graph]").value;
 
-			try {
-				var elements = [];
-				var custom_graph = $("input:hidden[name=custom_graph]").value;
+        if (custom_graph) {
+          dataObject = retrieveDataOject(dataObjects);
+          dataObjects.forEach(function(element) {
+            elements.push(processDataObject(element));
+          });
+          graphData = elements;
+        } else {
+          dataObject = retrieveDataOject(dataObjects);
+          elements.push(processDataObject(dataObject));
+          graphData = elements;
+        }
 
-				if (custom_graph) {
-					dataObject = retrieveDataOject(dataObjects);
-					dataObjects.forEach(function (element) {
-						elements.push(processDataObject(element));
-					});
-					graphData = elements;
-				} else {
-					dataObject = retrieveDataOject(dataObjects);
-					elements.push(processDataObject(dataObject));
-					graphData = elements;
-				}
+        // Transform the object data into a string
+        // cause PHP has limitations in the number
+        // of POST params received.
+        var graphDataStr = JSON.stringify(graphData);
 
-				// Transform the object data into a string
-				// cause PHP has limitations in the number
-				// of POST params received.
-				var graphDataStr = JSON.stringify(graphData);
+        // Build form
+        var $form = $("<form></form>"),
+          $dataInput = $("<input>"),
+          $typeInput = $("<input>"),
+          $separatorInput = $("<input>"),
+          $excelInput = $("<input>");
 
-				// Build form
-				var $form = $("<form></form>"),
-					$dataInput = $("<input>"),
-					$typeInput = $("<input>"),
-					$separatorInput = $("<input>"),
-					$excelInput = $("<input>");
+        $dataInput
+          .prop("name", "data")
+          .prop("type", "text")
+          .prop("value", graphDataStr);
 
-				$dataInput
-					.prop("name", "data")
-					.prop("type", "text")
-					.prop("value", graphDataStr);
+        $typeInput
+          .prop("name", "type")
+          .prop("type", "text")
+          .prop("value", type);
 
-				$typeInput
-					.prop("name", "type")
-					.prop("type", "text")
-					.prop("value", type);
+        $separatorInput
+          .prop("name", "separator")
+          .prop("type", "text")
+          .prop("value", ";");
 
-				$separatorInput
-					.prop("name", "separator")
-					.prop("type", "text")
-					.prop("value", ";");
+        $excelInput
+          .prop("name", "excel_encoding")
+          .prop("type", "text")
+          .prop("value", 0);
 
-				$excelInput
-					.prop("name", "excel_encoding")
-					.prop("type", "text")
-					.prop("value", 0);
+        $form
+          .prop("method", "POST")
+          .prop(
+            "action",
+            plot.getOptions().export.homeurl + "include/graphs/export_data.php"
+          )
+          .append($dataInput, $typeInput, $separatorInput, $excelInput)
+          .hide()
+          // Firefox made me write into the DOM for this :(
+          .appendTo("body")
+          .submit();
+      } catch (e) {
+        alert("There was an error exporting the data");
+      }
+    };
+  }
 
-				$form
-					.prop("method", "POST")
-					.prop(
-						"action",
-						plot.getOptions().export.homeurl + "include/graphs/export_data.php"
-					)
-					.append($dataInput, $typeInput, $separatorInput, $excelInput)
-					.hide()
-					// Firefox made me write into the DOM for this :(
-					.appendTo("body")
-					.submit();
-			} catch (e) {
-				alert("There was an error exporting the data");
-			}
-		};
-	}
-
-	$.plot.plugins.push({
-		init: init,
-		options: options,
-		name: "exportdata",
-		version: "0.1",
-	});
+  $.plot.plugins.push({
+    init: init,
+    options: options,
+    name: "exportdata",
+    version: "0.1"
+  });
 })(jQuery);
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 87ecf4b33f..a35b5dd71b 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -230,21 +230,6 @@ function pandoraFlotPieCustom(
     );
   }
   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");
 
   if (background_color == "transparent") {
     $(".legend>table").css("background-color", "");
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index dc4e556292..81c9cc79cf 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -346,13 +346,7 @@ function menu_graph(
         $threshold = true;
     }
 
-    $return .= "<div id='general_menu_$graph_id' class='menu_graph' style='
-                    width: 20px;
-                    height: 150px;
-                    left:100%;
-                    position: absolute;
-                    top: 0px;
-                    background-color: tranparent;'>";
+    $return .= "<div id='general_menu_$graph_id' class='menu_graph'>";
     $return .= "<div id='menu_$graph_id' "."style='display: none; ".'text-align: center;'.'position: relative;'."border-bottom: 0px;'>
         <a href='javascript:'><img id='menu_cancelzoom_$graph_id' src='".$params['homeurl']."images/zoom_cross_grey.disabled.png' alt='".__('Cancel zoom')."' title='".__('Cancel zoom')."'></a>";
     if ($threshold) {
@@ -745,13 +739,12 @@ function flot_slicesbar_graph(
 
     // Set some containers to legend, graph, timestamp tooltip, etc.
     $height = ((int) $height + 15);
-    if ($stat_win) {
-        $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'%; height: '.$height."px; display: inline-block;'></div>";
-    } else {
-        $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width.'%; height: '.$height."px;'></div>";
-    }
 
-    $return .= "<div id='value_$graph_id' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>";
+    $style = 'width:'.$width.'%;';
+    $style .= 'height:'.$height.'px;';
+    $return = "<div id='".$graph_id."' class='noresizevc graph ".$adapt_key."' style='".$style."'></div>";
+
+    $return .= "<div id='value_".$graph_id."' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>";
 
     // Set a weird separator to serialize and unserialize
     // passing data from php to javascript.
diff --git a/pandora_console/include/javascript/connection_check.js b/pandora_console/include/javascript/connection_check.js
new file mode 100644
index 0000000000..5ea72d2184
--- /dev/null
+++ b/pandora_console/include/javascript/connection_check.js
@@ -0,0 +1,170 @@
+/**
+ * -------------------------------------
+ *        Connection Check
+ * --------------------------------------
+ */
+
+checkConnection(1);
+
+/**
+ * Performs connection tests every minutes and add connection listeners
+ * @param {integer} time in minutes
+ */
+
+function checkConnection(minutes) {
+  var cicle = minutes * 60 * 1000;
+  var checkConnection = setInterval(handleConnection, cicle);
+
+  // Connection listeters.
+  window.addEventListener("online", handleConnection);
+  window.addEventListener("offline", handleConnection);
+}
+
+/**
+ * Handle connection status test.
+ *
+ * Test conectivity with server and shows modal message.
+ */
+function handleConnection() {
+  var connected;
+  var msg = "online";
+
+  if (navigator.onLine) {
+    isReachable(getServerUrl())
+      .then(function(online) {
+        if (online) {
+          // handle online status
+          connected = true;
+          showConnectionMessage(connected, msg);
+        } else {
+          connected = false;
+          msg = "No connectivity with server";
+          showConnectionMessage(connected, msg);
+        }
+      })
+      .catch(function(err) {
+        connected = false;
+        msg = err;
+        showConnectionMessage(connected, msg);
+      });
+  } else {
+    // handle offline status
+    connected = false;
+    msg = "Connection offline";
+    showConnectionMessage(connected, msg);
+  }
+}
+
+/**
+ * Test server reachibilty and get response.
+ *
+ * @param {String} url
+ *
+ * Return {promise}
+ */
+function isReachable(url) {
+  /**
+   * Note: fetch() still "succeeds" for 404s on subdirectories,
+   * which is ok when only testing for domain reachability.
+   *
+   * Example:
+   *   https://google.com/noexist does not throw
+   *   https://noexist.com/noexist does throw
+   */
+  return fetch(url, { method: "HEAD", mode: "no-cors" })
+    .then(function(resp) {
+      return resp && (resp.ok || resp.type === "opaque");
+    })
+    .catch(function(error) {
+      console.warn("[conn test failure]:", error);
+    });
+}
+
+/**
+ * Gets server origin url
+ */
+function getServerUrl() {
+  var server_url;
+
+  server_url = window.location.origin;
+
+  return server_url;
+}
+
+/**
+ * Shows or hide connection infoMessage.
+ *
+ * @param {bool} conn
+ * @param {string} msg
+ */
+function showConnectionMessage(conn = true, msg = "") {
+  var data = {};
+  if (conn) {
+    $("div#message_dialog_connection")
+      .closest(".ui-dialog-content")
+      .dialog("close");
+  } else {
+    data.title = "Connection with server has been lost";
+    data.text = "Connection status: " + msg;
+
+    infoMessage(data, "message_dialog_connection");
+  }
+}
+
+function infoMessage(data, idMsg) {
+  var title = data.title;
+  var err_messge = data.text;
+
+  if (idMsg == null) {
+    idMsg = uniqId();
+  }
+
+  if ($("#" + idMsg).length === 0) {
+    $("body").append('<div title="' + title + '" id="' + idMsg + '"></div>');
+    $("#" + idMsg).empty();
+  }
+
+  $("#err_msg").empty();
+  $("#err_msg").html("\n\n" + err_messge);
+
+  $("#" + idMsg)
+    .dialog({
+      height: 250,
+      width: 528,
+      opacity: 1,
+      modal: true,
+      position: {
+        my: "center",
+        at: "center",
+        of: window,
+        collision: "fit"
+      },
+      title: data.title,
+      buttons: [
+        {
+          class:
+            "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
+          text: "Retry",
+          click: function(e) {
+            handleConnection();
+          }
+        },
+        {
+          class:
+            "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-cancel",
+          text: "Close",
+          click: function() {
+            $(this).dialog("close");
+          }
+        }
+      ],
+
+      open: function(event, ui) {
+        $(".ui-widget-overlay").addClass("error-modal-opened");
+      },
+      close: function(event, ui) {
+        $(".ui-widget-overlay").removeClass("error-modal-opened");
+      }
+    })
+    .show();
+}
diff --git a/pandora_console/include/javascript/dynamic_service.js b/pandora_console/include/javascript/dynamic_service.js
new file mode 100644
index 0000000000..ef1af08a15
--- /dev/null
+++ b/pandora_console/include/javascript/dynamic_service.js
@@ -0,0 +1,71 @@
+function updateSmartValue(event) {
+  var eventType = event.type;
+  var inputElement = $("#" + event.target.id);
+  var inputValue = inputElement.val();
+  var valueType = event.target.id.split("-");
+
+  if (eventType === "focus") {
+    inputElement.val(parseInt(inputValue));
+  } else if (eventType === "blur") {
+    change_mode();
+  } else {
+    var keyPressed = event.keyCode;
+    if (
+      (keyPressed <= 48 && keyPressed >= 57) ||
+      (inputElement.val() < 0 || inputElement.val() > 100)
+    ) {
+      event.preventDefault();
+    } else {
+      $("#text-" + valueType[0]).val(inputElement.val());
+    }
+  }
+}
+
+function change_mode(alt) {
+  var modeStatus = $("#mode").val();
+  var serviceMode = $("#hidden-service_mode_smart").val();
+  if (modeStatus == serviceMode) {
+    $(".smart_thresholds").css("display", "inline-flex");
+
+    var crit = parseFloat($("#text-critical").val());
+    var warn = parseFloat($("#text-warning").val());
+
+    if (crit < warn) {
+      $("#text-critical").val($("#text-warning").val());
+    }
+
+    $("#critical-val-d").val($("#text-critical").val() + " %");
+    $("#warning-val-d").val($("#text-warning").val() + " %");
+
+    if (alt != 1) {
+      $("#text-critical")
+        .prop("type", "range")
+        .prop("step", "0.01")
+        .prop("min", "0")
+        .prop("max", "100")
+        .on("input", function() {
+          change_mode(1);
+        });
+
+      $("#text-warning")
+        .prop("type", "range")
+        .prop("step", "0.01")
+        .prop("min", "0")
+        .prop("max", "100")
+        .on("input", function() {
+          change_mode(1);
+        });
+    }
+  } else {
+    $(".smart_thresholds").css("display", "none");
+
+    $("#text-critical")
+      .prop("type", "number")
+      .on("input", function() {})
+      .show();
+    $("#text-warning")
+      .prop("type", "number")
+      .on("input", function() {})
+      .show();
+  }
+}
diff --git a/pandora_console/include/javascript/multiselect_filtered.js b/pandora_console/include/javascript/multiselect_filtered.js
index 27135c6843..7976158740 100644
--- a/pandora_console/include/javascript/multiselect_filtered.js
+++ b/pandora_console/include/javascript/multiselect_filtered.js
@@ -113,7 +113,9 @@ function reloadContent(id, url, options, side, noneStr) {
   data.side = side;
   data.group_recursion = $("#checkbox-id-group-recursion-" + current).prop(
     "checked"
-  );
+  )
+    ? 1
+    : 0;
   data.group_id = $("#id-group-" + current).val();
 
   $.ajax({
@@ -139,8 +141,8 @@ function reloadContent(id, url, options, side, noneStr) {
 
       for (var [value, label] of items) {
         if (
-          $("#" + opposite + " option[value=" + value + "]").length == 0 &&
-          $("#tmp-" + current + " option[value=" + value + "]").length == 0
+          $("#" + opposite + " option[value='" + value + "']").length == 0 &&
+          $("#tmp-" + current + " option[value='" + value + "']").length == 0
         ) {
           // Does not exist in opposite box nor is filtered.
           $("#" + current).append(new Option(label, value));
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 15c2f9fcf4..04a8f5336e 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -786,13 +786,12 @@ function post_process_select_events_unit(name, selected) {
 function post_process_select_events(name) {
   $("." + name + "_toggler").click(function() {
     var value = $("#text-" + name + "_text").val();
-
     var count = $("#" + name + "_select option").filter(function(i, item) {
       if (Number($(item).val()) == Number(value)) return true;
       else return false;
     }).length;
 
-    if (count != 1) {
+    if (count < 1) {
       $("#" + name + "_select").append(
         $("<option>")
           .val(value)
@@ -1931,120 +1930,3 @@ function ajaxRequest(id, settings) {
     }
   });
 }
-
-/**
- * -------------------------------------
- *        Connection Check
- * --------------------------------------
- */
-
-checkConnection(1);
-
-/**
- * Performs connection tests every minutes and add connection listeners
- * @param {integer} time in minutes
- */
-
-function checkConnection(minutes) {
-  var cicle = minutes * 60 * 1000;
-  var checkConnection = setInterval(handleConnection, cicle);
-
-  // Connection listeters.
-  window.addEventListener("online", handleConnection);
-  window.addEventListener("offline", handleConnection);
-}
-
-/**
- * Handle connection status test.
- *
- * Test conectivity with server and shows modal message.
- */
-function handleConnection() {
-  var connected;
-  var msg = "online";
-
-  if (navigator.onLine) {
-    isReachable(getServerUrl())
-      .then(function(online) {
-        if (online) {
-          // handle online status
-          connected = true;
-          showConnectionMessage(connected, msg);
-        } else {
-          connected = false;
-          msg = "No connectivity with server";
-          showConnectionMessage(connected, msg);
-        }
-      })
-      .catch(function(err) {
-        connected = false;
-        msg = err;
-        showConnectionMessage(connected, msg);
-      });
-  } else {
-    // handle offline status
-    connected = false;
-    msg = "Connection offline";
-    showConnectionMessage(connected, msg);
-  }
-}
-
-/**
- * Test server reachibilty and get response.
- *
- * @param {String} url
- *
- * Return {promise}
- */
-function isReachable(url) {
-  /**
-   * Note: fetch() still "succeeds" for 404s on subdirectories,
-   * which is ok when only testing for domain reachability.
-   *
-   * Example:
-   *   https://google.com/noexist does not throw
-   *   https://noexist.com/noexist does throw
-   */
-  return fetch(url, { method: "HEAD", mode: "no-cors" })
-    .then(function(resp) {
-      return resp && (resp.ok || resp.type === "opaque");
-    })
-    .catch(function(error) {
-      console.warn("[conn test failure]:", error);
-    });
-}
-
-/**
- * Gets server origin url
- */
-function getServerUrl() {
-  var server_url;
-
-  try {
-    server_url = get_php_value("homeurl");
-  } catch (SyntaxError) {
-    console.warn("Pandora homeurl cannot be found.");
-    server_url = window.location.origin + "/pandora_console";
-  }
-  return server_url;
-}
-
-/**
- * Shows or hide connection infoMessage.
- *
- * @param {bool} conn
- * @param {string} msg
- */
-function showConnectionMessage(conn = true, msg = "") {
-  var data = {};
-  if (conn) {
-    $("div#message_dialog_connection")
-      .closest(".ui-dialog-content")
-      .dialog("close");
-  } else {
-    data.title = "Connection with server has been lost";
-    data.text = "Connection status: " + msg;
-
-    infoMessage(data, "message_dialog_connection");
-  }
-}
diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js
index 55c8ecb74a..c1b604b4e2 100644
--- a/pandora_console/include/javascript/pandora_events.js
+++ b/pandora_console/include/javascript/pandora_events.js
@@ -453,7 +453,6 @@ function perform_response_massive(response, response_id, out_iterator) {
 // Change the status of an event to new, in process or validated.
 function event_change_status(event_ids) {
   var new_status = $("#estado").val();
-  var event_id = $("#hidden-id_event").val();
   var meta = $("#hidden-meta").val();
   var history = $("#hidden-history").val();
 
@@ -472,7 +471,7 @@ function event_change_status(event_ids) {
     type: "POST",
     url: $("#hidden-ajax_file").val(),
     async: true,
-    dataType: "html",
+    dataType: "json",
     success: function(data) {
       $("#button-status_button").removeAttr("disabled");
       $("#response_loading").hide();
@@ -485,11 +484,20 @@ function event_change_status(event_ids) {
         $("#notification_status_error").hide();
       }
 
-      if (data == "status_ok") {
+      if (data.status == "status_ok") {
         if (typeof dt_events !== "undefined") {
           dt_events.draw(false);
         }
         $("#notification_status_success").show();
+        if (new_status == 1) {
+          $("#extended_event_general_page table td.general_acknowleded").text(
+            data.user
+          );
+        } else {
+          $("#extended_event_general_page table td.general_acknowleded").text(
+            "N/A"
+          );
+        }
       } else {
         $("#notification_status_error").show();
       }
@@ -942,7 +950,6 @@ function execute_event_response(event_list_btn) {
             });
             break;
           case "delete_selected":
-            console.log($(this));
             $(".chk_val:checked").each(function() {
               execute_delete_event_reponse(
                 dt_events,
diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js
index 2445473591..c2b6a86e01 100644
--- a/pandora_console/include/javascript/pandora_ui.js
+++ b/pandora_console/include/javascript/pandora_ui.js
@@ -552,3 +552,23 @@ function infoMessage(data, idMsg) {
     })
     .show();
 }
+
+function reveal_password(name) {
+  var passwordElement = $("#password-" + name);
+  var revealElement = $("#reveal_password_" + name);
+  var imagesPath = "";
+
+  if ($("#hidden-metaconsole_activated").val() == 1) {
+    imagesPath = "../../images/";
+  } else {
+    imagesPath = "images/";
+  }
+
+  if (passwordElement.attr("type") == "password") {
+    passwordElement.attr("type", "text");
+    revealElement.attr("src", imagesPath + "eye_hide.png");
+  } else {
+    passwordElement.attr("type", "password");
+    revealElement.attr("src", imagesPath + "eye_show.png");
+  }
+}
diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js
index f3e6ecec52..1aeb7ad799 100644
--- a/pandora_console/include/javascript/tree/TreeController.js
+++ b/pandora_console/include/javascript/tree/TreeController.js
@@ -12,6 +12,8 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
+/*global $, _*/
+
 var TreeController = {
   controllers: [],
   getController: function() {
@@ -38,12 +40,35 @@ var TreeController = {
           return;
         }
 
+        function _recursiveGroupsCount(elements, childGroupsLength) {
+          if (typeof childGroupsLength === "undefined") {
+            childGroupsLength = 0;
+          }
+
+          _.each(elements, function(element) {
+            if (typeof element.children !== "undefined") {
+              childGroupsLength = _recursiveGroupsCount(
+                element.children,
+                childGroupsLength
+              );
+              childGroupsLength += element.children.length;
+            }
+          });
+          return childGroupsLength;
+        }
+
         // Load branch
         function _processGroup(container, elements, rootGroup) {
           var $group = $("<ul></ul>");
+          var childGroupsLength = _recursiveGroupsCount(elements);
 
-          // First group
+          // First group.
           if (typeof rootGroup != "undefined" && rootGroup == true) {
+            var messageLength = controller.tree.length;
+            if (childGroupsLength > 0) {
+              messageLength = childGroupsLength + controller.tree.length;
+            }
+
             $group
               .addClass("tree-root")
               .hide()
@@ -54,13 +79,12 @@ var TreeController = {
                   'images/pandora.png" />' +
                   "<span class='margin-left-1'>" +
                   (controller.tree.length > 0
-                    ? controller.foundMessage + ": " + controller.tree.length
+                    ? controller.foundMessage + ": " + messageLength
                     : "") +
                   "</div>"
               );
-          }
-          // Normal group
-          else {
+          } else {
+            // Normal group.
             $group.addClass("tree-group").hide();
           }
 
@@ -637,7 +661,20 @@ var TreeController = {
                   .css("cursor", "pointer");
 
                 $content.append($serviceDetailImage);
-                $content.append(" " + element.name);
+                if (
+                  typeof element.elementDescription !== "undefined" &&
+                  element.elementDescription != ""
+                ) {
+                  $content.append(" " + element.elementDescription);
+                } else if (
+                  typeof element.description !== "undefined" &&
+                  element.description != ""
+                ) {
+                  $content.append(" " + element.description);
+                } else {
+                  $content.append(" " + element.name);
+                }
+                // $content.append(" " + element.name);
               } else {
                 $content.remove($node);
               }
diff --git a/pandora_console/include/lib/Agent.php b/pandora_console/include/lib/Agent.php
index f7a39bdab6..cfba92f526 100644
--- a/pandora_console/include/lib/Agent.php
+++ b/pandora_console/include/lib/Agent.php
@@ -104,13 +104,22 @@ class Agent extends Entity
     /**
      * Return last value (status) of the agent.
      *
+     * @param boolean $force Force recalculation.
+     *
      * @return integer Status of the agent.
      */
-    public function lastStatus()
+    public function lastStatus(bool $force=false)
     {
+        if ($force === true) {
+            return \agents_get_status(
+                $this->id_agente()
+            );
+        }
+
         return \agents_get_status_from_counts(
             $this->toArray()
         );
+
     }
 
 
diff --git a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php
index 2acd7f32fa..bd7d7d5886 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_group.php
@@ -278,6 +278,11 @@ class TopNEventByGroupWidget extends Widget
         ];
 
         // Groups.
+        $selected_groups = [];
+        if ($values['groupId']) {
+            $selected_groups = explode(',', $values['groupId'][0]);
+        }
+
         $inputs[] = [
             'label'     => __('Groups'),
             'arguments' => [
@@ -285,7 +290,7 @@ class TopNEventByGroupWidget extends Widget
                 'name'           => 'groupId[]',
                 'returnAllGroup' => true,
                 'privilege'      => 'AR',
-                'selected'       => explode(',', $values['groupId'][0]),
+                'selected'       => $selected_groups,
                 'return'         => true,
                 'multiple'       => true,
             ],
diff --git a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php
index 4bbaee22a8..148ace6aac 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/top_n_events_by_module.php
@@ -277,6 +277,11 @@ class TopNEventByModuleWidget extends Widget
             ],
         ];
 
+        $selected_groups = [];
+        if ($values['groupId']) {
+            $selected_groups = explode(',', $values['groupId'][0]);
+        }
+
         // Groups.
         $inputs[] = [
             'label'     => __('Groups'),
@@ -285,7 +290,7 @@ class TopNEventByModuleWidget extends Widget
                 'name'           => 'groupId[]',
                 'returnAllGroup' => true,
                 'privilege'      => 'AR',
-                'selected'       => explode(',', $values['groupId'][0]),
+                'selected'       => $selected_groups,
                 'return'         => true,
                 'multiple'       => true,
             ],
diff --git a/pandora_console/include/load_session.php b/pandora_console/include/load_session.php
index 3575310141..b557edd5d3 100644
--- a/pandora_console/include/load_session.php
+++ b/pandora_console/include/load_session.php
@@ -64,14 +64,23 @@ function pandora_session_close()
 function pandora_session_read($session_id)
 {
     $session_id = addslashes($session_id);
-    $session_data = db_get_value(
-        'data',
-        'tsessions_php',
-        'id_session',
-        $session_id
+
+    // Do not use SQL cache here.
+    $session_data = db_get_all_rows_sql(
+        sprintf(
+            'SELECT data
+            FROM `tsessions_php` WHERE id_session="%s"',
+            $session_id
+        ),
+        false,
+        false
     );
 
-    if (!empty($session_data)) {
+    if (is_array($session_data) === true) {
+        $session_data = $session_data[0]['data'];
+    }
+
+    if (empty($session_data) === false) {
         return $session_data;
     } else {
         return '';
@@ -90,7 +99,6 @@ function pandora_session_read($session_id)
 function pandora_session_write($session_id, $data)
 {
     $session_id = addslashes($session_id);
-
     if (is_ajax()) {
         // Avoid session upadte while processing ajax responses - notifications.
         if (get_parameter('check_new_notifications', false)) {
@@ -101,18 +109,22 @@ function pandora_session_write($session_id, $data)
     $values = [];
     $values['last_active'] = time();
 
-    if (!empty($data)) {
+    if (empty($data) === false) {
         $values['data'] = addslashes($data);
     }
 
-    $session_exists = (bool) db_get_value(
-        'COUNT(id_session)',
-        'tsessions_php',
-        'id_session',
-        $session_id
+    // Do not use SQL cache here.
+    $session_exists = db_get_all_rows_sql(
+        sprintf(
+            'SELECT id_session
+             FROM `tsessions_php` WHERE id_session="%s"',
+            $session_id
+        ),
+        false,
+        false
     );
 
-    if (!$session_exists) {
+    if ($session_exists === false) {
         $values['id_session'] = $session_id;
         $retval_write = db_process_sql_insert('tsessions_php', $values);
     } else {
@@ -198,11 +210,69 @@ function pandora_session_gc($max_lifetime=300)
 }
 
 
-$result_handler = session_set_save_handler(
-    'pandora_session_open',
-    'pandora_session_close',
-    'pandora_session_read',
-    'pandora_session_write',
-    'pandora_session_destroy',
-    'pandora_session_gc'
-);
+/**
+ * Enables custom session handlers.
+ *
+ * @return boolean Context changed or  not.
+ */
+function enable_session_handlers()
+{
+    global $config;
+
+    if ($config['_using_pandora_sessionhandlers'] !== true) {
+        if (session_status() !== PHP_SESSION_NONE) {
+            // Close previous version.
+            session_write_close();
+        }
+
+        $sesion_handler = session_set_save_handler(
+            'pandora_session_open',
+            'pandora_session_close',
+            'pandora_session_read',
+            'pandora_session_write',
+            'pandora_session_destroy',
+            'pandora_session_gc'
+        );
+
+        session_start();
+
+        // Restore previous session.
+        $config['_using_pandora_sessionhandlers'] = true;
+        return $sesion_handler;
+    }
+
+    return false;
+}
+
+
+/**
+ * Disables custom session handlers.
+ *
+ * @param string|null $id_session Force swap to target session.
+ *
+ * @return void
+ */
+function disable_session_handlers($id_session=null)
+{
+    global $config;
+
+    if (session_status() !== PHP_SESSION_NONE) {
+        // Close previous version.
+        session_write_close();
+    }
+
+    $ss = new SessionHandler();
+    session_set_save_handler($ss, true);
+
+    if ($id_session !== null) {
+        session_id($id_session);
+    }
+
+    session_start();
+
+    $config['_using_pandora_sessionhandlers'] = false;
+}
+
+
+// Always enable session handler.
+$result_handler = enable_session_handlers();
diff --git a/pandora_console/include/styles/agent_alerts.css b/pandora_console/include/styles/agent_alerts.css
new file mode 100644
index 0000000000..b3118ddd27
--- /dev/null
+++ b/pandora_console/include/styles/agent_alerts.css
@@ -0,0 +1,70 @@
+/* Specific CSS for Agent/Alerts view */
+
+.agents_modules_table .table {
+  width: 100%;
+  table-layout: fixed;
+}
+
+.agents_modules_table .next_previous_step {
+  width: 0.1%;
+}
+
+.agents_modules_table .header_table_principal_cell {
+  text-align: right !important;
+  padding-right: 13px;
+  width: 20%;
+}
+
+.agents_modules_table .header_table_caption_cell {
+  height: 200px;
+}
+
+.agents_modules_table .position_text_module {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+
+/* .agents_modules_table .position_text_module div {
+  padding-left: 10px;
+  margin-top: 90px;
+} */
+
+#full_screen_refresh_box,
+#slc-refresh-rate,
+#img-full-screen {
+  float: right;
+}
+
+#full_screen_refresh_box > li > label {
+  width: 100px;
+  margin-left: 20px;
+}
+
+.full_screen_button {
+  color: transparent;
+  width: 20%;
+  border: 0;
+}
+
+.agent_alerts_header_pure {
+  position: absolute;
+}
+
+.agents_alerts_header form > ul > li {
+  display: inline-flex;
+}
+
+.agents_alerts_header form ul {
+  clear: both;
+  width: 100%;
+}
+
+.agents_alerts_header form > ul > li:nth-child(1n + 1) {
+  margin-left: 2em;
+}
+
+.pagination-bottom {
+  margin-top: 15px;
+}
diff --git a/pandora_console/include/styles/multiselect_filtered.css b/pandora_console/include/styles/multiselect_filtered.css
index a938422456..c1eebbe657 100644
--- a/pandora_console/include/styles/multiselect_filtered.css
+++ b/pandora_console/include/styles/multiselect_filtered.css
@@ -2,9 +2,6 @@
   flex: 1 1 200px;
   min-width: 200px;
 }
-.multi-select-container * {
-  flex: 1 1 auto;
-}
 
 .multi-select.flex-column {
   justify-content: space-between;
@@ -16,10 +13,12 @@
 
 .multi-select-container.flex-column {
   flex-wrap: nowrap;
+  align-self: flex-end;
 }
 
 .arrows-container {
   width: 50px;
+  margin-bottom: 65px;
 }
 
 .multi-select-container .filter input,
@@ -40,8 +39,11 @@
 
 .group-filter.flex-row-vcenter div,
 .item-filter.flex-row-vcenter div {
+  display: flex;
   flex: 1 1 auto;
   width: 100%;
+  justify-content: space-between;
+  align-items: center;
 }
 
 .multi-select-container .title {
@@ -58,3 +60,14 @@
 .multi-select-container.flex-column div input {
   margin-left: 1em;
 }
+
+.multi-select-container
+  .select2-container--default
+  .select2-selection--single
+  .select2-selection__rendered {
+  line-height: inherit !important;
+}
+
+.p-slider {
+  margin: auto !important;
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 6b48ab13ae..bc743e9c77 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -462,6 +462,10 @@ select:-internal-list-box {
   width: 120px;
   max-width: 120px;
 }
+.w200px {
+  width: 200px;
+  max-width: 200px;
+}
 .w240px {
   width: 240px;
   max-width: 240px;
@@ -608,6 +612,13 @@ select:-internal-list-box {
   align-items: center;
 }
 
+.flex-row-end {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: flex-end;
+}
+
 .flex-space-around {
   justify-content: space-around;
 }
@@ -684,7 +695,11 @@ select:-internal-list-box {
   float: right;
 }
 .invisible {
-  display: none;
+  display: none !important;
+}
+
+.visible {
+  display: block;
 }
 
 div#page {
@@ -1480,6 +1495,7 @@ table.databox {
   padding: 9px 7px;
   font-weight: normal;
   color: #fff;
+  text-align: justify;
 }
 
 .databox > th * {
@@ -1705,6 +1721,20 @@ input.remove-item-img {
   background-position: center;
 }
 
+button.pure_full,
+input.pure_full {
+  background-image: url(../../images/full_screen.png);
+  background-repeat: no-repeat;
+  background-size: 21px 21px;
+}
+
+button.pure_normal,
+input.pure_normal {
+  background-image: url(../../images/normal_screen.png);
+  background-repeat: no-repeat;
+  background-size: 21px 21px;
+}
+
 /* end of classes for event priorities */
 div#main_pure {
   background-color: #fefefe;
@@ -3073,6 +3103,12 @@ div#stat-win-module-graph div.nodata_container {
 }
 
 .menu_graph {
+  width: 30px;
+  height: 150px;
+  left: 100%;
+  position: absolute;
+  top: 0px;
+  background-color: transparent;
   -moz-border-top-right-radius: 6px;
   -webkit-border-top-right-radius: 6px;
   border-top-right-radius: 6px;
@@ -5787,6 +5823,13 @@ div#status_pie {
   border-radius: 5px;
 }
 
+.status_rounded_rectangles.text_inside {
+  color: #ffffff;
+  text-align: center;
+  font-weight: bold;
+  padding-top: 0.4em;
+}
+
 .status_small_squares,
 .status_balls {
   width: 12px;
@@ -5865,7 +5908,7 @@ table.table_modal_alternate tr td:first-child {
 }
 
 .flot-text {
-  width: 101%;
+  width: 100%;
 }
 
 /*Font header feedback*/
@@ -6028,3 +6071,12 @@ div.graph div.legend div,
 div.graph div.legend table {
   top: 25px !important;
 }
+
+.rotate_text_module {
+  -ms-transform: rotate(270deg);
+  -webkit-transform: rotate(270deg);
+  -moz-transform: rotate(270deg);
+  -o-transform: rotate(270deg);
+  writing-mode: lr-tb;
+  white-space: nowrap;
+}
diff --git a/pandora_console/include/styles/wizard.css b/pandora_console/include/styles/wizard.css
index a183e2368f..0ef0df5ee6 100644
--- a/pandora_console/include/styles/wizard.css
+++ b/pandora_console/include/styles/wizard.css
@@ -11,6 +11,10 @@ ul.wizard {
 ul.wizard li {
   padding-bottom: 10px;
   padding-top: 10px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
 }
 
 ul.wizard li > label:not(.p-switch) {
diff --git a/pandora_console/index.php b/pandora_console/index.php
index af8671ded7..233f554749 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -222,7 +222,7 @@ echo '<head>'."\n";
 ob_start('ui_process_page_head');
 
 // Enterprise main.
-enterprise_include('index.php');
+enterprise_include_once('index.php');
 
 echo '<script type="text/javascript">';
     echo 'var dispositivo = navigator.userAgent.toLowerCase();';
@@ -273,6 +273,7 @@ if (strlen($search) > 0) {
 }
 
 // Login process.
+enterprise_include_once('include/auth/saml.php');
 if (! isset($config['id_user'])) {
     // Clear error messages.
     unset($_COOKIE['errormsg']);
@@ -389,30 +390,40 @@ if (! isset($config['id_user'])) {
         }
 
         $login_button_saml = get_parameter('login_button_saml', false);
+        config_update_value('2Fa_auth', '');
         if (isset($double_auth_success) && $double_auth_success) {
             // 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)) {
-            $saml_configured = include_once $config['homedir'].'/'.ENTERPRISE_DIR.'/include/auth/saml.php';
-
-            if (!$saml_configured) {
-                include_once 'general/noaccesssaml.php';
-            }
-
-            $saml_user_id = saml_process_user_login();
-
+            $saml_user_id = enterprise_hook('saml_process_user_login');
             if (!$saml_user_id) {
-                include_once 'general/noaccesssaml.php';
-            }
+                $login_failed = true;
+                include_once 'general/login_page.php';
+                while (@ob_end_flush()) {
+                    // Dumping...
+                    continue;
+                }
 
+                exit('</html>');
+            }
 
             $nick_in_db = $saml_user_id;
             if (!$nick_in_db) {
-                include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-                $as = new SimpleSAML_Auth_Simple($config['saml_source']);
-                $as->logout();
+                if ($config['auth'] === 'saml') {
+                    enterprise_hook('saml_logout');
+                }
+
+                if (session_status() !== PHP_SESSION_NONE) {
+                    $_SESSION = [];
+                    session_destroy();
+                    header_remove('Set-Cookie');
+                    setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+                }
+
+                // Process logout.
+                include 'general/logoff.php';
             }
         } else {
             // process_user_login is a virtual function which should be defined in each auth file.
@@ -709,6 +720,8 @@ if (! isset($config['id_user'])) {
             $redirect_url .= '&'.safe_url_extraclean($key).'='.safe_url_extraclean($value);
         }
 
+        $double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $config['id_user']);
+
         header('Location: '.ui_get_full_url('index.php'.$redirect_url));
         exit;
         // Always exit after sending location headers.
@@ -735,7 +748,7 @@ if (! isset($config['id_user'])) {
 
             exit('</html>');
         }
-    } else {
+    } else if (isset($_GET['bye']) === false) {
         // There is no user connected.
         if ($config['enterprise_installed']) {
             enterprise_include_once('include/functions_reset_pass.php');
@@ -750,7 +763,17 @@ if (! isset($config['id_user'])) {
         $pass2 = get_parameter_post('pass2');
         $id_user = get_parameter_post('id_user');
 
-        if ($correct_pass_change && !empty($pass1) && !empty($pass2) && !empty($id_user)) {
+        if ($reset_hash != '') {
+            $hash_data = explode(':::', $reset_hash);
+            $id_user = $hash_data[0];
+            $codified_hash = $hash_data[1];
+
+            $db_reset_pass_entry = db_get_value_filter('reset_time', 'treset_pass', ['id_user' => $id_user, 'cod_hash' => $id_user.':::'.$codified_hash]);
+        }
+
+        if ($correct_pass_change && !empty($pass1) && !empty($pass2) && !empty($id_user) && $db_reset_pass_entry) {
+            delete_reset_pass_entry($id_user);
+
             $correct_reset_pass_process = '';
             $process_error_message = '';
 
@@ -787,21 +810,14 @@ if (! isset($config['id_user'])) {
             include_once 'general/login_page.php';
         } else {
             if ($reset_hash != '') {
-                $hash_data = explode(':::', $reset_hash);
-                $id_user = $hash_data[0];
-                $codified_hash = $hash_data[1];
-
-                $db_reset_pass_entry = db_get_value_filter('reset_time', 'treset_pass', ['id_user' => $id_user, 'cod_hash' => $id_user.':::'.$codified_hash]);
                 $process_error_message = '';
 
                 if ($db_reset_pass_entry) {
                     if (($db_reset_pass_entry + SECONDS_2HOUR) < time()) {
                         register_pass_change_try($id_user, 0);
                         $process_error_message = __('Too much time since password change request');
-                        delete_reset_pass_entry($id_user);
                         include_once 'general/login_page.php';
                     } else {
-                        delete_reset_pass_entry($id_user);
                         include_once 'enterprise/include/process_reset_pass.php';
                     }
                 } else {
@@ -950,6 +966,10 @@ if (! isset($config['id_user'])) {
             }
 
             exit('</html>');
+        } else {
+            if ($config['auth'] === 'saml') {
+                enterprise_hook('saml_login_status_verifier');
+            }
         }
     }
 }
@@ -961,19 +981,19 @@ if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
 
 // Log off.
 if (isset($_GET['bye'])) {
-    include 'general/logoff.php';
     $iduser = $_SESSION['id_usuario'];
 
+    if ($config['auth'] === 'saml') {
+        enterprise_hook('saml_logout');
+    }
+
     $_SESSION = [];
     session_destroy();
     header_remove('Set-Cookie');
     setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
 
-    if ($config['auth'] == 'saml') {
-        include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-        $as = new SimpleSAML_Auth_Simple('PandoraFMS');
-        $as->logout();
-    }
+    // Process logout.
+    include 'general/logoff.php';
 
     while (@ob_end_flush()) {
         // Dumping...
@@ -1252,8 +1272,8 @@ echo '</div>';
 echo '<div id="um_msg_receiver">';
 echo '</div>';
 
-
 // Connection lost alert.
+ui_require_javascript_file('connection_check');
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 79bc6b7fdf..b466b012a1 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.750';
-            $build = '201015';
+            $build = '201202';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/mobile/operation/events.php b/pandora_console/mobile/operation/events.php
index cca5d7d18e..41d078e1eb 100644
--- a/pandora_console/mobile/operation/events.php
+++ b/pandora_console/mobile/operation/events.php
@@ -731,7 +731,7 @@ class Events
         $system = System::getInstance();
 
         // --------------Fill the SQL POST-------------------------------
-        $sql_post = '';
+        $sql_post = ' WHERE 1=1 ';
 
         switch ($this->status) {
             case 0:
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index c0e6d147c5..9e01425198 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -546,7 +546,7 @@ if (!empty($search_custom)) {
 if ($group_id > 0) {
     $groups = [$group_id];
     if ($recursion) {
-        $groups = groups_get_id_recursive($group_id, true);
+        $groups = groups_get_children_ids($group_id, true);
     }
 } else {
     $groups = [];
@@ -576,7 +576,7 @@ if ($strict_user) {
     if ($group_id > 0) {
         $groups = [$group_id];
         if ($recursion) {
-            $groups = groups_get_id_recursive($group_id, true);
+            $groups = groups_get_children_ids($group_id, true);
         }
 
         $filter['id_group'] = implode(',', $groups);
@@ -902,7 +902,6 @@ if (!empty($table->data)) {
     if (check_acl($config['id_user'], 0, 'AW') || check_acl($config['id_user'], 0, 'AM')) {
         echo '<div style="text-align: right; float: right;">';
         echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
-            html_print_input_hidden('new_agent', 1);
             html_print_submit_button(__('Create agent'), 'crt', false, 'class="sub next"');
         echo '</form>';
         echo '</div>';
@@ -913,7 +912,6 @@ if (!empty($table->data)) {
     ui_print_info_message([ 'no_close' => true, 'message' => __('There are no defined agents') ]);
     echo '<div style="text-align: right; float: right;">';
     echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
-        html_print_input_hidden('new_agent', 1);
         html_print_submit_button(__('Create agent'), 'crt', false, 'class="sub next"');
     echo '</form>';
     echo '</div>';
diff --git a/pandora_console/operation/agentes/pandora_networkmap.editor.php b/pandora_console/operation/agentes/pandora_networkmap.editor.php
index a16874705c..8699253454 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.editor.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.editor.php
@@ -313,7 +313,7 @@ if ($not_found) {
     $table->data[6][1] = html_print_input_text('scale_z', $scale_z, '', 2, 10, true).ui_print_help_tip(__('Introduce zoom level. 1 = Highest resolution. Figures may include decimals'), true);
 
     $table->data['source'][0] = __('Source');
-    $table->data['source'][1] = html_print_radio_button('source', 'group', __('Group'), $source, true, $disabled_source).html_print_radio_button('source', 'recon_task', __('Recon task'), $source, true, $disabled_source).html_print_radio_button('source', 'ip_mask', __('CIDR IP mask'), $source, true, $disabled_source);
+    $table->data['source'][1] = html_print_radio_button('source', 'group', __('Group'), $source, true, $disabled_source).html_print_radio_button('source', 'recon_task', __('Discovery task'), $source, true, $disabled_source).html_print_radio_button('source', 'ip_mask', __('CIDR IP mask'), $source, true, $disabled_source);
 
     $table->data['source_data_recon_task'][0] = __('Source from recon task');
     $table->data['source_data_recon_task'][0] .= ui_print_help_tip(
diff --git a/pandora_console/operation/agentes/realtime_win.php b/pandora_console/operation/agentes/realtime_win.php
index 93c8c85ea2..dbf9cf9f71 100644
--- a/pandora_console/operation/agentes/realtime_win.php
+++ b/pandora_console/operation/agentes/realtime_win.php
@@ -1,18 +1,31 @@
 <?php
+/**
+ * View charts.
+ *
+ * @category   View charts Realtime.
+ * @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-2018 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.
-// Don't start a session before this import.
-// The session is configured and started inside the config process.
 require_once '../../include/config.php';
 require_once $config['homedir'].'/include/auth/mysql.php';
 require_once $config['homedir'].'/include/functions.php';
@@ -25,16 +38,18 @@ require_once $config['homedir'].'/include/functions_tags.php';
 require_once $config['homedir'].'/include/functions_extensions.php';
 check_login();
 
-// Metaconsole connection to the node
+// Metaconsole connection to the node.
 $server_id = (int) get_parameter('server');
 if (is_metaconsole() && !empty($server_id)) {
     $server = metaconsole_get_connection_by_id($server_id);
 
-    // Error connecting
+    // Error connecting.
     if (metaconsole_connect($server) !== NOERR) {
         echo '<html>';
             echo '<body>';
-                ui_print_error_message(__('There was a problem connecting with the node'));
+                ui_print_error_message(
+                    __('There was a problem connecting with the node')
+                );
             echo '</body>';
         echo '</html>';
         exit;
@@ -43,7 +58,9 @@ if (is_metaconsole() && !empty($server_id)) {
 
 $user_language = get_user_language($config['id_user']);
 if (file_exists('../../include/languages/'.$user_language.'.mo')) {
-    $l10n = new gettext_reader(new CachedFileReader('../../include/languages/'.$user_language.'.mo'));
+    $l10n = new gettext_reader(
+        new CachedFileReader('../../include/languages/'.$user_language.'.mo')
+    );
     $l10n->load_tables();
 }
 
@@ -53,7 +70,7 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <?php
-        // Parsing the refresh before sending any header
+        // Parsing the refresh before sending any header.
         $refresh = (int) get_parameter('refresh', -1);
         if ($refresh > 0) {
             $query = ui_get_url_refresh(false);
@@ -70,7 +87,7 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
         <script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
         <script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
         <?php
-        // Include the javascript for the js charts library
+        // Include the javascript for the js charts library.
             require_once $config['homedir'].'/include/graphs/functions_flot.php';
             include_javascript_dependencies_flot_graph();
         ?>
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 1d26666b57..a75e30e269 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -35,6 +35,7 @@ require_once $config['homedir'].'/include/functions_graph.php';
 require_once $config['homedir'].'/include/functions_modules.php';
 require_once $config['homedir'].'/include/functions_agents.php';
 require_once $config['homedir'].'/include/functions_tags.php';
+require_once $config['homedir'].'/include/php_to_js_values.php';
 enterprise_include_once('include/functions_agents.php');
 
 check_login();
@@ -85,6 +86,7 @@ ui_require_css_file('register', 'include/styles/', true);
 // Connection lost alert.
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+ui_require_javascript_file('connection_check');
 ui_print_message_dialog(
     $conn_title,
     $conn_text,
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index a49db7b7f4..db1e052ab9 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -1,6 +1,5 @@
 <?php
-
-
+// This file is an example on how things must NEVER be done.
 // Pandora FMS - http://pandorafms.com
 // ==================================================
 // Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
@@ -41,7 +40,7 @@ if (! defined('METACONSOLE')) {
 
     $buttons['fields'] = [
         'active'    => false,
-        'text'      => '<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&amp;section=fields">'.html_print_image('images/custom_columns.png', true, ['title' => __('Custom fields')]).'</a>',
+        'text'      => '<a href="index.php?sec=view&sec2=operation/agentes/status_monitor&section=fields">'.html_print_image('images/custom_columns.png', true, ['title' => __('Custom fields')]).'</a>',
         'operation' => true,
     ];
 
@@ -79,22 +78,27 @@ if (! defined('METACONSOLE')) {
     ui_meta_print_header(__('Monitor view'));
 }
 
-$ag_freestring         = (string) get_parameter('ag_freestring');
-$moduletype         = (string) get_parameter('moduletype');
-$datatype             = (string) get_parameter('datatype');
-$ag_modulename         = (string) get_parameter('ag_modulename');
-$refr                 = (int) get_parameter('refr', 0);
-$offset             = (int) get_parameter('offset', 0);
-$status             = (int) get_parameter('status', 4);
-$modulegroup         = (int) get_parameter('modulegroup', -1);
-$tag_filter         = (int) get_parameter('tag_filter', 0);
-$min_hours_status         = (string) get_parameter('min_hours_status', '');
-// Sort functionality
-$sortField             = get_parameter('sort_field');
-$sort                 = get_parameter('sort', 'none');
-// When the previous page was a visualmap and show only one module
-$id_module             = (int) get_parameter('id_module', 0);
-$ag_custom_fields     = (array) get_parameter('ag_custom_fields', []);
+$recursion = get_parameter_switch('recursion', false);
+if ($recursion === false) {
+    $recursion = get_parameter('recursion', false);
+}
+
+$ag_freestring = (string) get_parameter('ag_freestring');
+$moduletype = (string) get_parameter('moduletype');
+$datatype = (string) get_parameter('datatype');
+$ag_modulename = (string) get_parameter('ag_modulename');
+$refr = (int) get_parameter('refr', 0);
+$offset = (int) get_parameter('offset', 0);
+$status = (int) get_parameter('status', 4);
+$modulegroup = (int) get_parameter('modulegroup', -1);
+$tag_filter = (int) get_parameter('tag_filter', 0);
+$min_hours_status = (string) get_parameter('min_hours_status', '');
+// Sort functionality.
+$sortField = get_parameter('sort_field');
+$sort = get_parameter('sort', 'none');
+// When the previous page was a visualmap and show only one module.
+$id_module = (int) get_parameter('id_module', 0);
+$ag_custom_fields = (array) get_parameter('ag_custom_fields', []);
 $module_option = (int) get_parameter('module_option', 1);
 $autosearch = false;
 
@@ -161,11 +165,22 @@ if (is_numeric($ag_group)) {
 // Agent group selector
 if (!is_metaconsole()) {
     if ($ag_group > 0 && check_acl($config['id_user'], $ag_group, 'AR')) {
-        $sql_conditions_group = sprintf(
-            ' AND (tagente.id_grupo = %d OR tasg.id_group = %d)',
-            $ag_group,
-            $ag_group
-        );
+        if ($recursion) {
+            $all_groups = groups_get_children_ids($ag_group, true);
+
+            // User has explicit permission on group 1 ?
+            $sql_conditions_group = sprintf(
+                ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s)) ',
+                implode(',', $all_groups),
+                implode(',', $all_groups)
+            );
+        } else {
+            $sql_conditions_group = sprintf(
+                ' AND (tagente.id_grupo = %d OR tasg.id_group = %d)',
+                $ag_group,
+                $ag_group
+            );
+        }
     } else if ($user_groups != '') {
         // User has explicit permission on group 1 ?
         $sql_conditions_group = ' AND (
@@ -175,11 +190,22 @@ if (!is_metaconsole()) {
     }
 } else {
     if (((int) $ag_group !== 0) && (check_acl($config['id_user'], $id_ag_group, 'AR'))) {
-        $sql_conditions_group = sprintf(
-            ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s))',
-            $ag_group,
-            $ag_group
-        );
+        if ($recursion) {
+            $all_groups = groups_get_children_ids($ag_group, true);
+
+            // User has explicit permission on group 1 ?
+            $sql_conditions_group = sprintf(
+                ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s)) ',
+                implode(',', $all_groups),
+                implode(',', $all_groups)
+            );
+        } else {
+            $sql_conditions_group = sprintf(
+                ' AND (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s))',
+                $ag_group,
+                $ag_group
+            );
+        }
     } else if ($user_groups != '') {
         // User has explicit permission on group 1 ?
         $sql_conditions_group = ' AND (
@@ -355,7 +381,8 @@ $table->style[3] = 'font-weight: bold;';
 $table->style[4] = 'font-weight: bold;';
 
 $table->data[0][0] = __('Group');
-$table->data[0][1] = html_print_select_groups(
+$table->data[0][1] = '<div class="flex flex-row-vcenter w290px"><div class="w200px">';
+$table->data[0][1] .= html_print_select_groups(
     $config['id_user'],
     'AR',
     true,
@@ -375,6 +402,18 @@ $table->data[0][1] = html_print_select_groups(
     'id_grupo',
     false
 );
+$table->data[0][1] .= '</div><div>';
+$table->data[0][1] .= html_print_input(
+    [
+        'type'    => 'checkbox',
+        'name'    => 'recursion',
+        'return'  => true,
+        'checked' => $recursion,
+        'value'   => 1,
+    ]
+);
+$table->data[0][1] .= __('Recursion');
+$table->data[0][1] .= '</div></div>';
 
 $fields = [];
 $fields[AGENT_MODULE_STATUS_NORMAL] = __('Normal');
@@ -701,8 +740,7 @@ foreach ($custom_fields as $custom_field) {
     $table_custom_fields->data[] = $row;
 }
 
-
-$filters = '<form method="post" action="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr='.$refr.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;module_option='.$module_option.'&amp;ag_modulename='.$ag_modulename.'&amp;moduletype='.$moduletype.'&amp;datatype='.$datatype.'&amp;status='.$status.'&amp;sort_field='.$sortField.'&amp;sort='.$sort.'&amp;pure='.$config['pure'].$ag_custom_fields_params.'">';
+$filters = '<form method="post" action="index.php?sec=view&sec2=operation/agentes/status_monitor&refr='.$refr.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&module_option='.$module_option.'&ag_modulename='.$ag_modulename.'&moduletype='.$moduletype.'&datatype='.$datatype.'&status='.$status.'&sort_field='.$sortField.'&sort='.$sort.'&pure='.$config['pure'].$ag_custom_fields_params.'">';
 if (is_metaconsole()) {
     $table->colspan[4][0] = 7;
     $table->cellstyle[4][0] = 'padding: 10px;';
@@ -970,7 +1008,7 @@ switch ($sortField) {
 }
 
 $sql = 'SELECT
-	(SELECT GROUP_CONCAT(ttag.name SEPARATOR \',\')
+    (SELECT GROUP_CONCAT(ttag.name SEPARATOR \',\')
 		FROM ttag
 		WHERE ttag.id_tag IN (
 			SELECT ttag_module.id_tag
@@ -1014,6 +1052,7 @@ $sql = 'SELECT
 	ORDER BY '.$order['field'].' '.$order['order'].'
 	LIMIT '.$offset.','.$limit_sql;
 
+
 // We do not show the modules until the user searches with the filter
 if ($autosearch) {
     if (! defined('METACONSOLE')) {
@@ -1102,17 +1141,51 @@ if (($config['dbtype'] == 'oracle') && ($result !== false)) {
 
 
 // Urls to sort the table.
-$url_agent_name = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr='.$refr.'&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=agent_alias&amp;sort=';
-$url_type = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=type&amp;sort=';
-$url_module_name = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=module_name&amp;sort=';
-$url_server_type = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=moduletype&amp;sort=';
-$url_interval = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=interval&amp;sort=';
-$url_status = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=status&amp;sort=';
-$url_status = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=last_status_change&amp;sort=';
-$url_data = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=data&amp;sort=';
-$url_timestamp_up = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=timestamp&amp;sort=up';
-$url_timestamp_down = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=timestamp&amp;sort=down';
+$url_agent_name = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_type = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_module_name = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_server_type = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_interval = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_status = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_status = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_data = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_timestamp_up = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
+$url_timestamp_down = 'index.php?sec=view&sec2=operation/agentes/status_monitor';
 
+$url_agent_name .= '&refr='.$refr.'&datatype='.$datatype.'&moduletype='.$moduletype.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_type .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_module_name .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_server_type .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_interval .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_status .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_status .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_data .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_timestamp_up .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+$url_timestamp_down .= '&datatype='.$datatype.'&moduletype='.$moduletype.'&refr='.$refr.'&modulegroup='.$modulegroup.'&offset='.$offset.'&ag_group='.$ag_group.'&ag_freestring='.$ag_freestring.'&ag_modulename='.$ag_modulename.'&status='.$status.$ag_custom_fields_params;
+
+// Holy god...
+$url_agent_name .= '&recursion='.$recursion;
+$url_type .= '&recursion='.$recursion;
+$url_module_name .= '&recursion='.$recursion;
+$url_server_type .= '&recursion='.$recursion;
+$url_interval .= '&recursion='.$recursion;
+$url_status .= '&recursion='.$recursion;
+$url_status .= '&recursion='.$recursion;
+$url_data .= '&recursion='.$recursion;
+$url_timestamp_up .= '&recursion='.$recursion;
+$url_timestamp_down .= '&recursion='.$recursion;
+
+
+$url_agent_name .= '&sort_field=agent_alias&sort=';
+$url_type .= '&sort_field=type&sort=';
+$url_module_name .= '&sort_field=module_name&sort=';
+$url_server_type .= '&sort_field=moduletype&sort=';
+$url_interval .= '&sort_field=interval&sort=';
+$url_status .= '&sort_field=status&sort=';
+$url_status .= '&sort_field=last_status_change&sort=';
+$url_data .= '&sort_field=data&sort=';
+$url_timestamp_up .= '&sort_field=timestamp&sort=up';
+$url_timestamp_down .= '&sort_field=timestamp&sort=down';
 
 // Start Build List Result
 if (!empty($result)) {
@@ -1276,9 +1349,9 @@ if (!empty($result)) {
                     }
 
                     if (is_metaconsole()) {
-                        $data[0] = '<a href="?sec=gmodules&amp;sec2=advanced/policymanager&amp;id='.$policyInfo['id_policy'].'">'.html_print_image($img, true, ['title' => $title]).'</a>';
+                        $data[0] = '<a href="?sec=gmodules&sec2=advanced/policymanager&id='.$policyInfo['id_policy'].'">'.html_print_image($img, true, ['title' => $title]).'</a>';
                     } else {
-                        $data[0] = '<a href="?sec=gmodules&amp;sec2=enterprise/godmode/policies/policies&amp;id='.$policyInfo['id_policy'].'">'.html_print_image($img, true, ['title' => $title]).'</a>';
+                        $data[0] = '<a href="?sec=gmodules&sec2=enterprise/godmode/policies/policies&id='.$policyInfo['id_policy'].'">'.html_print_image($img, true, ['title' => $title]).'</a>';
                     }
                 }
 
@@ -1293,7 +1366,7 @@ if (!empty($result)) {
 
             // TODO: Calculate hash access before to use it more simply like other sections. I.E. Events view
             if (defined('METACONSOLE')) {
-                $agent_link = '<a href="'.$row['server_url'].'index.php?'.'sec=estado&amp;'.'sec2=operation/agentes/ver_agente&amp;'.'id_agente='.$row['id_agent'].'&amp;'.'loginhash=auto&amp;'.'loginhash_data='.$row['hashdata'].'&amp;'.'loginhash_user='.str_rot13($row['user']).'">';
+                $agent_link = '<a href="'.$row['server_url'].'index.php?'.'sec=estado&'.'sec2=operation/agentes/ver_agente&'.'id_agente='.$row['id_agent'].'&'.'loginhash=auto&'.'loginhash_data='.$row['hashdata'].'&'.'loginhash_user='.str_rot13($row['user']).'">';
                 $agent_alias = ui_print_truncate_text(
                     $agent_alias,
                     'agent_small',
@@ -1309,7 +1382,7 @@ if (!empty($result)) {
                     $data[1] = $agent_alias;
                 }
             } else {
-                $data[1] = '<strong><a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$row['id_agent'].'">';
+                $data[1] = '<strong><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$row['id_agent'].'">';
                 $data[1] .= ui_print_truncate_text($agent_alias, 'agent_medium', false, true, false, '[&hellip;]', 'font-size:7.5pt;');
                 $data[1] .= '</a></strong>';
             }
@@ -1325,9 +1398,9 @@ if (!empty($result)) {
                         $show_edit_icon = false;
                     }
 
-                    $url_edit_module = $row['server_url'].'index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'id_agente='.$row['id_agent'].'&amp;'.'tab=module&amp;'.'id_agent_module='.$row['id_agente_modulo'].'&amp;'.'edit_module=1'.'&amp;loginhash=auto&amp;loginhash_data='.$row['hashdata'].'&amp;loginhash_user='.str_rot13($row['user']);
+                    $url_edit_module = $row['server_url'].'index.php?'.'sec=gagente&'.'sec2=godmode/agentes/configurar_agente&'.'id_agente='.$row['id_agent'].'&'.'tab=module&'.'id_agent_module='.$row['id_agente_modulo'].'&'.'edit_module=1'.'&loginhash=auto&loginhash_data='.$row['hashdata'].'&loginhash_user='.str_rot13($row['user']);
                 } else {
-                    $url_edit_module = 'index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'id_agente='.$row['id_agent'].'&amp;'.'tab=module&amp;'.'id_agent_module='.$row['id_agente_modulo'].'&amp;'.'edit_module=1';
+                    $url_edit_module = 'index.php?'.'sec=gagente&'.'sec2=godmode/agentes/configurar_agente&'.'id_agente='.$row['id_agent'].'&'.'tab=module&'.'id_agent_module='.$row['id_agente_modulo'].'&'.'edit_module=1';
                 }
 
                 if ($show_edit_icon) {
@@ -1750,24 +1823,13 @@ if (!empty($result)) {
 
 // End Build List Result.
 echo "<div id='monitor_details_window'></div>";
-// Strict user hidden.
-echo '<div id="strict_hidden" style="display:none;">';
-html_print_input_text('strict_user_hidden', $strict_user);
-echo '</div>';
 
 enterprise_hook('close_meta_frame');
 
 ui_require_javascript_file('pandora_modules');
 
 ?>
-<script type='text/javascript'>
-$(document).ready (function () {
-    if ($('#ag_group').val() != 0) {
-        $('#tag_filter').css('display', 'none');
-        $('#tag_td').css('display', 'none');
-    }
-});
-
+<script type="text/javascript">
 
 $('#moduletype').click(function() {
     jQuery.get (
@@ -1789,17 +1851,6 @@ $('#moduletype').click(function() {
     return false;
 });
 
-$('#ag_group').change (function () {
-    strict_user = $('#text-strict_user_hidden').val();
-    
-    if (($('#ag_group').val() != 0) && (strict_user != 0)) {
-        $('#tag_filter').css('display', 'none');
-        $('#tag_td').css('display', 'none');
-    } else {
-        $('#tag_filter').css('display', '');
-        $('#tag_td').css('display', '');
-    }
-});
 
 function toggle_full_value(id) {
     text = $('#hidden_value_module_' + id).html();
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index e86960938a..df5146711c 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -88,7 +88,7 @@ if (is_ajax()) {
 
     if ($get_agents_group_json) {
         $id_group = (int) get_parameter('id_group');
-        $recursion = (bool) get_parameter('recursion');
+        $recursion = (get_parameter_switch('recursion', 'false') === 'true');
         $id_os = get_parameter('id_os', '');
         $agent_name = get_parameter('name', '');
 
@@ -146,14 +146,24 @@ if (is_ajax()) {
 
         // Perform search.
         $agents = agents_get_group_agents(
+            // Id_group.
             $id_group,
+            // Search.
             $filter,
+            // Case.
             'lower',
-            false,
+            // NoACL.
+            true,
+            // ChildGroups.
             $recursion,
+            // Serialized.
             false,
+            // Separator.
             '|',
-            $cluster_mode
+            // Add_alert_bulk_op.
+            $cluster_mode,
+            // Force_serialized.
+            false
         );
 
         if (empty($agents)) {
diff --git a/pandora_console/operation/events/events.build_query.php b/pandora_console/operation/events/events.build_query.php
index b1b4051e7f..0f68cbfb5f 100755
--- a/pandora_console/operation/events/events.build_query.php
+++ b/pandora_console/operation/events/events.build_query.php
@@ -28,7 +28,7 @@ if ($id_group > 0) {
     if ($propagate) {
         $childrens_ids = [$id_group];
 
-        $childrens = groups_get_childrens($id_group, null, true);
+        $childrens = groups_get_children($id_group, null, true);
 
         if (!empty($childrens)) {
             foreach ($childrens as $child) {
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 3ca4123b4f..f24aa98699 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -358,6 +358,21 @@ if (is_ajax()) {
                             $tmp->comments = ui_print_comments($tmp->comments);
                         }
 
+                        // Show last event.
+                        if (isset($tmp->max_id_evento) && $tmp->max_id_evento !== $tmp->id_evento) {
+                            $max_event = db_get_row_sql(
+                                sprintf(
+                                    'SELECT criticity, timestamp FROM %s
+                                    WHERE id_evento = %s',
+                                    ($tmp->meta) ? 'tmetaconsole_event' : 'tevento',
+                                    $tmp->max_id_evento
+                                )
+                            );
+
+                            $tmp->timestamp = $max_event['timestamp'];
+                            $tmp->criticity = $max_event['criticity'];
+                        }
+
                         $tmp->agent_name = io_safe_output($tmp->agent_name);
                         $tmp->ack_utimestamp = ui_print_timestamp(
                             $tmp->ack_utimestamp,
@@ -429,7 +444,7 @@ $user_filter = db_get_row_sql(
     )
 );
 
-// Do not load the user filter if we come from the 24h event graph
+// Do not load the user filter if we come from the 24h event graph.
 $from_event_graph = get_parameter('filter[from_event_graph]', $filter['from_event_graph']);
 if ($user_filter !== false && $from_event_graph != 1) {
     $filter = events_get_event_filter($user_filter['id_filter']);
@@ -442,6 +457,13 @@ if ($user_filter !== false && $from_event_graph != 1) {
         $text_agent = $filter['text_agent'];
         $id_agent = $filter['id_agent'];
         $id_agent_module = $filter['id_agent_module'];
+        $text_module = io_safe_output(
+            db_get_value_filter(
+                'nombre',
+                'tagente_modulo',
+                ['id_agente_modulo' => $filter['id_agent_module']]
+            )
+        );
         $pagination = $filter['pagination'];
         $event_view_hr = $filter['event_view_hr'];
         $id_user_ack = $filter['id_user_ack'];
@@ -878,13 +900,17 @@ if (is_metaconsole() !== true) {
  */
 
 // Group.
+if ($id_group_filter === null) {
+    $id_group_filter = 0;
+}
+
 $data = html_print_input(
     [
         'name'           => 'id_group_filter',
         'returnAllGroup' => true,
         'privilege'      => 'AR',
         'type'           => 'select_groups',
-        'selected'       => (defined($id_group_filter) ? $id_group_filter : 0),
+        'selected'       => $id_group_filter,
         'nothing'        => false,
         'return'         => true,
         'size'           => '80%',
@@ -1935,16 +1961,21 @@ function process_datatables_item(item) {
 
     /* Status */
     img = '<?php echo html_print_image('images/star.png', true, ['title' => __('Unknown'), 'class' => 'forced-title']); ?>';
+    state = '0';
     switch (item.estado) {
         case "<?php echo EVENT_STATUS_NEW; ?>":
             img = '<?php echo html_print_image('images/star.png', true, ['title' => __('New event'), 'class' => 'forced-title']); ?>';
         break;
 
         case "<?php echo EVENT_STATUS_VALIDATED; ?>":
+
+            state = '1';
             img = '<?php echo html_print_image('images/tick.png', true, [ 'title' => __('Event validated'), 'class' => 'forced-title']); ?>';
         break;
 
         case "<?php echo EVENT_STATUS_INPROCESS; ?>":
+            state = '2';
+
             img = '<?php echo html_print_image('images/hourglass.png', true, [ 'title' => __('Event in process'), 'class' => 'forced-title']); ?>';
         break;
     }
@@ -1976,6 +2007,9 @@ function process_datatables_item(item) {
     }
 
     item.estado = '<div>';
+    item.estado += '<span style="display: none">';
+    item.estado += state;
+    item.estado += '</span>';
     item.estado += img;
     item.estado += '</div>';
 
@@ -1996,6 +2030,9 @@ function process_datatables_item(item) {
 
     /* Group name */
     if (item.id_grupo == "0") {
+        var severity_value = "<?php echo $severity; ?>";
+        const multiple = severity_value.split(",");
+        $("#severity").val(multiple);
         item.id_grupo = "<?php echo __('All'); ?>";
     } else {
         item.id_grupo = item.group_name;
@@ -2320,9 +2357,8 @@ $(document).ready( function() {
                     url: '<?php echo ui_get_full_url('ajax.php'); ?>',
                     data: {
                         page: 'include/ajax/events',
-                        load_filter_modal: 1,
-                        current_filter: $('#latest_filter_id').val()
-                    },
+                        load_filter_modal: 1
+                        },
                     success: function (data){
                         $('#load-modal-filter')
                         .empty()
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index ae39dabf3b..b1eed5556c 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -311,7 +311,7 @@ if ($user_filter != 0 && empty($id_name) && !$update_from_filter_table) {
 }
 
 // Build the condition of the events query.
-$sql_post = '';
+$sql_post = ' WHERE 1=1 ';
 
 $id_user = $config['id_user'];
 
@@ -1214,7 +1214,7 @@ if ($group_rep == 0) {
     $sql = 'SELECT COUNT(DISTINCT id_evento)
 			FROM $event_table te
 			$event_lj
-			WHERE 1=1 $sql_post';
+			$sql_post';
     $total_events = (int) db_get_sql($sql);
 } else if ($group_rep == 1) {
     $total_events = events_get_events_grouped(
@@ -1477,7 +1477,8 @@ $(document).ready( function() {
                             $("#text-id_extra").val(val);
                         if (i == 'user_comment')
                             $("#text-user_comment").val(val);
-                        
+                        if (i == 'module_search')
+                            $("#text-module_search").val(val);
                         if(i == 'id_source_event')
                             $("#text-id_source_event").val(val);
                         }
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index 4377faaa63..7434c18eaf 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -61,6 +61,13 @@ echo '</head>';
 echo "<body style='background-color: #494949; max-width: 550px; max-height: 400px; margin-top:40px;'>";
 echo "<h1 class='modalheaderh1'>".__('Sound console').'</h1>';
 
+// Connection lost alert.
+ui_require_css_file('register', 'include/styles/', true);
+$conn_title = __('Connection with server has been lost');
+$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+ui_require_javascript_file('connection_check');
+ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
+
 $table = new StdClass;
 $table->width = '100%';
 $table->styleTable = 'padding-left:16px; padding-right:16px; padding-top:16px;';
@@ -77,7 +84,7 @@ $table->data[0][2] = __('Type');
 $table->data[0][3] = html_print_checkbox('alert_fired', 'alert_fired', true, true, false, 'changeType();').__('Alert fired').'<br />'.html_print_checkbox('critical', 'critical', true, true, false, 'changeType();').__('Monitor critical').'<br />'.html_print_checkbox('unknown', 'unknown', true, true, false, 'changeType();').__('Monitor unknown').'<br />'.html_print_checkbox('warning', 'warning', true, true, false, 'changeType();').__('Monitor warning').'<br />';
 
 $table->data[1][0] = __('Agent');
-$table->data[1][1] = html_print_select($agents, 'id_agents[]', true, false, '', '', true, true, '', '', '', 'width:120px; height:100px', '', false, '', '', true);
+$table->data[1][1] = html_print_select($agents, 'id_agents[]', true, false, '', '', true, true, '', '', '', 'max-width:200px; height:100px', '', false, '', '', true);
 
 $table->data[1][2] = __('Event');
 $table->data[1][3] = html_print_textarea('events_fired', 200, 20, '', 'readonly="readonly" style="max-height:100px; background: #ddd; resize:none;"', true);
@@ -152,10 +159,26 @@ function changeGroup() {
 }
 
 function changeType() {
-    alert_fired = $("input[name=alert_fired]").attr('checked');
-    critical = $("input[name=critical]").attr('checked');
-    warning = $("input[name=warning]").attr('checked');
-    unknown = $("input[name=unknown]").attr('checked');
+    alert_fired = false;
+    critical = false;
+    warning = false;
+    unknown = false;
+
+    if($("input[name=alert_fired]").is(':checked') ) {
+        alert_fired = true;
+    }
+
+    if($("input[name=critical]").is(':checked') ) {
+        critical = true;
+    }
+
+    if($("input[name=warning]").is(':checked') ) {
+        warning = true;
+    }
+
+    if($("input[name=unknown]").is(':checked') ) {
+        unknown = true;
+    }
 }
 
 function toggleButton() {
@@ -256,9 +279,6 @@ $(document).ready (function () {
     setInterval("check_event()", (10 * 1000)); //10 seconds between ajax request
     $("#table1").css("background-color", "#fff");
     $("#table2").css("background-color", "#fff");
-
-    group_width = $("#group").width();
-    $("#id_agents").width(group_width + 9);
 });
 
 </script>
diff --git a/pandora_console/operation/gis_maps/public_console.php b/pandora_console/operation/gis_maps/public_console.php
index ba5b99633c..a756d04c0c 100755
--- a/pandora_console/operation/gis_maps/public_console.php
+++ b/pandora_console/operation/gis_maps/public_console.php
@@ -273,8 +273,10 @@ if ($layers != false) {
     gis_activate_ajax_refresh($layers, $timestampLastOperation, 1, $idMap);
 
     // Connection lost alert.
+    ui_require_css_file('register', 'include/styles/', true);
     $conn_title = __('Connection with server has been lost');
     $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+    ui_require_javascript_file('connection_check');
     ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
 }
 
diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index 91c23d164f..663df70e91 100755
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -291,10 +291,8 @@ enterprise_hook('close_meta_frame');
         // Clear the tree
         if (typeof treeController.recipient != 'undefined' && treeController.recipient.length > 0)
             treeController.recipient.empty();
-        
-        $(".loading_tree").show();
-        
 
+        $(".loading_tree").show();
 
         var parameters = {};
         parameters['page'] = "include/ajax/tree.ajax";
@@ -308,21 +306,21 @@ enterprise_hook('close_meta_frame');
         parameters['filter']['statusModule'] = $("select#status_module").val();
         parameters['filter']['groupID'] = $("input#hidden-group-id").val();
         parameters['filter']['tagID'] = $("input#hidden-tag-id").val();
-        
+
         if($("#checkbox-serach_hirearchy").is(':checked')){
             parameters['filter']['searchHirearchy'] = 1;
         }
         else{
             parameters['filter']['searchHirearchy'] = 0;
         }
-        
+
         if($("#checkbox-show_not_init_agents").is(':checked')){
             parameters['filter']['show_not_init_agents'] = 1;
         }
         else{
             parameters['filter']['show_not_init_agents'] = 0;
         }
-        
+
         if($("#checkbox-show_not_init_modules").is(':checked')){
             parameters['filter']['show_not_init_modules'] = 1;
             $('#hidden-show_not_init_modules_hidden').val(1);
@@ -339,13 +337,35 @@ enterprise_hook('close_meta_frame');
             success: function(data) {
                 if (data.success) {
                     $(".loading_tree").hide();
-                    
+                    var foundMessage = '';
+                    switch (parameters['type']) {
+                        case 'policies':
+                            foundMessage = "<?php echo __('Policies found'); ?>";
+                            break;
+                        case 'os':
+                            foundMessage = "<?php echo __('Operating systems found'); ?>";
+                            break;
+                        case 'tag':
+                            foundMessage = "<?php echo __('Tags found'); ?>";
+                            break;
+                        case 'module_group':
+                            foundMessage = "<?php echo __('Module Groups found'); ?>";
+                            break;
+                        case 'module':
+                            foundMessage = "<?php echo __('Modules found'); ?>";
+                            break;
+                        case 'group':
+                        default:
+                            foundMessage = "<?php echo __('Groups found'); ?>";
+                            break;
+                    }
+
                     treeController.init({
                         recipient: $("div#tree-controller-recipient"),
                         detailRecipient: $.fixedBottomBox({ width: 400, height: window.innerHeight * 0.9 }),
                         page: parameters['page'],
                         emptyMessage: "<?php echo __('No data found'); ?>",
-                        foundMessage: "<?php echo __('Groups found'); ?>",
+                        foundMessage: foundMessage,
                         tree: data.tree,
                         baseURL: "<?php echo ui_get_full_url(false, false, false, is_metaconsole()); ?>",
                         ajaxURL: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 23b797a8f2..b55a0952e4 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -393,14 +393,21 @@ $timezone .= html_print_timezone_select('timezone', $user_info['timezone']).'</d
 // Double auth.
 $double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $config['id_user']);
 
-if ($config['double_auth_enabled']) {
+if ($config['double_auth_enabled'] || ($config['double_auth_enabled'] == '' && $double_auth_enabled)) {
     $double_authentication = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Double authentication').'</p>';
-    $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true);
+    if (($config['2FA_all_users'] == '' && !$double_auth_enabled)
+        || ($config['2FA_all_users'] != '' && !$double_auth_enabled)
+        || ($config['double_auth_enabled'] == '' && $double_auth_enabled)
+        || check_acl($config['id_user'], 0, 'PM')
+    ) {
+        $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true);
+    }
+
     // Dialog.
     $double_authentication .= '<div id="dialog-double_auth" style="display:none"><div id="dialog-double_auth-container"></div></div>';
 }
 
-if ($double_auth_enabled) {
+if ($double_auth_enabled && $config['double_auth_enabled'] && $config['2FA_all_users'] != '') {
     $double_authentication .= html_print_button(__('Show information'), 'show_info', false, 'javascript:show_double_auth_info();', '', true);
 }
 
@@ -881,14 +888,13 @@ $(document).ready (function () {
 
     $("input#checkbox-double_auth").change(function (e) {
         e.preventDefault();
+            if (this.checked) {
+                show_double_auth_activation();
+            } else {
+                show_double_auth_deactivation();
+            }
+    }); 
 
-        if (this.checked) {
-            show_double_auth_activation();
-        }
-        else {
-            show_double_auth_deactivation();
-        }
-    });
     
     show_data_section();
 });
diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php
index 797a12846f..609447800e 100644
--- a/pandora_console/operation/visual_console/legacy_public_view.php
+++ b/pandora_console/operation/visual_console/legacy_public_view.php
@@ -43,9 +43,12 @@ 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" />';
 
+html_print_input_hidden('homeurl', $config['homeurl']);
+
 $url_css_modal = ui_get_full_url('include/styles/register.css', false, false, false);
 echo '<link rel="stylesheet" href="'.$url_css_modal.'" type="text/css" />';
 // Connection lost alert.
+ui_require_javascript_file('connection_check', 'include/javascript/', true);
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
@@ -155,10 +158,6 @@ echo '<div style="display: none;" id="qrcode_container" title="'.__('QR code of
 echo '<div id="qrcode_container_image"></div>';
 echo '</div>';
 
-// Connection lost alert.
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
-ui_print_message_alert($conn_title, $conn_text, 'connection', '/images/error_1.png');
 
 ui_require_jquery_file('countdown', 'include/javascript/', true);
 ui_require_javascript_file('wz_jsgraphics', 'include/javascript/', true);
diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php
index 1127614eed..6cc9f817a1 100644
--- a/pandora_console/operation/visual_console/public_view.php
+++ b/pandora_console/operation/visual_console/public_view.php
@@ -29,9 +29,10 @@ if (file_exists(ENTERPRISE_DIR.'/include/functions_login.php')) {
 require_once $config['homedir'].'/vendor/autoload.php';
 
 ui_require_css_file('visual_maps');
-ui_require_css_file('register');
+ui_require_css_file('register', 'include/styles/', true);
 
 // Connection lost alert.
+ui_require_javascript_file('connection_check', 'include/javascript/', true);
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
@@ -138,10 +139,6 @@ echo '<div style="display: none;" id="qrcode_container" title="'.__('QR code of
 echo '<div id="qrcode_container_image"></div>';
 echo '</div>';
 
-// Connection lost alert.
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
-ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
 
 // Check groups can access user.
 $aclUserGroups = [];
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 08fcb4ed0a..ee1e3ee84d 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.750
-%define release     1
+%define release     201202
 
 # 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 c37421859c..9bc8d3e6b9 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.750
-%define release     1
+%define release     201202
 
 # 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 6621bfe02c..77848dbfad 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.750
-%define release     1
+%define release     201202
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 12e5f8d702..ed00bd3ec1 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -309,6 +309,11 @@ CREATE TABLE  IF NOT EXISTS  `talert_snmp` (
 	`al_field13` text NOT NULL,
 	`al_field14` text NOT NULL,
 	`al_field15` text NOT NULL,
+	`al_field16` text NOT NULL,
+	`al_field17` text NOT NULL,
+	`al_field18` text NOT NULL,
+	`al_field19` text NOT NULL,
+	`al_field20` text NOT NULL,
 	`description` varchar(255) default '',
 	`alert_type` int(2) unsigned NOT NULL default '0',
 	`agent` varchar(100) default '',
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index ad20052428..53b1a1027f 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -113,7 +113,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('identification_reminder', 1),
 ('identification_reminder_timestamp', 0),
 ('current_package_enterprise', 750),
-('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"}'),
+('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.00097656250000":"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'),
 ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'),
@@ -2747,4 +2747,4 @@ SELECT @plugin_id := `id` FROM `tplugin` WHERE `name` = @plugin_name;
 
 INSERT IGNORE INTO `tnetwork_component` (`id_nc`, `name`, `description`, `id_group`, `type`, `max`, `min`, `module_interval`, `tcp_port`, `tcp_send`, `tcp_rcv`, `snmp_community`, `snmp_oid`, `id_module_group`, `id_modulo`, `id_plugin`, `plugin_user`, `plugin_pass`, `plugin_parameter`, `max_timeout`, `max_retries`, `history_data`, `min_warning`, `max_warning`, `str_warning`, `min_critical`, `max_critical`, `str_critical`, `min_ff_event`, `custom_string_1`, `custom_string_2`, `custom_string_3`, `custom_integer_1`, `custom_integer_2`, `post_process`, `unit`, `wizard_level`, `macros`, `critical_instructions`, `warning_instructions`, `unknown_instructions`, `critical_inverse`, `warning_inverse`, `id_category`, `tags`, `disabled_types_event`, `module_macros`, `min_ff_event_normal`, `min_ff_event_warning`, `min_ff_event_critical`, `ff_type`, `each_ff`, `dynamic_interval`, `dynamic_max`, `dynamic_min`, `dynamic_next`, `dynamic_two_tailed`, `module_type`, `protocol`, `manufacturer_id`, `execution_type`, `scan_type`, `value`, `value_operations`, `module_enabled`, `name_oid`, `query_class`, `query_key_field`, `scan_filters`, `query_filters`, `enabled`) VALUES (@component_id,@component_name,@component_description,@group_id,1,0,0,0,0,'','','','',0,9,0,'','','',0,0,0,80.00,90.00,'',90.00,0.00,'',0,'','','',0,0,0.000000000000000,'%','nowizard',CONCAT('{\"extra_field_1\":\"Size\",\"extra_field_2\":\"FreeSpace\",\"satellite_execution\":\"/etc/pandora/satellite_plugins/wizard_wmi_module&#x20;-host&#x20;&quot;_address_&quot;&#x20;-namespace&#x20;&quot;_namespace_wmi_&quot;&#x20;-user&#x20;&quot;_user_wmi_&quot;&#x20;-pass&#x20;&quot;_pass_wmi_&quot;&#x20;-wmiClass&#x20;&quot;_class_wmi_&quot;&#x20;-fieldsList&#x20;&quot;_field_wmi_1_,_field_wmi_2_&quot;&#x20;-queryFilter&#x20;&quot;DeviceID&#x20;=&#x20;&#039;_DeviceID_&#039;&quot;&#x20;-operation&#x20;&quot;&#40;&#40;_f1_&#x20;-&#x20;_f2_&#41;&#x20;*&#x20;100&#41;&#x20;/&#x20;_f1_&quot;&#x20;-wmicPath&#x20;/usr/bin/wmic\",\"value_operation\":\"&#40;&#40;_Size_&#x20;-&#x20;_FreeSpace_&#41;&#x20;*&#x20;100&#41;&#x20;/&#x20;_Size_\",\"server_plugin\":\"',@plugin_id,'\",\"_field2__wmi_field\":\"_namespace_wmi_\",\"_field1__wmi_field\":\"_address_\",\"_field4__wmi_field\":\"_pass_wmi_\",\"_field3__wmi_field\":\"_user_wmi_\",\"_field6__wmi_field\":\"_field_wmi_1_,_field_wmi_2_\",\"_field5__wmi_field\":\"_class_wmi_\",\"_field8__wmi_field\":\"&#40;&#40;_f1_&#x20;-&#x20;_f2_&#41;&#x20;*&#x20;100&#41;&#x20;/&#x20;_f1_\",\"_field7__wmi_field\":\"DeviceID&#x20;=&#x20;&#039;_DeviceID_&#039;\",\"field0_wmi_field\":\"\"}'),'','','',0,0,0,'','{\"going_unknown\":0}','',0,0,0,0,0,0,0,0,0,0,1,'wmi','',2,2,'','',1,'','Win32_LogicalDisk','DeviceID','','{\"scan\":\"DriveType&#x20;=&#x20;3\",\"execution\":\"\",\"field\":\"\",\"key_string\":\"\"}',1);
 
-INSERT IGNORE INTO `tpen` VALUES (171,'dlink','D-Link Systems, Inc.'),(14988,'mikrotik','MikroTik'),(6486,'alcatel','Alcatel-Lucent Enterprise'),(41112,'ubiquiti','Ubiquiti Networks, Inc.'),(207,'telesis','Allied Telesis, Inc.'),(10002,'frogfoot','Frogfoot Networks'),(2,'ibm','IBM'),(4,'unix','Unix'),(63,'apple','Apple Computer, Inc.'),(674,'dell','Dell Inc.'),(111,'oracle','Oracle'),(116,'hitachi','Hitachi, Ltd.'),(173,'netlink','Netlink'),(188,'ascom','Ascom'),(6574,'synology','Synology Inc.'),(3861,'fujitsu','Fujitsu Network Communications, Inc.'),(53526,'dell','Dell ATC'),(52627,'apple','Apple Inc'),(19464,'hitachi','Hitachi Communication Technologies, Ltd.'),(13062,'ascom','Ascom');
\ No newline at end of file
+INSERT IGNORE INTO `tpen` VALUES (171,'dlink','D-Link Systems, Inc.'),(14988,'mikrotik','MikroTik'),(6486,'alcatel','Alcatel-Lucent Enterprise'),(41112,'ubiquiti','Ubiquiti Networks, Inc.'),(207,'telesis','Allied Telesis, Inc.'),(10002,'frogfoot','Frogfoot Networks'),(2,'ibm','IBM'),(4,'unix','Unix'),(63,'apple','Apple Computer, Inc.'),(674,'dell','Dell Inc.'),(111,'oracle','Oracle'),(116,'hitachi','Hitachi, Ltd.'),(173,'netlink','Netlink'),(188,'ascom','Ascom'),(6574,'synology','Synology Inc.'),(3861,'fujitsu','Fujitsu Network Communications, Inc.'),(53526,'dell','Dell ATC'),(52627,'apple','Apple Inc'),(19464,'hitachi','Hitachi Communication Technologies, Ltd.'),(13062,'ascom','Ascom');
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index cf05a23c8e..2611502bef 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.750
+Version: 7.0NG.750-201202
 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 5f5bc0ad59..6ee3200002 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.750"
+pandora_version="7.0NG.750-201202"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/FreeBSD/pandora_server.conf.new b/pandora_server/FreeBSD/pandora_server.conf.new
index c6394319b5..c303931b49 100644
--- a/pandora_server/FreeBSD/pandora_server.conf.new
+++ b/pandora_server/FreeBSD/pandora_server.conf.new
@@ -481,6 +481,9 @@ snmp_storm_protection 25
 # Time interval for snmp_storm protection (in seconds).
 snmp_storm_timeout 10
 
+# Silenced time period in seconds, when trap storm is detected
+snmp_storm_silence_period 300
+
 # Default texts for some events. The macros _module_ and _data_ are supported.
 #text_going_down_normal Module '_module_' is going to NORMAL (_data_)
 #text_going_up_critical Module '_module_' is going to CRITICAL (_data_)
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 812bf1e57b..d82944f93b 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -771,7 +771,7 @@ sub main() {
 			die("Server thread crashed.") unless (check_server_threads() == 1);
 
 			db_do ($DBH,
-				"UPDATE tserver SET status = 0
+				"UPDATE tserver SET status = -1
 				WHERE UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(keepalive) > 2*server_keepalive"
 			);
 
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index 2c5e6d0c1b..98eff5ca78 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -537,6 +537,9 @@ snmp_storm_protection 25
 # Time interval for snmp_storm protection (in seconds).
 snmp_storm_timeout 10
 
+# Silenced time period in seconds, when trap storm is detected
+snmp_storm_silence_period 300
+
 # Default texts for some events. The macros _module_ and _data_ are supported.
 #text_going_down_normal Module '_module_' is going to NORMAL (_data_)
 #text_going_up_critical Module '_module_' is going to CRITICAL (_data_)
diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows
index 3c890f83eb..226efc52fe 100644
--- a/pandora_server/conf/pandora_server.conf.windows
+++ b/pandora_server/conf/pandora_server.conf.windows
@@ -471,6 +471,9 @@ snmp_storm_protection 25
 # Time interval for snmp_storm protection (in seconds).
 snmp_storm_timeout 10
 
+# Silenced time period in seconds, when trap storm is detected
+snmp_storm_silence_period 300
+
 # Default texts for some events. The macros _module_ and _data_ are supported.
 #text_going_down_normal Module '_module_' is going to NORMAL (_data_)
 #text_going_up_critical Module '_module_' is going to CRITICAL (_data_)
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 224911255b..69a1f7a15b 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.750";
-my $pandora_build = "201015";
+my $pandora_build = "201202";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -321,6 +321,7 @@ sub pandora_load_config {
 	$pa_config->{"snmp_pdu_address"} = 0; # 5.0
 	$pa_config->{"snmp_storm_protection"} = 0; # 5.0
 	$pa_config->{"snmp_storm_timeout"} = 600; # 5.0
+	$pa_config->{"snmp_storm_silence_period"} = 0; # 7.0
 	$pa_config->{"snmp_delay"} = 0; # > 6.0SP3
 	$pa_config->{"snmpconsole_threads"} = 1; # 5.1
 	$pa_config->{"translate_variable_bindings"} = 0; # 5.1
@@ -675,6 +676,9 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^snmp_storm_timeout\s+(\d+)/i) { 
 			$pa_config->{'snmp_storm_timeout'}= clean_blank($1); 
 		}
+		elsif ($parametro =~ m/^snmp_storm_silence_period\s+(\d+)/i) { 
+			$pa_config->{'snmp_storm_silence_period'}= clean_blank($1); 
+		}
 		elsif ($parametro =~ m/^snmp_delay\s+(\d+)/i) { 
 			$pa_config->{'snmp_delay'}= clean_blank($1); 
 		}
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 0d3bc2652f..b16b22dbac 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1182,11 +1182,11 @@ sub pandora_execute_action ($$$$$$$$$;$) {
 				_field13_ => $field13,
 				_field14_ => $field14,
 				_field15_ => $field15,
-				_field11_ => $field16,
-				_field12_ => $field17,
-				_field13_ => $field18,
-				_field14_ => $field19,
-				_field15_ => $field20,
+				_field16_ => $field16,
+				_field17_ => $field17,
+				_field18_ => $field18,
+				_field19_ => $field19,
+				_field20_ => $field20,
 				_agentname_ => (defined ($agent)) ? $agent->{'nombre'} : '',
 				_agentalias_ => (defined ($agent)) ? $agent->{'alias'} : '',
 				_agent_ => (defined ($agent)) ? ($agent->{'alias'} ? $agent->{'alias'} : $agent->{'nombre'}) : '',
diff --git a/pandora_server/lib/PandoraFMS/NetworkServer.pm b/pandora_server/lib/PandoraFMS/NetworkServer.pm
index 0bca799815..3c0446c956 100644
--- a/pandora_server/lib/PandoraFMS/NetworkServer.pm
+++ b/pandora_server/lib/PandoraFMS/NetworkServer.pm
@@ -498,7 +498,7 @@ sub exec_network_module ($$$$) {
 			$module_data = pandora_ping_latency ($pa_config, $ip_target, $timeout, $retries);
 			
 			if (defined($module_data)) {
-				$module_result = 0; # Successful
+				$module_result = 1; # Unsuccessful
 			}
 		}
 
diff --git a/pandora_server/lib/PandoraFMS/Omnishell.pm b/pandora_server/lib/PandoraFMS/Omnishell.pm
new file mode 100644
index 0000000000..5d9dd1db0c
--- /dev/null
+++ b/pandora_server/lib/PandoraFMS/Omnishell.pm
@@ -0,0 +1,703 @@
+package PandoraFMS::Omnishell;
+################################################################################
+# Pandora FMS Omnishell common functions.
+#
+# (c) Fco de Borja Sánchez <fborja.sanchez@pandorafms.com>
+#
+################################################################################
+use strict;
+use warnings;
+
+use File::Copy;
+use Scalar::Util qw(looks_like_number);
+use lib '/usr/lib/perl5';
+use PandoraFMS::PluginTools qw/init read_configuration read_file empty trim/;
+
+my $YAML = 0;
+# Dynamic load. Avoid unwanted behaviour.
+eval {
+  eval 'require YAML::Tiny;1' or die('YAML::Tiny lib not found, commands feature won\'t be available');
+};
+if ($@) {
+  $YAML = 0;
+} else {
+  $YAML = 1;
+}
+
+use lib '/usr/lib/perl5';
+
+our @ISA = ("Exporter");
+our %EXPORT_TAGS = ( 'all' => [ qw( ) ] );
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+our @EXPORT = qw();
+
+# 2 to the power of 32.
+use constant POW232 => 2**32;
+
+################################################################################
+# Return the MD5 checksum of the given string as a hex string.
+# Pseudocode from: http://en.wikipedia.org/wiki/MD5#Pseudocode
+################################################################################
+my @S = (
+	7, 12, 17, 22,  7, 12, 17, 22,  7, 12, 17, 22,  7, 12, 17, 22,
+	5,  9, 14, 20,  5,  9, 14, 20,  5,  9, 14, 20,  5,  9, 14, 20,
+	4, 11, 16, 23,  4, 11, 16, 23,  4, 11, 16, 23,  4, 11, 16, 23,
+	6, 10, 15, 21,  6, 10, 15, 21,  6, 10, 15, 21,  6, 10, 15, 21
+);
+my @K = (
+	0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
+	0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
+	0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
+	0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
+	0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
+	0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
+	0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
+	0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
+	0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
+	0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
+	0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05,
+	0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
+	0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
+	0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
+	0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
+	0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391
+);
+sub md5 {
+	my $str = shift;
+
+	# No input!
+	if (!defined($str)) {
+		return "";
+	}
+
+	# Note: All variables are unsigned 32 bits and wrap modulo 2^32 when
+	# calculating.
+
+	# Initialize variables.
+	my $h0 = 0x67452301;
+	my $h1 = 0xEFCDAB89;
+	my $h2 = 0x98BADCFE;
+	my $h3 = 0x10325476;
+
+	# Pre-processing.
+	my $msg = unpack ("B*", pack ("A*", $str));
+	my $bit_len = length ($msg);
+
+	# Append "1" bit to message.
+	$msg .= '1';
+
+	# Append "0" bits until message length in bits ≡ 448 (mod 512).
+	$msg .= '0' while ((length ($msg) % 512) != 448);
+
+	# Append bit /* bit, not byte */ length of unpadded message as 64-bit
+	# little-endian integer to message.
+	$msg .= unpack ("B32", pack ("V", $bit_len));
+	$msg .= unpack ("B32", pack ("V", ($bit_len >> 16) >> 16));
+
+	# Process the message in successive 512-bit chunks.
+	for (my $i = 0; $i < length ($msg); $i += 512) {
+
+		my @w;
+		my $chunk = substr ($msg, $i, 512);
+
+		# Break chunk into sixteen 32-bit little-endian words w[i], 0 <= i <=
+		# 15.
+		for (my $j = 0; $j < length ($chunk); $j += 32) {
+			push (@w, unpack ("V", pack ("B32", substr ($chunk, $j, 32))));
+		}
+
+		# Initialize hash value for this chunk.
+		my $a = $h0;
+		my $b = $h1;
+		my $c = $h2;
+		my $d = $h3;
+		my $f;
+		my $g;
+
+		# Main loop.
+		for (my $y = 0; $y < 64; $y++) {
+			if ($y <= 15) {
+				$f = $d ^ ($b & ($c ^ $d));
+				$g = $y;
+			}
+			elsif ($y <= 31) {
+				$f = $c ^ ($d & ($b ^ $c));
+				$g = (5 * $y + 1) % 16;
+			}
+			elsif ($y <= 47) {
+				$f = $b ^ $c ^ $d;
+				$g = (3 * $y + 5) % 16;
+			}
+			else {
+				$f = $c ^ ($b | (0xFFFFFFFF & (~ $d)));
+				$g = (7 * $y) % 16;
+			}
+
+			my $temp = $d;
+			$d = $c;
+			$c = $b;
+			$b = ($b + leftrotate (($a + $f + $K[$y] + $w[$g]) % POW232, $S[$y])) % POW232;
+			$a = $temp;
+		}
+
+		# Add this chunk's hash to result so far.
+		$h0 = ($h0 + $a) % POW232;
+		$h1 = ($h1 + $b) % POW232;
+		$h2 = ($h2 + $c) % POW232;
+		$h3 = ($h3 + $d) % POW232;
+	}
+
+	# Digest := h0 append h1 append h2 append h3 #(expressed as little-endian)
+	return unpack ("H*", pack ("V", $h0)) .
+	       unpack ("H*", pack ("V", $h1)) .
+	       unpack ("H*", pack ("V", $h2)) .
+	       unpack ("H*", pack ("V", $h3));
+}
+
+################################################################################
+# MD5 leftrotate function. See: http://en.wikipedia.org/wiki/MD5#Pseudocode
+################################################################################
+sub leftrotate {
+	my ($x, $c) = @_;
+
+	return (0xFFFFFFFF & ($x << $c)) | ($x >> (32 - $c));
+}
+
+################################################################################
+# return last error.
+################################################################################
+sub get_last_error {
+  my ($self) = @_;
+
+  if (!empty($self->{'last_error'})) {
+    return $self->{'last_error'};
+  }
+
+  return '';
+}
+
+################################################################################
+# Update last error.
+################################################################################
+sub set_last_error {
+	my ($self, $error) = @_;
+
+  $self->{'last_error'} = $error;
+}
+
+################################################################################
+# Try to load extra libraries.c
+################################################################################
+sub load_libraries {
+  my $self = shift;
+
+  # Dynamic load. Avoid unwanted behaviour.
+  eval {eval 'require YAML::Tiny;1' or die('YAML::Tiny lib not found, commands feature won\'t be available');};
+  if ($@) {
+    $self->set_last_error($@);
+    return 0;
+  } else {
+    return 1;
+  }
+}
+
+################################################################################
+# Create new omnishell handler.
+################################################################################
+sub new {
+  my ($class, $args) = @_;
+
+  if (ref($args) ne 'HASH') {
+    return undef;
+  }
+
+  my $system = init();
+  my $self = {
+	'server_ip' => 'localhost',
+	  'server_path' => '/var/spool/pandora/data_in',
+	  'server_port' => 41121,
+	  'transfer_mode' => 'tentacle',
+	  'transfer_mode_user' => 'apache',
+	  'transfer_timeout' => 30,
+	  'server_user' => 'pandora',
+	  'server_pwd' => '',
+	  'server_ssl' => '0',
+	  'server_opts' => '',
+	  'delayed_startup' => 0,
+	  'pandora_nice' => 10,
+	  'cron_mode' => 0,
+    'last_error' => undef,
+    %{$system},
+    %{$args},
+  };
+
+  $self->{'temporal'} =~ s/\"|\'//g;
+  $self = bless($self, $class);
+  $self->prepare_commands();
+
+  return $self;
+}
+
+################################################################################
+# Run all, output mode 'xml'  will dump to STDOUT and return an array of strings
+#, any other option will return an array with all results.
+################################################################################
+sub run {
+  my ($self, $output_mode) = @_;
+
+  my @results;
+
+  foreach my $ref (keys %{$self->{'commands'}}) {
+    my $rs = $self->runCommand($ref, $output_mode);
+    if ($rs) {
+      push @results, $rs;
+    }
+  }
+
+  if ($output_mode eq 'xml') {
+    print join("\n",@results);
+  }
+
+  return \@results;
+}
+
+################################################################################
+# Run command, output mode 'xml'  will dump to STDOUT, other will return a hash
+# with all results.
+################################################################################
+sub runCommand {
+  my ($self, $ref, $output_mode) = @_;
+
+  if($self->load_libraries()) {
+    # Functionality possible.
+    my $command = $self->{'commands'}->{$ref};
+    my $result = $self->evaluate_command($ref);
+    if (ref($result) eq "HASH") {
+      # Process command result.
+      if (defined($output_mode) && $output_mode eq 'xml') {
+        my $output = '';
+        $output .= "<cmd_report>\n";
+        $output .= "  <cmd_response>\n";
+        $output .= "    <cmd_name><![CDATA[".$result->{'name'}."]]></cmd_name>\n";
+        $output .= "    <cmd_key><![CDATA[".$ref."]]></cmd_key>\n";
+        $output .= "    <cmd_errorlevel><![CDATA[".$result->{'error_level'}."]]></cmd_errorlevel>\n";
+        $output .= "    <cmd_stdout><![CDATA[".$result->{'stdout'}."]]></cmd_stdout>\n";
+        $output .= "    <cmd_stderr><![CDATA[".$result->{'stderr'}."]]></cmd_stderr>\n";
+        $output .= "  </cmd_response>\n";
+        $output .= "</cmd_report>\n";
+
+        return $output;
+      }
+      return $result;
+    } else {
+      $self->set_last_error('Failed to process ['.$ref.']: '.$result);
+    }
+  }
+
+  return undef;
+}
+
+################################################################################
+# Check for remote commands defined.
+################################################################################
+sub prepare_commands {
+  my ($self) = @_;
+
+  if ($YAML == 0) {
+    $self->set_last_error('Cannot use commands without YAML dependency, please install it.');
+    return;
+  }
+
+  # Force configuration file read.
+  my $commands = $self->{'commands'};  
+
+  if (empty($commands)) {
+    $self->{'commands'} = {};
+  } else {
+    foreach my $rcmd (keys %{$commands}) {
+      $self->{'commands'}->{trim($rcmd)} = {};
+    }
+  }
+
+  # Cleanup old commands. Not registered.
+  $self->cleanup_old_commands();
+
+  foreach my $ref (keys %{$self->{'commands'}}) {
+    my $file_content;
+    my $download = 0;
+    my $rcmd_file = $self->{'ConfDir'}.'/commands/'.$ref.'.rcmd';
+
+    # Search for local .rcmd file
+    if (-e $rcmd_file) {
+      my $remote_md5_file = $self->{'temporal'}.'/'.$ref.'.md5';
+
+      $file_content = read_file($rcmd_file);
+      if ($self->recv_file($ref.'.md5', $remote_md5_file) != 0) {
+        # Remote file could not be retrieved, skip.
+        delete $self->{'commands'}->{$ref};
+        next;
+      }
+
+      my $local_md5 = md5($file_content);
+      my $remote_md5 = md5(read_file($remote_md5_file));
+
+      if ($local_md5 ne $remote_md5) {
+        # Must be downloaded again.
+        $download = 1;
+      }
+    } else {
+      $download = 1;
+    }
+    
+    # Search for remote .rcmd file
+    if ($download == 1) {
+      # Download .rcmd file
+      if ($self->recv_file($ref.'.rcmd') != 0) {
+        # Remote file could not be retrieved, skip.
+        delete $self->{'commands'}->{$ref};
+        next;
+      } else {
+        # Success
+        move($self->{'temporal'}.'/'.$ref.'.rcmd', $rcmd_file);
+      }
+    }
+    
+    # Parse and prepare in memory skel.
+    eval {
+      $self->{'commands'}->{$ref} = YAML::Tiny->read($rcmd_file);
+    };
+    if ($@) {
+      # Failed.
+      $self->set_last_error('Failed to decode command. ' . "\n".$@);
+      delete $self->{'commands'}->{$ref};
+      next;
+    }
+
+  }
+}
+
+################################################################################
+# Command report.
+################################################################################
+sub report_command {
+  my ($self, $ref, $err_level) = @_;
+
+  # Retrieve content from .stdout and .stderr
+  my $stdout_file = $self->{'temporal'}.'/'.$ref.'.stdout';
+  my $stderr_file = $self->{'temporal'}.'/'.$ref.'.stderr';
+
+  my $return;
+  eval {
+    $return = {
+      'error_level' => $err_level,
+      'stdout' => read_file($stdout_file),
+      'stderr' => read_file($stderr_file),
+    };
+
+    $return->{'name'} = $self->{'commands'}->{$ref}->[0]->{'name'};
+  };
+  if ($@) {
+    $self->set_last_error('Failed to report command output. ' . $@);
+  }
+
+  # Cleanup
+  unlink($stdout_file) if (-e $stdout_file);
+  unlink($stderr_file) if (-e $stderr_file);
+
+  # Mark command as done.
+  open (my $R_FILE, '> '.$self->{'ConfDir'}.'/commands/'.$ref.'.rcmd.done');
+  print $R_FILE $err_level;
+  close($R_FILE);
+
+
+  $return->{'stdout'} = '' unless defined ($return->{'stdout'});
+  $return->{'stderr'} = '' unless defined ($return->{'stderr'});
+
+  return $return;
+}
+
+################################################################################
+# Cleanup unreferenced rcmd and rcmd.done files.
+################################################################################
+sub cleanup_old_commands {
+  my ($self) = @_;
+
+  # Cleanup old .rcmd and .rcmd.done files.
+  my %registered = map { $_.'.rcmd' => 1 } keys %{$self->{'commands'}};
+  if(opendir(my $dir, $self->{'ConfDir'}.'/commands/')) {
+    while (my $item = readdir($dir)) {
+
+      # Skip other files.
+      next if ($item !~ /\.rcmd$/);
+
+      # Clean .rcmd.done file if its command is not referenced in conf.
+      if (!defined($registered{$item})) {
+        if (-e $self->{'ConfDir'}.'/commands/'.$item) {
+          unlink($self->{'ConfDir'}.'/commands/'.$item);
+        }
+        if (-e $self->{'ConfDir'}.'/commands/'.$item.'.done') {
+          unlink($self->{'ConfDir'}.'/commands/'.$item.'.done');
+        }
+      }
+    }
+
+    # Close dir.
+    closedir($dir);
+  }
+
+}
+
+################################################################################
+# Executes a command using defined timeout.
+################################################################################
+sub execute_command_timeout {
+  my ($self, $cmd, $timeout) = @_;
+
+  if (!defined($timeout)
+    || !looks_like_number($timeout)
+    || $timeout <= 0
+  ) {
+    `$cmd`;
+    return $?>>8;
+  }
+
+  my $remaining_timeout = $timeout;
+
+  my $RET;
+  my $output;
+
+  my $pid = open ($RET, "-|");
+  if (!defined($pid)) {
+    # Failed to fork.
+    $self->set_last_error('[command] Failed to fork.');
+    return undef;
+  }
+  if ($pid == 0) {
+    # Child.
+    my $ret;
+    eval {
+      local $SIG{ALRM} = sub { die "timeout\n" };
+      alarm $timeout;
+      `$cmd`;
+      alarm 0;
+    };
+
+    my $result = ($?>>8);
+    return $result;
+
+    # Exit child.
+    # Child finishes.
+    exit;
+
+  } else {
+    # Parent waiting.
+    while( --$remaining_timeout > 0 ){
+      if (wait == -1) {
+        last;
+      }
+      # Wait child up to timeout seconds.
+      sleep 1;
+    }
+  }
+
+  if ($remaining_timeout > 0) {
+    # Retrieve output from child.
+    $output = do { local $/; <$RET> };
+    $output = $output>>8;
+  }
+  else {
+    # Timeout expired.
+    return 124;
+  }
+
+  close($RET);
+
+  return $output;
+}
+
+################################################################################
+# Executes a block of commands, returns error level, leaves output in 
+# redirection set by $std_files. E.g:
+# $std_files = ' >>  /tmp/stdout 2>> /tmp/stderr
+################################################################################
+sub execute_command_block {
+  my ($self, $commands, $std_files, $timeout, $retry) = @_;
+
+  return 0 unless defined($commands);
+
+  my $retries = $retry;
+
+  $retries = 1 unless looks_like_number($retries) && $retries > 0;
+
+  my $err_level = 0;
+  $std_files = '' unless defined ($std_files);
+
+  if (ref($commands) ne "ARRAY") {
+    return 0 if $commands eq '';
+
+    do {
+      $err_level = $self->execute_command_timeout(
+        "($commands) $std_files",
+        $timeout
+      );
+
+      # Do not retry if success.
+      last if looks_like_number($err_level) && $err_level == 0;
+    } while ((--$retries) > 0);
+
+  } else {
+    foreach my $comm (@{$commands}) {
+      next unless defined($comm);
+      $retries = $retry;
+      $retries = 1 unless looks_like_number($retries) && $retries > 0;
+
+      do {
+        $err_level = $self->execute_command_timeout(
+          "($comm) $std_files",
+          $timeout
+        );
+
+        # Do not retry if success.
+        $retries = 0 if looks_like_number($err_level) && $err_level == 0;
+
+      } while ((--$retries) > 0);
+
+      # Do not continue evaluating block if failed.
+      last unless ($err_level == 0);
+    }
+  }
+
+  return $err_level;
+}
+
+################################################################################
+# Evalate given command.
+################################################################################
+sub evaluate_command {
+  my ($self, $ref) = @_;
+
+  # Not found.
+  return "undefined command" unless defined $self->{'commands'}->{$ref};
+
+  # Already completed.
+  return "already executed" if (-e $self->{'ConfDir'}.'/commands/'.$ref.'.rcmd.done');
+
+  # [0] because how library works.
+  my $cmd = $self->{'commands'}->{$ref}->[0];
+
+  my $std_files = ' >> "'.$self->{'temporal'}.'/'.$ref.'.stdout" ';
+  $std_files .= ' 2>> "'.$self->{'temporal'}.'/'.$ref.'.stderr" ';
+
+  # Check preconditions
+  my $err_level;
+  
+  $err_level = $self->execute_command_block(
+    $cmd->{'preconditions'},
+    $std_files,
+    $cmd->{'timeout'}
+  );
+
+  # Precondition not satisfied.
+  return $self->report_command($ref, $err_level) unless ($err_level == 0);
+
+  # Main run.
+  $err_level = $self->execute_command_block(
+    $cmd->{'script'},
+    $std_files,
+    $cmd->{'timeout'}
+  );
+
+  # Script not success.
+  return $self->report_command($ref, $err_level) unless ($err_level == 0);
+
+  # Check postconditions
+  $err_level = $self->execute_command_block(
+    $cmd->{'postconditions'},
+    $std_files,
+    $cmd->{'timeout'}
+  );
+
+  # Return results.
+  return $self->report_command($ref, $err_level);
+}
+
+################################################################################
+# File transference and imported methods
+################################################################################
+################################################################################
+## Remove any trailing / from directory names.
+################################################################################
+sub fix_directory ($) {
+	my $dir = shift;
+
+	my $char = chop($dir);
+	return $dir if ($char eq '/');
+	return $dir . $char;
+}
+
+################################################################################
+# Receive a file from the server.
+################################################################################
+sub recv_file {
+  my ($self, $file, $relative) = @_;
+  my $output;
+
+  my $DevNull = $self->{'__system'}->{'devnull'};
+  my $CmdSep = $self->{'__system'}->{'cmdsep'};
+  
+  my $pid = fork();
+    return 1 unless defined $pid;
+
+  # Fix remote dir to some transfer mode
+  my $remote_dir = $self->{'server_path'};
+  $remote_dir .= "/" . fix_directory($relative) if defined($relative);
+
+  if ($pid == 0) {
+    # execute the transfer program by child process.
+    eval {
+      local $SIG{'ALRM'} = sub {die};
+      alarm ($self->{'transfer_timeout'});
+      if ($self->{'transfer_mode'} eq 'tentacle') {
+         $output = `cd "$self->{'temporal'}"$CmdSep tentacle_client -v -g -a $self->{'server_ip'} -p $self->{'server_port'} $self->{'server_opts'} $file 2>&1 >$DevNull`
+      } elsif ($self->{'transfer_mode'} eq 'ssh') {
+         $output = `scp -P $self->{'server_port'} pandora@"$self->{'server_ip'}:$self->{'server_path'}/$file" $self->{'temporal'} 2>&1 >$DevNull`;
+      } elsif ($self->{'transfer_mode'} eq 'ftp') {
+        my $base = basename ($file);
+        my $dir = dirname ($file);
+
+        $output = `ftp -n $self->{'server_opts'} $self->{'server_ip'} $self->{'server_port'} 2>&1 >$DevNull <<FEOF1
+        quote USER $self->{'server_user'}
+        quote PASS $self->{'server_pwd'}
+        lcd "$self->{'temporal'}"
+        cd "$self->{'server_path'}"
+        get "$file"
+        quit
+        FEOF1`
+      } elsif ($self->{'transfer_mode'} eq 'local') {
+        $output = `cp "$remote_dir/$file" $self->{'temporal'} 2>&1 >$DevNull`;
+      }
+      alarm (0);
+    };
+
+    if ($@) {
+      $self->set_last_error("Error retrieving file: '.$file.' File transfer command is not responding.");
+      exit 1;
+    }
+
+    # Get the errorlevel
+    my $rc = $? >> 8;
+    if ($rc != 0) {
+      $self->set_last_error("Error retrieving file: '$file' $output");
+    }
+    exit $rc;
+  }
+
+  # Wait the child process termination and get the errorlevel
+  waitpid ($pid, 0);
+  my $rc = $? >> 8;
+
+  return $rc;
+}
+
+
+1;
\ No newline at end of file
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 595fc4bbda..84b6af488e 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.750";
-my $pandora_build = "201015";
+my $pandora_build = "201202";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
@@ -1166,6 +1166,7 @@ sub init_system {
 		$system{echo}    = "echo";
 		$system{wcl}     = "wc -l";
 		$system{tmp}     = ".\\";
+		$system{cmdsep}  = "\&";
 	}
 	else {
 		$system{devnull} = "/dev/null";
@@ -1176,6 +1177,7 @@ sub init_system {
 		$system{echo}    = "echo";
 		$system{wcl}     = "wc -l";
 		$system{tmp}     = "/tmp";
+		$system{cmdsep}  = ";";
 
 		if ($^O =~ /hpux/i) {
 			$system{os}      = "HPUX";
diff --git a/pandora_server/lib/PandoraFMS/PredictionServer.pm b/pandora_server/lib/PandoraFMS/PredictionServer.pm
index 6f77845456..ab38cca2aa 100644
--- a/pandora_server/lib/PandoraFMS/PredictionServer.pm
+++ b/pandora_server/lib/PandoraFMS/PredictionServer.pm
@@ -108,13 +108,16 @@ sub data_producer ($) {
 			ORDER BY last_execution_try ASC ', safe_input($pa_config->{'servername'}));
 	}
 	else {
+		# If is metaconsole server, will evaluate orphan modules also.
 		@rows = get_db_rows ($dbh, 'SELECT DISTINCT(tagente_modulo.id_agente_modulo),
 				tagente_modulo.flag, last_execution_try
 			FROM tagente, tagente_modulo, tagente_estado
 			WHERE ((server_name = ?)
 				OR (server_name = ANY(SELECT name
 					FROM tserver
-					WHERE status = 0 AND server_type = ?)))
+					WHERE status = 0 AND server_type = ?))
+				OR ((server_name = 0 OR server_name IS NULL) AND 1=?)
+				)
 				AND tagente_modulo.id_agente = tagente.id_agente
 				AND tagente.disabled = 0
 				AND tagente_modulo.disabled = 0
@@ -123,7 +126,11 @@ sub data_producer ($) {
 				AND tagente_modulo.id_modulo = 5
 				AND (tagente_modulo.flag = 1
 				OR (tagente_estado.last_execution_try + tagente_estado.current_interval) < UNIX_TIMESTAMP())
-			ORDER BY last_execution_try ASC', safe_input($pa_config->{'servername'}), PREDICTIONSERVER);
+			ORDER BY last_execution_try ASC',
+			safe_input($pa_config->{'servername'}),
+			PREDICTIONSERVER,
+			is_metaconsole($pa_config)
+		);
 	}
 	
 	foreach my $row (@rows) {
diff --git a/pandora_server/lib/PandoraFMS/SNMPServer.pm b/pandora_server/lib/PandoraFMS/SNMPServer.pm
index 5a5a741525..06e5a15c2f 100644
--- a/pandora_server/lib/PandoraFMS/SNMPServer.pm
+++ b/pandora_server/lib/PandoraFMS/SNMPServer.pm
@@ -49,6 +49,8 @@ my $TaskSem :shared;
 
 # Trap statistics by agent
 my %AGENTS = ();
+# Sources silenced by storm protection.
+my %SILENCEDSOURCES = ();
 
 # Index and buffer management for trap log files
 my $SNMPTRAPD =   { 'log_file' => '', 'fd' => undef, 'idx_file' => '', 'last_line' => 0, 'last_size' => 0, 'read_ahead_line' => '', 'read_ahead_pos' => 0 };
@@ -167,17 +169,26 @@ sub data_producer ($) {
 			if (! defined ($AGENTS{$source})) {
 				$AGENTS{$source}{'count'} = 1;
 				$AGENTS{$source}{'event'} = 0;
+				if (! defined ($SILENCEDSOURCES{$source})) {
+					$SILENCEDSOURCES{$source} = 0;
+				}
 			} else {
 				$AGENTS{$source}{'count'} += 1;
 			}
+			# Silence source.
+			if ((defined ($SILENCEDSOURCES{$source})) && ($SILENCEDSOURCES{$source} > $curr_time)) {
+				next;
+			}
 			if ($pa_config->{'snmp_storm_protection'} > 0 && $AGENTS{$source}{'count'} > $pa_config->{'snmp_storm_protection'}) {
 				if ($AGENTS{$source}{'event'} == 0) {
-					pandora_event ($pa_config, "Too many traps coming from $source. Silenced for " . int ($pa_config->{"snmp_storm_timeout"} / 60) . " minutes.", 0, 0, 4, 0, 0, 'system', 0, $dbh);
+					$SILENCEDSOURCES{$source} = $curr_time + $pa_config->{'snmp_storm_silence_period'};
+					my $silenced_time = ($pa_config->{'snmp_storm_silence_period'} eq 0 ? $pa_config->{"snmp_storm_timeout"} : $pa_config->{'snmp_storm_silence_period'});
+					pandora_event ($pa_config, "Too many traps coming from $source. Silenced for " . $silenced_time . " seconds.", 0, 0, 4, 0, 0, 'system', 0, $dbh);
 				}
 				$AGENTS{$source}{'event'} = 1;
 				next;
 			}
-	
+
 			push (@tasks, $line);
 		}
 	}
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 300e66e5a6..98ddf09c09 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -91,6 +91,7 @@ our @EXPORT = qw(
 	$DEVNULL
 	$OS
 	$OS_VERSION
+	$VERSION
 	RECOVERED_ALERT
 	FIRED_ALERT
 	MODULE_NORMAL
@@ -856,6 +857,24 @@ sub clean_blank {
 	return $input;
 }
 
+################################################################################
+# Erase blank spaces before and after the string
+################################################################################
+sub trim {
+	my $string = shift;
+	if (is_empty($string)){
+		return "";
+	}
+
+	$string =~ s/\r//g;
+
+	chomp($string);
+	$string =~ s/^\s+//g;
+	$string =~ s/\s+$//g;
+
+	return $string;
+}
+
 ################################################################################
 # sub sqlWrap(texto)
 # Elimina comillas y caracteres problematicos y los sustituye por equivalentes
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index d5b0c58850..f3cb7c6ffa 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.750
-%define release     1
+%define release     201202
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7e60a5bdd8..d43220af9e 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.750
-%define release     1
+%define release     201202
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3e1ec89b9b..d9854f5375 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201015"
+PI_BUILD="201202"
 
 MODE=$1
 if [ $# -gt 1 ]; then
@@ -262,6 +262,7 @@ install () {
 				ln -s /usr/local/bin/pandora_server $DESTDIR$PREFIX/bin
 				ln -s /usr/local/bin/pandora_exec $DESTDIR$PREFIX/bin
 				ln -s /usr/local/bin/tentacle_server $DESTDIR$PREFIX/bin
+				ln -s /usr/local/bin/tentacle_client $DESTDIR$PREFIX/bin
 			fi
 		fi
 	fi
@@ -495,7 +496,9 @@ uninstall () {
 	rm -f  $DESTDIR$PANDORA_SERVER 2> /dev/null 
 	rm -f  $DESTDIR$PREFIX/bin/pandora_server 2> /dev/null
 	rm -f  $DESTDIR$PREFIX/bin/pandora_exec 2> /dev/null
-	rm -f  $DESTDIR$PREFIX/bin/tentacle_server 2> /dev/null
+	# Do not remove tentacle files if agent is still installed...
+	[ -e $DESTDIR$PREFIX/bin/pandora_agent ] || rm -f  $DESTDIR$PREFIX/bin/tentacle_server 2> /dev/null
+	[ -e $DESTDIR$PREFIX/bin/pandora_agent ] || rm -f  $DESTDIR$PREFIX/bin/tentacle_client 2> /dev/null
 	rm -Rf $DESTDIR$PANDORA_HOME
 	rm -f  $DESTDIR/etc/cron.hourly/pandora_db
 	rm -f  $DESTDIR/etc/logrotate.d/pandora_server
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 5322721ec8..ae2cf2518f 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.750 PS201015";
+my $version = "7.0NG.750 PS201202";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f71a779d5d..2dd964a859 100755
--- 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.750 PS201015";
+my $version = "7.0NG.750 PS201202";
 
 # save program name for logging
 my $progname = basename($0);
@@ -5734,7 +5734,7 @@ sub cli_delete_group() {
 	my $group_id = get_group_id($dbh,$group_name);
 	exist_check($group_id, 'group name', $group_name);
 
-	$group_id = db_do ($dbh, 'DELETE FROM tgrupo WHERE nombre=?', $group_name);
+	$group_id = db_do ($dbh, 'DELETE FROM tgrupo WHERE nombre=?', safe_input($group_name));
 
 	if($group_id == -1) {
 		print_log "[ERROR] A problem has been ocurred deleting group '$group_name'\n\n";
@@ -5754,16 +5754,22 @@ sub cli_delete_group() {
 sub cli_update_group() {
 	my ($group_id,$group_name,$parent_group_name,$icon,$description) = @ARGV[2..6];
 	my $result;
-	$result = db_do ($dbh, 'SELECT * FROM tgrupo WHERE id_grupo=?', $group_id);
+
+	$result = get_db_value ($dbh, 'SELECT * FROM tgrupo WHERE id_grupo=?', $group_id);
 
 	if($result == "0E0"){
 		print_log "[ERROR] Group '$group_id' doesn`t exist \n\n";
 	}else{
 		if(defined($group_name)){
 			if(defined($parent_group_name)){
-				my $parent_group_id = get_group_id($dbh,$parent_group_name);
-				exist_check($parent_group_id, 'group name', $parent_group_name);
 
+				my $parent_group_id = 0;
+
+				if($parent_group_name ne 'All') {
+						$parent_group_id = get_group_id($dbh,$parent_group_name);
+						exist_check($parent_group_id, 'group name', $parent_group_name);				
+				} 
+					
 				if(defined($icon)){
 					if(defined($description)){
 						db_do ($dbh,'UPDATE tgrupo SET nombre=? , parent=? , icon=? , description=? WHERE id_grupo=?',$group_name,$parent_group_id,$icon,$description,$group_id);
diff --git a/tentacle/tentacle_client b/tentacle/tentacle_client
new file mode 100755
index 0000000000..913beda931
--- /dev/null
+++ b/tentacle/tentacle_client
@@ -0,0 +1,1101 @@
+#!/usr/bin/perl
+################################################################################
+#
+# Copyright (c) 2007-2008  Ramon Novoa  <rnovoa@artica.es>
+# Copyright (c) 2007-2008  Artica Soluciones Tecnologicas S.L.
+#
+# tentacle_client.pl	Tentacle Client. See https://pandorafms.com/docs/ for
+# 			protocol description.
+#
+# 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 of the License.
+# 
+# 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.	
+#
+################################################################################
+
+package tentacle::client;
+
+=head1 NAME
+
+tentacle_client - Tentacle Client
+
+=head1 VERSION
+
+Version 0.4.0
+
+=head1 USAGE
+
+tentacle_client [options] [file] [file] ...
+
+=head1 DESCRIPTION
+
+B<tentacle_client(1)> is a client for B<tentacle>, a B<client/server> file transfer protocol that aims to be:
+
+=over
+
+=item    * Secure by design.
+
+=item    * Easy to use.
+
+=item    * Versatile and cross-platform. 
+
+=back 
+
+Tentacle was created to replace more complex tools like SCP and FTP for simple file transfer/retrieval, and switch from authentication mechanisms like .netrc, interactive logins and SSH keys to X.509 certificates. Simple password authentication over a SSL secured connection is supported too.
+
+The client and server (B<TCP port 41121>) are designed to be run from the command line or called from a shell script, and B<no configuration files are needed>. 
+
+If IO::Socket::INET6 is installed, the tentacle client supports IPv6.
+
+=cut
+
+use strict;
+use File::Basename;
+use Getopt::Std;
+use IO::Select;
+my $zlib_available = 1;
+
+eval {
+	eval "use IO::Compress::Zip qw(zip);1" or die($@);
+	eval "use IO::Uncompress::Unzip qw(unzip);1" or die($@);
+};
+if ($@) {
+	print_log ("Zip transfer not available, required libraries not found (IO::Compress::Zip, IO::Uncompress::Unzip).");
+	$zlib_available = 0;
+}
+
+use Socket (qw(SOCK_STREAM AF_INET AF_INET6));
+my $SOCKET_MODULE =
+	eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
+      : eval { require IO::Socket::INET }  ? 'IO::Socket::INET'
+      : die $@;
+
+if ($SOCKET_MODULE eq 'IO::Socket::INET') {
+	print_log ("IO::Socket::INET6 is not found. IPv6 is disabled.");
+}
+
+# Program version
+our $VERSION = '0.4.0';
+
+# Server address
+my $t_address = '127.0.0.1';
+
+# Block size for socket read/write operations in bytes
+my $t_block_size = 1024;
+
+# Log messages, 1 enabled, 0 disabled
+my $t_log = 0;
+
+# Server port
+my $t_port = 41121;
+
+# Do not output error messages, 1 enabled, 0 disabled
+my $t_quiet = 0;
+
+# Proxy address
+my $t_proxy_address = '';
+
+# Proxy user
+my $t_proxy_user = '';
+
+# Proxy password
+my $t_proxy_pass = '';
+
+# Proxy port
+my $t_proxy_port = 0;
+
+# Server password
+my $t_pwd = '';
+
+# Receive mode, 1 enabled, 0 disabled
+my $t_recv = 0;
+
+# Retries for socket read/write operations
+my $t_retries = 3;
+
+# Select handler
+my $t_select;
+
+# Server socket
+my $t_socket;
+
+# Use SSL, 1 true, 0 false
+my $t_ssl = 0;
+
+# SSL ca certificate file
+my $t_ssl_ca = '';
+
+# SSL certificate file
+my $t_ssl_cert = '';
+
+# SSL private key file
+my $t_ssl_key = '';
+
+# SSL private key file password
+my $t_ssl_pwd = '';
+
+# Timeout for socket read/write operations in seconds
+my $t_timeout = 1;
+
+# bind ipaddr
+my $t_bind_address = undef;
+
+# Compress data before sending it through the socket.
+my $t_zip = 0;
+
+################################################################################
+## SUB print_help
+## Print help screen.
+################################################################################
+sub print_help {
+
+	print ("Usage: $0 [options] [file] [file] ...\n\n");
+	print ("Tentacle client v$VERSION. See https://pandorafms.com/docs/ for protocol description.\n\n");
+	print ("Options:\n");
+	print ("\t-a address\tServer address (default $t_address).\n");
+	print ("\t-b localaddress\tLocal address to bind.\n");
+	print ("\t-c\t\tEnable SSL without a client certificate.\n");
+	print ("\t-e cert\t\tOpenSSL certificate file. Enables SSL.\n");
+	print ("\t-f ca\t\tVerify that the peer certificate is signed by a ca.\n");
+	print ("\t-g\t\tGet files from the server.\n");
+	print ("\t-h\t\tShow help.\n");
+	print ("\t-k key\t\tOpenSSL private key file.\n");
+	print ("\t-p port\t\tServer port (default $t_port).\n");
+	print ("\t-q\t\tQuiet. Do now print error messages.\n");
+	print ("\t-r number\tNumber of retries for network operations (default $t_retries).\n");
+	print ("\t-t time\t\tTime-out for network operations in seconds (default ${t_timeout}s).\n");
+	print ("\t-v\t\tBe verbose.\n");
+	print ("\t-w\t\tPrompt for OpenSSL private key password.\n");
+	print ("\t-x pwd\t\tServer password.\n");
+	print ("\t-y proxy\tProxy server string (user:password\@address:port).\n");
+	print ("\t-z Compress data.\n\n");
+}
+
+################################################################################
+## SUB parse_options
+## Parse command line options and initialize global variables.
+################################################################################
+sub parse_options {
+	my %opts;
+	my $tmp;
+
+	# Get options
+	if (getopts ('a:b:ce:f:ghk:p:qr:t:vwx:y:z', \%opts) == 0 || defined ($opts{'h'})) {
+		print_help ();
+		exit 1;
+	}
+
+	# Address
+	if (defined ($opts{'a'})) {
+		$t_address = $opts{'a'};
+		if (($t_address !~ /^[a-zA-Z\.][a-zA-Z0-9\.\-]+$/ && ($t_address  !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
+			|| $1 < 0 || $1 > 255 || $2 < 0 || $2 > 255
+			|| $3 < 0 || $3 > 255 || $4 < 0 || $4 > 255)) &&
+			($t_address !~ /^[0-9a-f:]+$/o)) {
+			error ("Address $t_address is not valid.");
+		}
+
+	}
+
+	# Bind local address
+	if (defined ($opts{'b'})) {
+		$t_bind_address = $opts{'b'};
+		if (($t_bind_address !~ /^[a-zA-Z\.][a-zA-Z0-9\.\-]+$/ && ($t_bind_address  !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
+			|| $1 < 0 || $1 > 255 || $2 < 0 || $2 > 255
+			|| $3 < 0 || $3 > 255 || $4 < 0 || $4 > 255)) &&
+			($t_address !~ /^[0-9a-f:]+$/o)) {
+			error ("Local address $t_bind_address is not valid.");
+		}
+
+	}
+
+	# Enable SSL without a client certificate
+	if (defined ($opts{'c'})) {
+		require IO::Socket::SSL;
+		$t_ssl = 1;
+	} 
+
+	# Enable SSL
+	if (defined ($opts{'e'})) {
+		
+		if (defined ($opts{'c'})) {
+			error ("Flags -c and -e can not be used at the same time.");
+		}
+
+		require IO::Socket::SSL;
+
+		$t_ssl_cert = $opts{'e'};
+		if (! -f $t_ssl_cert) {
+			error ("File $t_ssl_cert does not exist.");
+		}
+
+		$t_ssl = 1;
+	}
+
+	# Verify peer certificate
+	if (defined ($opts{'f'})) {
+
+		if (! defined ($opts{'e'})) {
+			error ("Flag -e must be set to enable peer certificate verify.");
+		}
+
+		$t_ssl_ca = $opts{'f'};
+		if (! -f $t_ssl_ca) {
+			error ("File $t_ssl_ca does not exist.");
+		}
+	}
+
+	# Get files
+	if (defined ($opts{'g'})) {
+		$t_recv = 1;
+	}
+
+	# SSL private key file
+	if (defined ($opts{'k'})) {
+
+		if (! defined ($opts{'e'})) {
+			error ("Flag -e must be set to use a private key file.");
+		}
+
+		$t_ssl_key = $opts{'k'};
+		if (! -f $t_ssl_key) {
+			error ("File $t_ssl_key does not exist.");
+		}
+	}
+
+	# Port
+	if (defined ($opts{'p'})) {
+		$t_port = $opts{'p'};
+		if ($t_port !~ /^\d+$/ || $t_port < 1 || $t_port > 65535) {
+			error ("Port $t_port is not valid.");
+		}
+	}
+
+	# Quiet mode
+	if (defined ($opts{'q'})) {
+		$t_quiet = 1;
+	}
+
+	# Retries
+	if (defined ($opts{'r'})) {
+		$t_retries = $opts{'r'};
+		if ($t_retries !~ /^\d+$/ || $t_retries < 1) {
+			error ("Invalid number of retries for network operations.");
+		}
+	}
+
+	# Timeout
+	if (defined ($opts{'t'})) {
+		$t_timeout = $opts{'t'};
+		if ($t_timeout !~ /^\d+$/ || $t_timeout < 1) {
+			error ("Invalid timeout for network operations.");
+		}
+	}
+
+	# Be verbose
+	if (defined ($opts{'v'})) {
+		$t_log = 1;
+	}
+
+	# SSL private key password
+	if (defined ($opts{'w'})) {
+
+		if (! defined ($opts{'e'})) {
+			error ("Flag -k must be set to provide a private key password.");
+		}
+
+		$t_ssl_pwd = ask_passwd ("Enter private key file password: ", "Enter private key file password again for confirmation: ");
+	}
+
+	# Server password
+	if (defined ($opts{'x'})) {
+		$t_pwd = $opts{'x'};
+	}
+
+	# Proxy server
+	if (defined ($opts{'y'})) {
+		if ($opts{'y'} !~ /^((.*):(.*)@){0,1}(\S+):(\d+)$/) {
+			error ("Invalid proxy string: " . $opts{'y'});
+		}
+
+		($t_proxy_user, $t_proxy_pass, $t_proxy_address, $t_proxy_port) = ($2, $3, $4, $5);
+		$t_proxy_user = '' unless defined ($t_proxy_user);
+		$t_proxy_pass = '' unless defined ($t_proxy_pass);
+		if ($t_proxy_port < 1 || $t_proxy_port > 65535) {
+			error ("Proxy port $t_proxy_port is not valid.");
+		}
+	}
+
+	# Compress data
+	if (defined ($opts{'z'})) {
+		if ($zlib_available == 1) {
+			$t_zip = 1;
+		}
+	}
+}
+
+################################################################################
+## SUB start_client
+## Open the server socket.
+################################################################################
+sub start_client {
+
+	# Connect to server
+	if ($SOCKET_MODULE ne 'IO::Socket::INET') {
+		if (defined ($t_bind_address)) {
+			$t_socket = $SOCKET_MODULE->new (
+				Domain    => AF_INET6,
+				PeerAddr  => $t_address,
+				PeerPort  => $t_port,
+				LocalAddr => $t_bind_address,
+				Type      => SOCK_STREAM
+			);
+		}
+		else {
+			$t_socket = $SOCKET_MODULE->new (
+				Domain   => AF_INET6,
+				PeerAddr => $t_address,
+				PeerPort => $t_port,
+				Type     => SOCK_STREAM
+			);
+		}
+	}
+	if (! defined ($t_socket)) {
+		if (defined ($t_bind_address)) {
+			$t_socket = $SOCKET_MODULE->new (
+				Domain    => AF_INET,
+				PeerAddr  => $t_address,
+				PeerPort  => $t_port,
+				LocalAddr => $t_bind_address,
+				Type      => SOCK_STREAM
+			);
+		}
+		else {
+			$t_socket = $SOCKET_MODULE->new (
+				Domain   => AF_INET,
+				PeerAddr => $t_address,
+				PeerPort => $t_port,
+				Type     => SOCK_STREAM
+			);
+		}
+	}
+
+	if (! defined ($t_socket)) {
+		error ("Cannot connect to $t_address on port $t_port: $!.");
+	}
+
+	# Add server socket to select queue
+	$t_select = IO::Select->new ();
+	$t_select->add ($t_socket);
+
+	print_log ("Connected to $t_address port $t_port");
+}
+
+################################################################################
+## SUB start_client_proxy
+## Open the server socket. Connects to the Tentacle server through an HTTP proxy.
+################################################################################
+sub start_client_proxy {
+
+	# Connect to proxy
+	if ($SOCKET_MODULE ne 'IO::Socket::INET') {
+		if (defined ($t_bind_address)) {
+			$t_socket = $SOCKET_MODULE->new (
+				Domain    => AF_INET6,
+				PeerAddr  => $t_proxy_address,
+				PeerPort  => $t_proxy_port,
+				LocalAddr => $t_bind_address,
+			);
+		}
+		else {
+			$t_socket = $SOCKET_MODULE->new (
+				Domain   => AF_INET6,
+				PeerAddr => $t_proxy_address,
+				PeerPort => $t_proxy_port,
+			);
+		}
+	}
+	if (! defined ($t_socket)) {
+		if (defined ($t_bind_address)) {
+			$t_socket = $SOCKET_MODULE->new (
+				Domain    => AF_INET,
+				PeerAddr  => $t_proxy_address,
+				PeerPort  => $t_proxy_port,
+				LocalAddr => $t_bind_address,
+			);
+		}
+		else {
+			$t_socket = $SOCKET_MODULE->new (
+				Domain   => AF_INET,
+				PeerAddr => $t_proxy_address,
+				PeerPort => $t_proxy_port,
+			);
+		}
+	}
+
+	if (! defined ($t_socket)) {
+		error ("Cannot connect to proxy server $t_proxy_address on port $t_proxy_port: $!.");
+	}
+
+	# Add server socket to select queue
+	$t_select = IO::Select->new ();
+	$t_select->add ($t_socket);
+
+	print_log ("Connected to proxy server $t_proxy_address port $t_proxy_port");	
+	
+	# Try to CONNECT to the Tentacle server
+	send_data ("CONNECT " . $t_address . ":" . $t_port . " HTTP/1.0\r\n");
+	
+	# Authenticate to the proxy
+	if ($t_proxy_user ne '') {
+		send_data ("Proxy-Authorization: Basic " . base64 ($t_proxy_user . ":" . $t_proxy_pass) . "\r\n");
+	}
+
+	send_data ("\r\n");
+
+	# Check for an HTTP 200 response
+	my $response = recv_data ($t_block_size);
+	if ($response !~ m/HTTP.* 200 /) {
+		my $error = (split (/\r\n/, $response))[0];
+		error ("CONNECT error: $error");
+	}
+
+	print_log ("Connected to $t_address port $t_port");
+}
+
+################################################################################
+## SUB stop_client
+## Close the server socket.
+################################################################################
+sub stop_client {
+
+	$t_socket->shutdown(2);
+	$t_socket->close ();
+}
+
+################################################################################
+## SUB start_ssl
+## Convert the server socket to an IO::Socket::SSL socket.
+################################################################################
+sub start_ssl {
+	my $err;
+	
+	if ($t_ssl_cert eq ''){
+		IO::Socket::SSL->start_SSL (
+			$t_socket,
+			# No authentication
+			SSL_verify_mode => 0x00,
+		);
+	}
+	elsif ($t_ssl_ca eq '') {
+		IO::Socket::SSL->start_SSL (
+			$t_socket,
+			SSL_cert_file => $t_ssl_cert,
+			SSL_key_file => $t_ssl_key,
+			SSL_passwd_cb => sub {return $t_ssl_pwd},
+			SSL_use_cert =>'1',
+			# No authentication
+			SSL_verify_mode => 0x00, 
+		);
+	}
+	else {
+		IO::Socket::SSL->start_SSL (
+			$t_socket,
+			SSL_ca_file => $t_ssl_ca,
+			SSL_cert_file => $t_ssl_cert,
+			SSL_key_file => $t_ssl_key,
+			SSL_passwd_cb => sub {return $t_ssl_pwd},
+			SSL_use_cert =>'1',
+			# Verify peer
+			SSL_verify_mode => 0x01, 
+		);
+	}
+
+	$err = IO::Socket::SSL::errstr ();
+	if ($err ne '') {
+		error ($err);
+	}
+}
+
+################################################################################
+## SUB auth_pwd
+## Authenticate client with server password.
+################################################################################
+sub auth_pwd {
+	my $command;
+	my $pwd_digest;
+
+	require Digest::MD5;
+	
+	$pwd_digest = Digest::MD5::md5 ($t_pwd);
+	$pwd_digest = Digest::MD5::md5_hex ($pwd_digest);
+
+	send_data ("PASS $pwd_digest\n");
+
+	$command = recv_command ($t_block_size);
+	if ($command !~ /^PASS OK$/) {
+		error ("Authentication failed.");
+	}
+}
+
+################################################################################
+## SUB base64
+## Returns the base 64 encoding of a string.
+################################################################################
+my @alphabet = ('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+                'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+                'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+                'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+                '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/');
+sub base64 {
+	my $str = shift;
+	my $str64;
+
+	# Pre-processing
+	my $msg = unpack ("B*", pack ("A*", $str));
+	my $bit_len = length ($msg);
+
+	# Process the message in successive 24-bit chunks
+	for (my $i = 0; $i < $bit_len; $i += 24) {
+		my $chunk_len = length (substr ($msg, $i, 24));
+		$str64 .= $alphabet[ord (pack ("B8", "00" . substr ($msg, $i, 6)))];
+		$str64 .= $alphabet[ord (pack ("B8", "00" . substr ($msg, $i+6, 6)))];
+		$str64 .= ($chunk_len <= 12) ? "=" : $alphabet[ord (pack ("B8", "00" . substr ($msg, $i+12, 6)))];
+		$str64 .= ($chunk_len <= 18) ? "=" : $alphabet[ord (pack ("B8", "00" . substr ($msg, $i+18, 6)))];
+	}
+	
+	return $str64;
+}
+
+
+################################################################################
+## SUB recv_file
+## Receive a file from the server
+################################################################################
+sub recv_file {
+	my $data = '';
+	my $file = $_[0];
+	my $response;
+	my $size;
+
+	# Request file
+	send_data ("RECV <$file>\n");
+
+	# Wait for server response
+	$response = recv_command ();
+	if ($response !~ /^RECV SIZE (\d+)$/) {
+		error ("Server responded $response.");
+	}
+
+	$size = $1;
+	send_data ("RECV OK\n");
+	
+	# Receive file
+	$data = recv_data_block ($size);
+
+	# Write it to disk
+	open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
+	binmode (FILE);
+	print (FILE $data);
+	close (FILE);
+
+	print_log ("Received file '$file'");
+}
+
+################################################################################
+## SUB zrecv_file
+## Receive a compressed file from the server
+################################################################################
+sub zrecv_file {
+	my $data = '';
+	my $file = $_[0];
+	my $response;
+	my $size;
+	my $zdata = '';
+
+	# Request file
+	send_data ("ZRECV <$file>\n");
+
+	# Wait for server response
+	$response = recv_command ();
+	if ($response !~ /^ZRECV SIZE (\d+)$/) {
+		error ("Server responded $response.");
+	}
+
+	$size = $1;
+	send_data ("ZRECV OK\n");
+
+	# Receive file
+	$zdata = recv_data_block ($size);
+	if (!unzip(\$zdata => \$data)) {
+		print_log ("Uncompress error: $IO::Uncompress::Unzip::UnzipError");
+		send_data ("ZRECV ERR\n");
+		return;
+	}
+
+	# Write it to disk
+	open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
+	binmode (FILE);
+	print (FILE $data);
+	close (FILE);
+
+	print_log ("Received compressed file '$file'");
+}
+
+################################################################################
+## SUB send_file
+## Send a file to the server
+################################################################################
+sub send_file {
+	my $base_name;
+	my $data = '';
+	my $response = '';
+	my $retries;
+	my $file = $_[0];
+	my $size;
+	my $written;
+
+	$base_name = basename ($file);
+	$size = -s $file;
+
+	# Request to send file
+	send_data ("SEND <$base_name> SIZE $size\n");
+
+	print_log ("Request to send file '$base_name' size ${size}b");
+
+	# Wait for server response
+	$response = recv_command ();
+
+	# Server rejected the file
+	if ($response ne "SEND OK") {
+		send_data ("QUIT\n");
+		error ("Server responded $response.");
+	}
+
+	print_log ("Server responded SEND OK");
+
+	# Send the file
+	open (FILE, $file) || error ("Cannot open file '$file' for reading.");
+	binmode (FILE);
+	{
+		local $/ = undef;
+		$data = <FILE>;
+	}
+	send_data ($data);
+	
+	close (FILE);
+
+	# Wait for server response
+	$response = recv_command ();
+	if ($response ne "SEND OK") {
+		send_data ("QUIT\n");
+		error ("Server responded $response.");
+	}
+
+	print_log ("File sent");
+}
+
+################################################################################
+## SUB zsend_file
+## Send a file to the server (compressed)
+################################################################################
+sub zsend_file {
+	my $base_name;
+	my $data = '';
+	my $response = '';
+	my $retries;
+	my $file = $_[0];
+	my $size;
+	my $written;
+
+	# Read the file and compress its contents
+	if (! zip($file => \$data)) {
+		send_data ("QUIT\n");
+		error ("Compression error: $IO::Compress::Zip::ZipError");
+		return;
+	}
+
+	$size = length($data);
+	$base_name = basename ($file);
+
+	# Request to send file
+	send_data ("ZSEND <$base_name> SIZE $size\n");
+	print_log ("Request to send file '$base_name' size ${size}b (compressed)");
+
+	# Wait for server response
+	$response = recv_command ();
+
+	# Server rejected the file
+	if ($response ne "ZSEND OK") {
+		send_data ("QUIT\n");
+		error ("Server responded $response.");
+	}
+
+	print_log ("Server responded ZSEND OK");
+	send_data ($data);
+
+	# Wait for server response
+	$response = recv_command ();
+	if ($response ne "ZSEND OK") {
+		send_data ("QUIT\n");
+		error ("Server responded $response.");
+	}
+
+	print_log ("File sent");
+}
+
+################################################################################
+# Common functions
+################################################################################
+
+################################################################################
+## SUB print_log
+## Print log messages.
+################################################################################
+sub print_log {
+
+	if ($t_log == 1) {
+		print (STDOUT "[log] $_[0]\n");
+	}
+}
+
+################################################################################
+## SUB error
+## Print an error and exit the program.
+################################################################################
+sub error {
+
+	if ($t_quiet == 0) {
+		print (STDERR "[err] $_[0]\n");
+	}
+
+	exit 1;
+}
+
+################################################################################
+## SUB recv_data
+## Read data from the client socket. Returns the number of bytes read and the
+## string of bytes as a two element array.
+################################################################################
+sub recv_data {
+	my $data;
+	my $read;
+	my $retries = 0;
+	my $size = $_[0];
+
+	while (1) {
+
+		# Try to read data from the socket
+		if ($t_select->can_read ($t_timeout)) {
+			
+			# Read at most $size bytes
+			$read = sysread ($t_socket, $data, $size);
+
+			# Read error
+			if (! defined ($read)) {
+				error ("Read error from " . $t_socket->sockhost () . ": $!.");
+			}
+	
+			# EOF
+			if ($read == 0) {
+				error ("Connection from " . $t_socket->sockhost () . " unexpectedly closed.");
+			}
+	
+			return ($read, $data);
+		}
+
+		# Retry
+		$retries++;
+
+		# But check for error conditions first
+		if ($retries > $t_retries) {
+			error ("Connection from " . $t_socket->sockhost () . " timed out.");
+		}
+	}
+}
+
+################################################################################
+## SUB send_data
+## Write data to the client socket.
+################################################################################
+sub send_data {
+	my $data = $_[0];
+	my $block_size;
+	my $retries = 0;
+	my $size;
+	my $total = 0;
+	my $written;
+
+	$size = length ($data);
+
+	while (1) {
+
+		# Try to write data to the socket
+		if ($t_select->can_write ($t_timeout)) {
+
+			$block_size = ($size - $total) > $t_block_size ? $t_block_size : ($size - $total);
+			$written = syswrite ($t_socket, $data, $block_size, $total);
+
+			# Read error
+			if (! defined ($written)) {
+				error ("Connection error from " . $t_socket->sockhost () . ": $!.");
+			}
+			
+			# EOF
+			if ($written == 0) {
+				error ("Connection from " . $t_socket->sockhost () . " unexpectedly closed.");
+			}
+
+			$total += $written;
+
+			# All data was written
+			if ($total == $size) {
+				return;
+			}
+		# Retry
+		} else {
+			$retries++;
+			if ($retries > $t_retries) {
+				error ("Connection from " . $t_socket->sockhost () . " timed out.");
+			}
+		}
+	}
+}
+
+################################################################################
+## SUB recv_command
+## Read a command from the client, ended by a new line character.
+################################################################################
+sub recv_command {
+	my $buffer;
+	my $char;
+	my $command = '';
+	my $read;
+	my $total = 0;
+
+	while (1) {
+		
+		($read, $buffer) = recv_data ($t_block_size);
+		$command .= $buffer;
+		$total += $read;
+
+		# Check if the command is complete
+		$char = chop ($command);
+		if ($char eq "\n") {
+			return $command;
+		}
+	
+		$command .= $char;
+
+		# Avoid overflow
+		if ($total > $t_block_size) {
+			error ("Received too much data from " . $t_socket->sockhost ());
+		}
+	}
+}
+
+################################################################################
+## SUB recv_data_block
+## Read $_[0] bytes of data from the client.
+################################################################################
+sub recv_data_block {
+	my $buffer = '';
+	my $data = '';
+	my $read;
+	my $size = $_[0];
+	my $total = 0;
+
+	while (1) {
+
+		($read, $buffer) = recv_data ($size - $total);
+		$data .= $buffer;
+		$total += $read;
+
+		# Check if all data has been read
+		if ($total == $size) {
+			return $data;
+		}
+	}
+}
+
+################################################################################
+## SUB ask_passwd
+## Asks the user for a password.
+################################################################################
+sub ask_passwd {
+	my $msg1 = $_[0];
+	my $msg2 = $_[1];
+	my $pwd1;
+	my $pwd2;
+
+	require Term::ReadKey;
+
+	# Disable keyboard echo
+	Term::ReadKey::ReadMode('noecho');
+	
+	# Promt for password
+	print ($msg1);
+	$pwd1 = Term::ReadKey::ReadLine(0);
+	print ("\n$msg2");
+	$pwd2 = Term::ReadKey::ReadLine(0);
+	print ("\n");
+
+	# Restore original settings
+	Term::ReadKey::ReadMode('restore');
+
+	if ($pwd1 ne $pwd2) {
+		# Call print to bypass quiet mode.
+		print ("[err] Passwords do not match.\n");
+		exit 1;
+	}
+
+	# Remove the trailing new line character
+	chop $pwd1;
+
+	return $pwd1;
+}
+
+################################################################################
+# Main
+################################################################################
+
+my $file;
+
+# Parse command line options
+parse_options ();
+
+# Check command line arguments
+if ($t_recv == 0 && $#ARGV == -1) {
+	error ("No files to send.");
+}
+
+# Connect to the server
+if ($t_proxy_address eq '') {
+	start_client ();
+} else {
+	start_client_proxy ();
+}
+
+# Start SSL
+if ($t_ssl == 1) {
+	start_ssl ();
+}
+
+# Authenticate with server
+if ($t_pwd ne '') {
+	auth_pwd ();
+}
+
+if ($t_recv == 0) {
+	# Check that all files exist before trying to send them
+	foreach $file (@ARGV) {
+		if (! -f $file) {
+			error ("File '$file' does not exist.");
+		}
+	}
+
+	# Send the files
+	foreach $file (@ARGV) {
+		if ($t_zip == 1) {
+			zsend_file($file);
+		} else {
+			send_file ($file);
+		}
+	}
+}
+else {
+	# Receive the files
+	foreach $file (@ARGV) {
+		if ($t_zip == 1) {
+			zrecv_file ($file);
+		} else {
+			recv_file ($file);
+		}
+	}
+}
+
+# Tell the server that we are finished
+send_data ("QUIT\n");
+
+stop_client ();
+
+exit 0;
+
+
+__END__
+
+=head1 OPTIONS
+
+=over
+
+=item	I<-a address>	B<Server address> (default 127.0.0.1).
+
+=item	I<-c>			Enable B<SSL> without a client certificate.
+
+=item	I<-e cert>		B<OpenSSL certificate> file. Enables SSL.
+
+=item	I<-f ca>		Verify that the peer certificate is signed by a B<CA> (Certificate Authority).
+
+=item	I<-g>			B<Get> files from the server.
+
+=item	I<-h>			Show B<help>.
+
+=item	I<-k key>		B<OpenSSL private key> file.
+
+=item	I<-p port>		B<Server port> (default I<41121>).
+
+=item	I<-q>			B<Quiet>. Do now print error messages.
+
+=item	I<-r number>		B<Number of retries> for network operations (default I<3>).
+
+=item	I<-t time>		B<Time-out> for network operations in seconds (default I<1s>).
+
+=item	I<-v>			Be B<verbose>.
+
+=item	I<-w>			Prompt for B<OpenSSL private key password>.
+
+=item	I<-x pwd>		B<Server password>.
+
+=item	I<-z>			Compress data.
+
+=back
+
+=head1 EXIT STATUS
+
+=over 
+
+=item 0 on Success
+
+=item 1 on Error
+
+=back 
+
+=head1 CONFIGURATION
+
+Tentacle doesn't use any configurationf files, all the configuration is done by the options passed when it's started.
+
+=head1 DEPENDENCIES
+
+L<Getopt::Std>, L<IO::Select>, L<IO::Socket::INET>, L<File::Basename>
+
+=head1 LICENSE
+
+This is released under the GNU Lesser General Public License.
+
+=head1 SEE ALSO
+
+L<Getopt::Std>, L<IO::Select>, L<IO::Socket::INET>, L<File::Basename>
+
+Protocol description and more info at: L<< https://pandorafms.com/docs/index.php?title=Pandora:Documentation_en:Tentacle >>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2005-2010 Artica Soluciones Tecnologicas S.L
+
+=cut
+
diff --git a/tentacle/tentacle_server b/tentacle/tentacle_server
new file mode 100755
index 0000000000..feb8ecf9af
--- /dev/null
+++ b/tentacle/tentacle_server
@@ -0,0 +1,1884 @@
+#!/usr/bin/perl
+##########################################################################
+# Tentacle Server
+# See https://pandorafms.com/docs/ for protocol description.
+# Tentacle have IANA assigned port tpc/41121 as official port.
+##########################################################################
+# Copyright (c) 2007-2008  Ramon Novoa  <rnovoa@artica.es>
+# Copyright (c) 2005-2010 Artica Soluciones Tecnologicas S.L
+#
+# tentacle_server.pl	Tentacle Server. See https://pandorafms.com/docs/ for
+#                       protocol description.
+#
+# 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 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+##########################################################################
+
+package tentacle::server;
+=head1 NAME
+
+tentacle_server - Tentacle Server
+
+=head1 VERSION
+
+Version 0.6.1
+
+=head1 USAGE
+
+tentacle_server B<< -s F<storage_directory> >> [I<options>]
+
+=head1 DESCRIPTION
+
+B<tentacle_server(1)> is a server for B<tentacle>, a B<client/server> file transfer protocol that aims to be:
+
+=over
+
+=item    * Secure by design.
+
+=item    * Easy to use.
+
+=item    * Versatile and cross-platform. 
+
+=back 
+
+Tentacle was created to replace more complex tools like SCP and FTP for simple file transfer/retrieval, and switch from authentication mechanisms like .netrc, interactive logins and SSH keys to X.509 certificates. Simple password authentication over a SSL secured connection is supported too.
+
+The client and server (B<TCP port 41121>) are designed to be run from the command line or called from a shell script, and B<no configuration files are needed>. 
+
+=cut
+
+use strict;
+use warnings;
+use Getopt::Std;
+use IO::Select;
+use IO::Compress::Zip qw(zip $ZipError);
+use IO::Uncompress::Unzip qw(unzip $UnzipError);
+use threads;
+use Thread::Semaphore;
+use POSIX ":sys_wait_h";
+use Time::HiRes qw(usleep);
+use Scalar::Util qw(refaddr);
+use POSIX qw(strftime);
+
+# Constants for Win32 services.
+use constant WIN32_SERVICE_STOPPED => 0x01;
+use constant WIN32_SERVICE_RUNNING => 0x04;
+
+my $t_libwrap_installed = eval { require Authen::Libwrap } ? 1 : 0;
+
+if ($t_libwrap_installed) {
+	Authen::Libwrap->import( qw( hosts_ctl STRING_UNKNOWN ) );
+}
+
+# Log errors, 1 enabled, 0 disabled
+my $t_log = 0;
+
+# Log information, 1 enabled, 0 enabled
+my $t_log_hard = 0;
+
+my $SOCKET_MODULE;
+if ($^O eq 'MSWin32') {
+	# Only support INET on windows
+	require IO::Socket::INET;
+	$SOCKET_MODULE = 'IO::Socket::INET';
+} else {
+	$SOCKET_MODULE =
+		eval { require IO::Socket::INET6 } ? 'IO::Socket::INET6'
+		  : eval { require IO::Socket::INET }  ? 'IO::Socket::INET'
+		  : die $@;
+}
+
+# Service name for Win32.
+my $SERVICE_NAME="Tentacle Server";
+
+# Service parameters.
+my $SERVICE_PARAMS=join(' ', @ARGV);
+
+# Program version
+our $VERSION = '0.6.2';
+
+# IPv4 address to listen on
+my @t_addresses = ('0', '0.0.0.0');
+
+# Block size for socket read/write operations in bytes
+my $t_block_size = 1024;
+
+# Client socket
+my $t_client_socket;
+
+# Run as daemon, 1 true, 0 false
+my $t_daemon = 0;
+
+# Storage directory
+my $t_directory = '';
+
+# Filters
+my @t_filters;
+
+# Enable (1) or disable (0) insecure mode
+my $t_insecure = 0;
+
+# String containing quoted invalid file name characters
+my $t_invalid_chars = '\?\[\]\/\\\=\+\<\>\:\;\'\,\*\~';
+
+# Maximum number of simultaneous connections
+my $t_max_conn = 10;
+
+# Maximum file size allowed by the server in bytes
+my $t_max_size = 2000000;
+
+# File overwrite, 1 enabled, 0 disabled
+my $t_overwrite = 0;
+
+# Port to listen on
+my $t_port = 41121;
+
+# Server password
+my $t_pwd = '';
+
+# Do not output error messages, 1 enabled, 0 disabled
+my $t_quiet = 0;
+
+# Number of retries for socket read/write operations
+my $t_retries = 3;
+
+# Select handler
+my $t_select;
+
+# Semaphore
+my $t_sem :shared;
+
+# Server socket
+my @t_server_sockets;
+
+# Server select handler
+my $t_server_select;
+
+# Use SSL, 1 true, 0 false
+my $t_ssl = 0;
+
+# SSL ca certificate file
+my $t_ssl_ca = '';
+
+# SSL certificate file
+my $t_ssl_cert = '';
+
+# SSL private key file
+my $t_ssl_key = '';
+
+# SSL private key password
+my $t_ssl_pwd = '';
+
+# Timeout for socket read/write operations in seconds
+my $t_timeout = 1;
+
+# Address to proxy client requests to
+my $t_proxy_ip = undef;
+
+# Port to proxy client requests to
+my $t_proxy_port = 41121;
+
+# Proxy socket
+my $t_proxy_socket;
+
+# Proxy selected handler
+my $t_proxy_select;
+
+# Use libwrap, 1 true, 0 false
+my $t_use_libwrap = 0;
+
+# Program name for libwrap
+my $t_program_name = $0;
+$t_program_name =~ s/.*\///g;
+
+# Log file
+my $log_file = undef;
+
+################################################################################
+## SUB print_help
+## Print help screen.
+################################################################################
+sub print_help {
+	$" = ',';
+
+	print ("Usage: $0 -s <storage directory> [options]\n\n");
+	print ("Tentacle server v$VERSION. See https://pandorafms.com/docs/ for protocol description.\n\n");
+	print ("Options:\n");
+	print ("\t-a ip_addresses\tIP addresses to listen on (default @t_addresses).\n");
+	print ("\t               \t(Multiple addresses separated by comma can be defined.)\n");
+	print ("\t-c number\tMaximum number of simultaneous connections (default $t_max_conn).\n");
+	print ("\t-d\t\tRun as daemon.\n");
+	print ("\t-e cert\t\tOpenSSL certificate file. Enables SSL.\n");
+	print ("\t-f ca_cert\tVerify that the peer certificate is signed by a ca.\n");
+	print ("\t-F config_file\tConfiguration file full path.\n");
+	print ("\t-h\t\tShow help.\n");
+	print ("\t-I\t\tEnable insecure operations (file listing and moving).\n");
+	print ("\t-i\t\tFilters.\n");
+	print ("\t-k key\t\tOpenSSL private key file.\n");
+	print ("\t-l log_file\t\tFile to write logs.\n");
+	print ("\t-m size\t\tMaximum file size in bytes (default ${t_max_size}b).\n");
+	print ("\t-o\t\tEnable file overwrite.\n");
+	print ("\t-p port\t\tPort to listen on (default $t_port).\n");
+	print ("\t-q\t\tQuiet. Do now print error messages.\n");
+	print ("\t-r number\tNumber of retries for network opertions (default $t_retries).\n");
+	print ("\t-S (install|uninstall|run) Manage the win32 service.\n");
+	print ("\t-t time\t\tTime-out for network operations in seconds (default ${t_timeout}s).\n");
+	print ("\t-v\t\tBe verbose (display errors).\n");
+	print ("\t-V\t\tBe verbose on hard way (display errors and other info).\n");
+	print ("\t-w\t\tPrompt for OpenSSL private key password.\n");
+	print ("\t-x pwd\t\tServer password.\n");
+	print ("\t-b ip_address\tProxy requests to the given address.\n");
+	print ("\t-g port\t\tProxy requests to the given port.\n");
+	print ("\t-T\t\tEnable tcpwrappers support.\n");
+	print ("\t  \t\t(To use this option, 'Authen::Libwrap' should be installed.)\n\n");
+}
+
+################################################################################
+## SUB daemonize
+## Turn the current process into a daemon.
+################################################################################
+sub daemonize {
+	my $pid;
+
+	require POSIX;
+
+	chdir ('/') || error ("Cannot chdir to /: $!.");
+	umask 0;
+
+	open (STDIN, '/dev/null') || error ("Cannot read /dev/null: $!.");
+
+	# Do not be verbose when running as a daemon
+	open (STDOUT, '>/dev/null') || error ("Cannot write to /dev/null: $!.");
+	open (STDERR, '>/dev/null') || error ("Cannot write to /dev/null: $!.");
+
+	# Fork
+	$pid = fork ();
+	if (! defined ($pid)) {
+		error ("Cannot fork: $!.");
+	}
+
+	# Parent
+	if ($pid != 0) {
+		exit;
+	}
+
+	# Child
+	POSIX::setsid () || error ("Cannot start a new session: $!.");
+}
+
+################################################################################
+## SUB parse_options
+## Parse command line options and initialize global variables.
+################################################################################
+sub parse_options {
+	my %opts;
+	my $CONF = {};
+	my $token_value;
+	my $tmp;
+	my @t_addresses_tmp;
+
+	# Get options
+	if (getopts ('a:b:c:de:f:F:g:hIi:k:l:m:op:qr:s:S:t:TvVwx:', \%opts) == 0 || defined ($opts{'h'})) {
+		print_help ();
+		exit 1;
+	}
+
+	# The Win32 service must be installed/uninstalled without checking other parameters.
+	if (defined ($opts{'S'})) {
+		my $service_action = $opts{'S'};
+		if ($^O ne 'MSWin32') {
+			error ("Windows services are only available on Win32.");
+		} else {
+			eval "use Win32::Daemon";
+			die($@) if ($@);
+
+			if ($service_action eq 'install') {
+				install_service();
+			} elsif ($service_action eq 'uninstall') {
+				uninstall_service();
+			}
+		}
+	}
+
+	# Configuration file
+	if (defined($opts{'F'})) {
+		parse_config_file($opts{'F'}, $CONF);
+	}
+
+	# Address
+	$token_value = get_config_value($opts{'a'}, $CONF->{'addresses'});
+	if (defined ($token_value)) {
+		@t_addresses = ();
+		@t_addresses_tmp = split(/,/, $token_value);
+		
+		foreach my $t_address (@t_addresses_tmp) {
+			$t_address =~ s/^ *(.*?) *$/$1/;
+			if (($t_address ne '0') && 
+				($t_address !~ /^[a-zA-Z\.]+$/ && ($t_address  !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
+					|| $1 < 0 || $1 > 255 || $2 < 0 || $2 > 255
+					|| $3 < 0 || $3 > 255 || $4 < 0 || $4 > 255)) &&
+				($t_address !~ /^[0-9a-f:]+$/o)) {
+					error ("Address $t_address is not valid.");
+			}
+			push @t_addresses, $t_address;
+		}
+	}
+	
+	# Maximum simultaneous connections
+	$token_value = get_config_value($opts{'c'}, $CONF->{'max_connections'});
+	if (defined ($token_value)) {
+		$t_max_conn = $token_value;
+		if ($t_max_conn !~ /^\d+$/ || $t_max_conn < 1) {
+			error ("Invalid number of maximum simultaneous connections.");
+		}
+	}
+
+	# Run as daemon
+	$token_value = get_config_value($opts{'d'}, $CONF->{'daemon'}, 1);
+	if (defined ($token_value)) {
+		if ($^ eq 'MSWin32') {
+			error ("-d flag not available for this OS.");
+		}
+
+		$t_daemon = 1;
+	}
+
+	# Enable SSL
+	$token_value = get_config_value($opts{'e'}, $CONF->{'ssl_cert'});
+	if (defined ($token_value)) {
+
+		require IO::Socket::SSL;
+
+		$t_ssl_cert = $token_value;
+		if (! -f $t_ssl_cert) {
+			error ("File $t_ssl_cert does not exist.");
+		}
+
+		$t_ssl = 1;
+	}
+
+	# Verify peer certificate
+	$token_value = get_config_value($opts{'f'}, $CONF->{'ssl_ca'});
+	if (defined ($token_value)) {
+		$t_ssl_ca = $token_value;
+		if (! -f $t_ssl_ca) {
+			error ("File $t_ssl_ca does not exist.");
+		}
+	}
+
+	# Insecure mode
+	$token_value = get_config_value($opts{'I'}, $CONF->{'insecure'}, 1);
+	if (defined ($token_value)) {
+		$t_insecure = 1;
+	}
+
+	# Filters (regexp:dir;regexp:dir...)
+	$token_value = get_config_value($opts{'i'}, $CONF->{'filters'});
+	if (defined ($token_value)) {
+		my @filters = split (';', $token_value);
+		foreach my $filter (@filters) {
+			my ($regexp, $dir) = split (':', $filter);
+			next unless defined ($regexp) && defined ($dir);
+
+			# Remove any trailing /
+			my $char = chop ($dir);
+			$dir .= $char if ($char) ne '/';
+
+			push(@t_filters, [$regexp, $dir]);
+		}
+	}
+
+	# SSL private key file
+	$token_value = get_config_value($opts{'k'}, $CONF->{'ssl_key'});
+	if (defined ($token_value)) {
+		$t_ssl_key = $token_value;
+		if (! -f $t_ssl_key) {
+			error ("File $t_ssl_key does not exist.");
+		}
+	}
+
+	# Maximum file size
+	$token_value = get_config_value($opts{'m'}, $CONF->{'max_size'});
+	if (defined ($token_value)) {
+		$t_max_size = $token_value;
+		if ($t_max_size !~ /^\d+$/ || $t_max_size < 1) {
+			error ("Invalid maximum file size.");
+		}
+	}
+
+	# File overwrite
+	$token_value = get_config_value($opts{'o'}, $CONF->{'overwrite'}, 1);
+	if (defined ($token_value)) {
+		$t_overwrite = 1;
+	}
+
+	# Port
+	$token_value = get_config_value($opts{'p'}, $CONF->{'port'});
+	if (defined ($token_value)) {
+		$t_port = $token_value;
+		if ($t_port !~ /^\d+$/ || $t_port < 1 || $t_port > 65535) {
+			error ("Port $t_port is not valid.");
+		}
+	}
+
+	# Quiet mode
+	$token_value = get_config_value($opts{'q'}, $CONF->{'quiet'}, 1);
+	if (defined ($token_value)) {
+		$t_quiet = 1;
+	}
+
+	# Retries
+	$token_value = get_config_value($opts{'r'}, $CONF->{'retries'});
+	if (defined ($token_value)) {
+		$t_retries = $token_value;
+		if ($t_retries !~ /^\d+$/ || $t_retries < 1) {
+			error ("Invalid number of retries for network operations.");
+		}
+	}
+
+	# Storage directory
+	$token_value = get_config_value($opts{'s'}, $CONF->{'directory'});
+	if (defined ($token_value)) {
+
+		$t_directory = $token_value;
+		
+		# Check that directory exists
+		if (! -d $t_directory) {
+			error ("Directory $t_directory does not exist.");
+		}
+
+		# Check directory permissions
+		if (! -w $t_directory) {
+			error ("Cannot write to directory $t_directory.");
+		}
+
+		# Remove the trailing / if present
+		$tmp = chop ($t_directory);
+		if ($tmp ne '/') {
+			$t_directory .= $tmp;
+		}
+	}
+	else {
+		$token_value = get_config_value($opts{'b'}, $CONF->{'proxy_ip'});
+		if (! defined($token_value)) {
+			print_help ();
+			exit 1;
+		}
+	}
+
+	# Timeout
+	$token_value = get_config_value($opts{'t'}, $CONF->{'timeout'});
+	if (defined ($token_value)) {
+		$t_timeout = $token_value;
+		if ($t_timeout !~ /^\d+$/ || $t_timeout < 1) {
+			error ("Invalid timeout for network operations.");
+		}
+	}
+
+	# Read verbose from config file
+	if (defined($CONF->{'verbose'})) {
+		if ($CONF->{'verbose'} eq "1") {
+			$t_log = 1;
+		} elsif ($CONF->{'verbose'} eq "2") {
+			$t_log = 1;
+			$t_log_hard = 1;
+		}
+	}
+	# Be verbose
+	if (defined ($opts{'v'})) {
+		$t_log = 1;
+		$t_log_hard = 0;
+	}
+	# Be verbose hard
+	if (defined ($opts{'V'})) {
+		$t_log = 1;
+		$t_log_hard = 1;
+	}
+
+	# SSL private key password
+	$token_value = get_config_value($opts{'w'}, $CONF->{'ssl_password'}, 1);
+	if (defined ($token_value)) {
+		$t_ssl_pwd = ask_passwd ("Enter private key file password: ", "Enter private key file password again for confirmation: ");
+	}
+
+	# Server password
+	$token_value = get_config_value($opts{'x'}, $CONF->{'password'});
+	if (defined ($token_value)) {
+		$t_pwd = $token_value;
+	}
+	
+	#Proxy IP address
+	$token_value = get_config_value($opts{'b'}, $CONF->{'proxy_ip'});
+	if (defined ($token_value)) {
+		$t_proxy_ip = $token_value;
+		if ($t_proxy_ip !~ /^[a-zA-Z\.]+$/ && ($t_proxy_ip  !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
+			|| $1 < 0 || $1 > 255 || $2 < 0 || $2 > 255
+			|| $3 < 0 || $3 > 255 || $4 < 0 || $4 > 255) &&
+			$t_proxy_ip !~ /^[0-9a-f:]+$/o) {
+			error ("Proxy address $t_proxy_ip is not valid.");
+		}		
+	}
+	
+	# Proxy Port
+	$token_value = get_config_value($opts{'g'}, $CONF->{'proxy_port'});
+	if (defined ($token_value)) {
+		$t_proxy_port = $token_value;
+		if ($t_proxy_port !~ /^\d+$/ || $t_proxy_port < 1 || $t_proxy_port > 65535) {
+			error ("Proxy port $t_port is not valid.");
+		}
+	}	
+
+	# TCP wrappers support
+	$token_value = get_config_value($opts{'T'}, $CONF->{'use_libwrap'}, 1);
+	if (defined ($token_value)) {
+		if ($t_libwrap_installed) {
+			$t_use_libwrap = 1;
+		} else {
+			error ("Authen::Libwrap is not installed.");
+		}
+	}
+
+	# Win32 service management
+	if (defined ($opts{'S'})) {
+		my $service_action = $opts{'S'};
+		if ($^O ne 'MSWin32') {
+			error ("Windows services are only available on Win32.");
+		} else {
+			eval "use Win32::Daemon";
+			die($@) if ($@);
+
+			if ($service_action eq 'run') {
+				Win32::Daemon::RegisterCallbacks({
+			        start       =>  \&callback_start,
+			        running     =>  \&callback_running,
+			        stop        =>  \&callback_stop,
+				});
+				Win32::Daemon::StartService();
+				exit 0;
+			} else {
+				error("Unknown action: $service_action");
+			}
+		}
+	}
+	
+	# Get the config file
+	$token_value = get_config_value($opts{'l'}, $CONF->{'log_file'});
+	if (defined ($token_value)) {
+		$log_file = $token_value;
+	}
+
+	# No command lines config values
+
+	# Get the block size
+	if (defined ($CONF->{'block_size'})) {
+		if ($t_port !~ /^\d+$/ || $t_port < 1) {
+			error ("Invalid block size: " . $CONF->{'block_size'} . ".");
+		}
+		$t_block_size = $CONF->{'block_size'};
+	}
+
+	# Configuration file invalid chars
+	if (defined ($CONF->{'invalid_chars'})) {
+		$t_invalid_chars = $CONF->{'invalid_chars'};
+	}
+}
+
+################################################################################
+## SUB parse_config_file
+## Get all options from a config file.
+################################################################################
+sub parse_config_file {
+	my ($config_file, $CONF) = @_;
+
+	# File should be writable
+	if (! -r $config_file) {
+		print "Configuration file $config_file is not readable.\n";
+		return;
+	}
+
+	# Open the file
+	my $FH;
+	if (! open ($FH, "< $config_file")) {
+		print "Cannot open configuration file $config_file.\n";
+		return;
+	}
+
+	# Read the file and only get the well formed lines
+	while (<$FH>) {
+		my $buffer_line = $_;
+		if ($buffer_line =~ /^[a-zA-Z]/){ # begins with letters
+			if ($buffer_line =~ m/([\w\-\_\.]+)\s+(.*)/){
+				$CONF->{$1} = $2 unless $2 eq "";
+			}
+		}
+	}
+
+ 	close ($FH);
+	return;
+}
+
+################################################################################
+## SUB parse_config_file
+## Search in command line options and config hash from configuration file
+## to get a value (command line is a priority)
+################################################################################
+sub get_config_value {
+	my ($cmd_value, $conf_value, $bool) = @_;
+	$bool = 0 unless defined($bool);
+
+	return $cmd_value if defined($cmd_value);
+	# The boolean type value is 1 or undef (0 should be translated like undefP)
+	if ($bool && defined($conf_value)) {
+		return undef if ($conf_value ne "1");
+	}
+	return $conf_value;
+}
+
+################################################################################
+## SUB start_proxy
+## Open the proxy server socket.
+################################################################################
+sub start_proxy {
+
+	# Connect to server
+	$t_proxy_socket = $SOCKET_MODULE->new (
+	    PeerAddr => $t_proxy_ip,
+		PeerPort => $t_proxy_port,
+	);
+
+	if (! defined ($t_proxy_socket)) {
+		error ("Cannot connect to $t_proxy_ip on port $t_proxy_port: $!.");
+	}
+	
+	# Create proxy selector
+	$t_proxy_select = IO::Select->new ();
+	$t_proxy_select->add ($t_proxy_socket);
+	
+}
+
+################################################################################
+## SUB start_server
+## Open the server socket.
+################################################################################
+sub start_server {
+
+	my $t_server_socket;
+
+	foreach my $t_address (@t_addresses) {
+
+		$t_server_socket = $SOCKET_MODULE->new (
+			Listen    => $t_max_conn,
+			LocalAddr => $t_address,
+			LocalPort => $t_port,
+			Proto     => 'tcp',
+			ReuseAddr     => 1,
+		);
+
+		if (! defined ($t_server_socket)) {
+			print_log ("Cannot open socket for address $t_address on port $t_port: $!.");
+			next;
+		}
+
+		print_log ("Server listening on $t_address port $t_port (press <ctr-c> to stop)");
+	
+		# Say message if tentacle proxy is enable
+		if (defined ($t_proxy_ip)) {
+			print_log ("Proxy Mode enable, data will be sent to $t_proxy_ip port $t_proxy_port");	
+		}
+	
+		push @t_server_sockets, $t_server_socket;
+	}
+
+	if (!@t_server_sockets) {
+		error ("Cannot open socket for all addresses on port $t_port: $!.");
+	}
+	
+	$t_server_select = IO::Select->new();
+	foreach my $t_server_socket (@t_server_sockets){
+		$t_server_select->add($t_server_socket);
+ 	}
+}
+
+################################################################################
+## SUB send_data_proxy
+## Send data to proxy socket.
+################################################################################
+sub send_data_proxy {
+	my $data = $_[0];
+	my $block_size;
+	my $retries = 0;
+	my $size;
+	my $total = 0;
+	my $written;
+
+	$size = length ($data);
+
+	while (1) {
+
+		# Try to write data to the socket
+		if ($t_proxy_select->can_write ($t_timeout)) {
+
+			$block_size = ($size - $total) > $t_block_size ? $t_block_size : ($size - $total);
+			$written = syswrite ($t_proxy_socket, $data, $size - $total, $total);
+
+			# Write error
+			if (! defined ($written)) {
+				error ("Connection error from " . $t_proxy_socket->sockhost () . ": $!.");
+			}
+			
+			# EOF
+			if ($written == 0) {
+				error ("Connection from " . $t_proxy_socket->sockhost () . " unexpectedly closed.");
+			}
+	
+			$total += $written;
+
+			# Check if all data was written
+			if ($total == $size) {
+				return;
+			}
+		}
+		# Retry
+		else {
+			$retries++;
+			if ($retries > $t_retries) {
+				error ("Connection from " . $t_proxy_socket->sockhost () . " timed out.");
+			}
+		}
+	}
+}
+
+################################################################################
+## SUB close_proxy
+## Close the proxy socket.
+################################################################################
+sub close_proxy {
+	$t_proxy_socket->shutdown (2);
+	$t_proxy_socket->close ();
+}
+
+################################################################################
+## SUB stop_server
+## Close the server socket.
+################################################################################
+sub stop_server {
+
+	foreach my $t_server_socket (@t_server_sockets) {
+		$t_server_socket->shutdown (2);
+		$t_server_socket->close ();
+	}
+	print_log ("Server going down");
+	
+	exit 0;
+}
+
+################################################################################
+## SUB start_ssl
+## Convert the client socket to an IO::Socket::SSL socket.
+################################################################################
+sub start_ssl {
+	my $err;
+
+	if ($t_ssl_ca eq '') {
+		IO::Socket::SSL->start_SSL (
+			$t_client_socket,
+			SSL_cert_file => $t_ssl_cert,
+			SSL_key_file => $t_ssl_key,
+			SSL_passwd_cb => sub {return $t_ssl_pwd},
+			SSL_server => 1,
+			# Verify peer
+			SSL_verify_mode => 0x01,
+		);
+	}
+	else {
+		IO::Socket::SSL->start_SSL (
+			$t_client_socket,
+			SSL_ca_file => $t_ssl_ca,
+			SSL_cert_file => $t_ssl_cert,
+			SSL_key_file => $t_ssl_key,
+			SSL_passwd_cb => sub {return $t_ssl_pwd},
+			SSL_server => 1,
+			# Fail verification if no peer certificate exists
+			SSL_verify_mode => 0x03,
+		);
+	}
+
+	$err = IO::Socket::SSL::errstr ();
+	if ($err ne '') {
+		error ($err);
+	}
+
+	print_log ("SSL started for " . $t_client_socket->sockhost ());
+}
+
+################################################################################
+## SUB accept_connections
+## Manage incoming connections.
+################################################################################
+sub accept_connections {
+	my $pid;
+	my $t_server_socket;
+
+	# Ignore SIGPIPE
+	$SIG{PIPE} = 'IGNORE';
+
+	# Start server
+	start_server ();
+
+	# Initialize semaphore
+	$t_sem = Thread::Semaphore->new ($t_max_conn);
+
+	while (1) {
+		my @ready = $t_server_select->can_read;
+		foreach $t_server_socket (@ready) {
+
+			# Accept connection
+			$t_client_socket = $t_server_socket->accept ();
+
+			if (! defined ($t_client_socket)) {
+				next if ($! ne ''); # EINTR
+				error ("accept: $!.");
+			}
+
+			print_info ("Client connected from " . $t_client_socket->peerhost ());
+
+			if ($t_use_libwrap && (! hosts_ctl($t_program_name, $t_client_socket))) {
+				print_log ("Connection from " . $t_client_socket->peerhost() . " is closed by tcpwrappers.");
+				$t_client_socket->shutdown (2);
+				$t_client_socket->close();
+			}
+			else {
+
+				# Create a new thread and serve the client
+				$t_sem->down();
+				my $thr = threads->create(\&serve_client);
+				if (! defined ($thr)) {
+					error ("Error creating thread: $!.");
+				}
+				$thr->detach();
+				$t_client_socket->close ();
+			}
+		}
+
+		usleep (1000);
+	}
+}
+
+################################################################################
+## SUB serve_client
+## Serve a connected client.
+################################################################################
+sub serve_client() {
+
+	eval {		
+		# Add client socket to select queue
+		$t_select = IO::Select->new ();
+		$t_select->add ($t_client_socket);
+			
+		# Start SSL
+		if ($t_ssl == 1) {
+			start_ssl ();
+		}
+	
+		# Authenticate client
+		if ($t_pwd ne '') {
+			auth_pwd ();
+		}
+	
+		# Check if proxy mode is enable
+		if (defined ($t_proxy_ip)) {
+			serve_proxy_connection ();	
+		} else {
+			serve_connection ();
+		}
+	};
+
+	$t_client_socket->shutdown (2);
+	$t_client_socket->close ();
+	$t_sem->up();
+}
+
+################################################################################
+## SUB serve_proxy_connection
+## Actuate as a proxy between its client and other tentacle server.
+################################################################################
+sub serve_proxy_connection {
+	
+	# We are a proxy! Start a connection to the Tentacle Server.
+	start_proxy();
+
+	# Forward data between the client and the server.
+	eval {
+		my $select = IO::Select->new ();
+		$select->add($t_proxy_socket);
+		$select->add($t_client_socket);
+		while (my @ready = $select->can_read()) {
+			foreach my $socket (@ready) {
+				if (refaddr($socket) == refaddr($t_client_socket)) {
+					my ($read, $data) = recv_data($t_block_size);
+					return unless defined($data);
+					send_data_proxy($data);
+				}
+				else {
+					my ($read, $data) = recv_data_proxy($t_block_size);
+					return unless defined($data);
+					send_data($data);
+				}
+			}
+		}
+	};
+
+	# Close the connection to the Tentacle Server.
+	close_proxy();
+}
+
+################################################################################
+## SUB serve_connection
+## Read and process commands from the client.
+################################################################################
+sub serve_connection {
+	my $command;
+
+	# Read commands
+	while ($command = recv_command ($t_block_size)) {
+		
+		# Client wants to send a file
+		if ($command =~ /^SEND <(.*)> SIZE (\d+)$/) {
+			print_info ("Request to send file '$1' size ${2}b from " . $t_client_socket->sockhost ());
+			recv_file ($1, $2);
+		}
+		# Client wants to receive a file
+		elsif ($command =~ /^RECV <(.*)>$/) {
+			print_info ("Request to receive file '$1' from " . $t_client_socket->sockhost ());
+			send_file ($1);
+		}
+		elsif ($command =~ /^ZSEND <(.*)> SIZE (\d+)$/) {
+			print_info ("Request to send compressed file '$1' size ${2}b from " . $t_client_socket->sockhost ());
+			zrecv_file ($1, $2);
+		}
+		# Client wants to receive a file
+		elsif ($command =~ /^ZRECV <(.*)>$/) {
+			print_info ("Request to receive compressed file '$1' from " . $t_client_socket->sockhost ());
+			zsend_file ($1);
+		}
+		# Quit
+		elsif ($command =~ /^QUIT$/) {
+			print_info ("Connection closed from " . $t_client_socket->sockhost ());
+			last;
+		}
+		# File listing.
+		elsif ($command =~ /^LS <(.*)>$/) {
+			if ($t_insecure == 0) {
+				print_info ("Insecure mode disabled. Rejected request to list files matched by filter $1 from " . $t_client_socket->sockhost ());
+				last;
+			}
+
+			print_info ("Request to list files matched by filter $1 from " . $t_client_socket->sockhost ());
+			send_file_list ($1);
+		}
+		# Client wants to move a file
+		elsif ($command =~ /^MV <(.*)>$/) {
+			if ($t_insecure == 0) {
+				print_info ("Insecure mode disabled. Rejected request to move file $1 from " . $t_client_socket->sockhost ());
+				last;
+			}
+
+			print_info ("Request to move file '$1' from " . $t_client_socket->sockhost ());
+			move_file ($1);
+		}
+		# Unknown command
+		else {
+			print_log ("Unknown command '$command' from " . $t_client_socket->sockhost ());
+			last;
+		}
+	}
+}
+
+################################################################################
+## SUB auth_pwd
+## Authenticate client with server password.
+################################################################################
+sub auth_pwd {
+	my $client_digest;
+	my $command;
+	my $pwd_digest;
+
+	require Digest::MD5;
+	
+	# Wait for password
+	$command = recv_command ($t_block_size);
+	if ($command !~ /^PASS (.*)$/) {
+		error ("Client " . $t_client_socket->sockhost () . " did not authenticate.");
+	}
+	
+	$client_digest = $1;
+	$pwd_digest = Digest::MD5::md5 ($t_pwd);
+	$pwd_digest = Digest::MD5::md5_hex ($pwd_digest);
+
+	if ($client_digest ne $pwd_digest) {
+		error ("Invalid password from " . $t_client_socket->sockhost () . ".");
+	}
+
+	print_log ("Client " . $t_client_socket->sockhost () . " authenticated");
+	send_data ("PASS OK\n");
+}
+
+################################################################################
+## SUB recv_file
+## Receive a file of size $_[1] and save it in $t_directory as $_[0].
+################################################################################
+sub recv_file {
+	my $base_name = $_[0];
+	my $data = '';
+	my $file;
+	my $size = $_[1];
+
+	# Check file name
+	if ($base_name =~ /[$t_invalid_chars]/) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name");
+		send_data ("SEND ERR (invalid file name)\n");
+		return;
+	}
+
+	# Check file size, empty files are not allowed
+	if ($size < 1 || $size > $t_max_size) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big");
+		send_data ("SEND ERR (file is too big)\n");
+		return;
+	}
+	
+	# Apply filters
+	$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
+
+	# Check if file exists
+	if (-f $file && $t_overwrite == 0) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists");
+		send_data ("SEND ERR (file already exists)\n");
+		return;
+	}
+
+	send_data ("SEND OK\n");
+
+	# Receive file
+	$data = recv_data_block ($size);
+
+	# Write it to disk
+	open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
+	binmode (FILE);
+	print (FILE $data);
+	close (FILE);
+
+	send_data ("SEND OK\n");
+	print_info ("Received file '$base_name' size ${size}b from " . $t_client_socket->sockhost ());
+}
+
+################################################################################
+## SUB zrecv_file
+## Receive a compressed file of size $_[1] and save it in $t_directory as $_[0].
+################################################################################
+sub zrecv_file {
+	my $base_name = $_[0];
+	my $data = '';
+	my $file;
+	my $size = $_[1];
+	my $zdata = '';
+
+	# Check file name
+	if ($base_name =~ /[$t_invalid_chars]/) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " has an invalid file name");
+		send_data ("ZSEND ERR (invalid file name)\n");
+		return;
+	}
+
+	# Check file size, empty files are not allowed
+	if ($size < 1 || $size > $t_max_size) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " is too big");
+		send_data ("ZSEND ERR (file is too big)\n");
+		return;
+	}
+	
+	# Apply filters
+	$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
+
+	# Check if file exists
+	if (-f $file && $t_overwrite == 0) {
+		print_log ("File '$base_name' size ${size}b from " . $t_client_socket->sockhost () . " already exists");
+		send_data ("ZSEND ERR (file already exists)\n");
+		return;
+	}
+
+	send_data ("ZSEND OK\n");
+
+	# Receive file
+	$zdata = recv_data_block ($size);
+	if (!unzip(\$zdata => \$data)) {
+		print_log ("Uncompress error: $UnzipError");
+		send_data ("ZSEND ERR\n");
+		return;
+	}
+
+	# Write it to disk
+	open (FILE, "> $file") || error ("Cannot open file '$file' for writing.");
+	binmode (FILE);
+	print (FILE $data);
+	close (FILE);
+
+	send_data ("ZSEND OK\n");
+	print_info ("Received compressed file '$base_name' size ${size}b from " . $t_client_socket->sockhost ());
+}
+
+################################################################################
+## SUB send_file
+## Send a file to the client
+################################################################################
+sub send_file {
+	my $base_name = $_[0];
+	my $data = '';
+	my $file;
+	my $response;
+	my $size;
+
+	# Check file name
+	if ($base_name =~ /[$t_invalid_chars]/) {
+		print_log ("Requested file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
+		send_data ("RECV ERR (file has an invalid file name)\n");
+		return;
+	}
+	
+	# Apply filters
+	$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
+
+	# Check if file exists
+	if (! -f $file) {
+		print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " does not exist");
+		send_data ("RECV ERR (file does not exist)\n");
+		return;
+	}
+
+	$size = -s $file;
+	send_data ("RECV SIZE $size\n");
+	
+	# Wait for client response
+	$response = recv_command ($t_block_size);
+	if ($response ne "RECV OK") {
+		print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " not sent");
+		return;
+	}
+
+	# Send the file
+	open (FILE, $file) || error ("Cannot open file '$file' for reading.");
+	binmode (FILE);
+	{
+		local $/ = undef;
+		$data = <FILE>;
+	}
+
+	send_data ($data);
+	close (FILE);
+
+	print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " sent");
+}
+
+################################################################################
+## SUB zsend_file
+## Send a file to the client
+################################################################################
+sub zsend_file {
+	my $base_name = $_[0];
+	my $data = '';
+	my $file;
+	my $response;
+	my $size;
+
+	# Check file name
+	if ($base_name =~ /[$t_invalid_chars]/) {
+		print_log ("Requested compressed file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
+		send_data ("ZRECV ERR (file has an invalid file name)\n");
+		return;
+	}
+	
+	# Apply filters
+	$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
+
+	# Check if file exists
+	if (! -f $file) {
+		print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " does not exist");
+		send_data ("ZRECV ERR (file does not exist)\n");
+		return;
+	}
+
+	# Read the file and compress its contents
+	if (! zip($file => \$data)) {
+		send_data ("QUIT\n");
+		error ("Compression error: $ZipError");
+		return;
+	}
+
+	$size = length($data);
+	send_data ("ZRECV SIZE $size\n");
+	
+	# Wait for client response
+	$response = recv_command ($t_block_size);
+	if ($response ne "ZRECV OK") {
+		print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " not sent");
+		return;
+	}
+
+	# Send the file
+	send_data ($data);
+
+	print_log ("Requested compressed '$file' from " . $t_client_socket->sockhost () . " sent");
+}
+
+################################################################################
+# Common functions
+################################################################################
+
+################################################################################
+## SUB print_log
+## Print log messages.
+################################################################################
+sub print_log($) {
+
+	my ($msg) = @_;
+	
+	return unless ($t_log == 1);
+	
+	my $fh = *STDOUT;
+	if (defined($log_file)) {
+		open($fh, ">>", $log_file) || die("Starting log failed: $!.\n");
+	}
+
+	print ($fh strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "[log]$msg.\n");
+
+	close ($fh) if (defined($log_file));
+
+}
+
+################################################################################
+## SUB print_log
+## Print log messages.
+################################################################################
+sub print_info($) {
+
+	my ($msg) = @_;
+	
+	return unless ($t_log_hard == 1);
+	
+	my $fh = *STDOUT;
+	if (defined($log_file)) {
+		open($fh, ">>", $log_file) || die("Starting log failed: $!.\n");
+	}
+
+	print ($fh strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "[info]$msg.\n");
+
+	close ($fh) if (defined($log_file));
+
+}
+
+################################################################################
+## SUB error
+## Print an error and exit the program.
+################################################################################
+sub error {
+
+	my ($msg) = @_;
+	
+	return unless ($t_quiet == 0);
+
+	my $fh = *STDERR;
+	if (defined($log_file)) {
+		open($fh, ">>", $log_file) || die("$!\n");
+	}
+
+	print ($fh strftime ("%Y-%m-%d %H:%M:%S", localtime()) . "[err]$msg\n");
+
+	close ($fh) if (defined($log_file));
+
+	die("\n");
+}
+
+################################################################################
+## SUB move_file
+## Send a file to the client and delete it
+################################################################################
+sub move_file {
+	my $base_name = $_[0];
+	my $data = '';
+	my $file;
+	my $response;
+	my $size;
+
+	# Check file name
+	if ($base_name =~ /[$t_invalid_chars]/) {
+		print_log ("Requested file '$base_name' from " . $t_client_socket->sockhost () . " has an invalid file name");
+		send_data ("MV ERR\n");
+		return;
+	}
+	
+	# Apply filters
+	$file = "$t_directory/" . apply_filters ($base_name) . $base_name;
+
+	# Check if file exists
+	if (! -f $file) {
+		print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " does not exist");
+		send_data ("MV ERR\n");
+		return;
+	}
+
+	$size = -s $file;
+	send_data ("MV SIZE $size\n");
+	
+	# Wait for client response
+	$response = recv_command ($t_block_size);
+	if ($response ne "MV OK") {
+		print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " not sent");
+		return;
+	}
+
+	# Send the file
+	open (FILE, $file) || error ("Cannot open file '$file' for reading.");
+	binmode (FILE);
+
+	while ($data = <FILE>) {
+		send_data ($data);
+	}
+
+	close (FILE);
+	unlink($file);
+
+	print_log ("Requested file '$file' from " . $t_client_socket->sockhost () . " sent and deleted");
+}
+
+################################################################################
+## SUB send_file_list
+## Send a list of files to the client after applying the given filter.
+################################################################################
+sub send_file_list {
+	my $filter = $_[0];
+	my $data = '';
+	my $dir;
+	my $dh;
+	my $response;
+	my $size;
+
+	# Check file name
+	if ($filter =~ /[$t_invalid_chars]/) {
+		print_log ("Invalid file listing filter '$filter' from " . $t_client_socket->sockhost ());
+		send_data ("LS ERR\n");
+		return;
+	}
+	
+	# Apply filters
+	$dir = "$t_directory/" . apply_filters ($filter);
+
+	# Open the directory.
+	if (! opendir ($dh, $dir)) {
+		print_log ("Error opening directory $dir as requested from " . $t_client_socket->sockhost () . ": $!");
+		send_data ("LS ERR\n");
+		return;
+	}
+
+	# List files.
+	while (my $file = readdir ($dh)) {
+		next if ($file =~ /[$t_invalid_chars]/); # Only list files valid for Tentacle.
+		$data .= "$file\n";
+	}
+	closedir $dh;
+
+	$size = length ($data);
+	send_data ("LS SIZE $size\n");
+	
+	# Wait for client response
+	$response = recv_command ($t_block_size);
+	if ($response ne "LS OK") {
+		print_log ("Requested directory listing from " . $t_client_socket->sockhost () . " not sent");
+		return;
+	}
+
+	send_data ($data);
+
+	print_log ("Requested directory listing from " . $t_client_socket->sockhost () . " sent");
+}
+
+################################################################################
+## SUB recv_data_proxy
+## Recv data from proxy socket.
+################################################################################
+sub recv_data_proxy {
+	my $data;
+	my $read;
+	my $retries = 0;
+	my $size = $_[0];
+
+	while (1) {
+
+		# Try to read data from the socket
+		if ($t_proxy_select->can_read ($t_timeout)) {
+			
+			# Read at most $size bytes
+			$read = sysread ($t_proxy_socket, $data, $size);
+
+			# Read error
+			if (! defined ($read)) {
+				error ("Read error from " . $t_proxy_socket->sockhost () . ": $!.");
+			}
+	
+			# EOF
+			if ($read == 0) {
+				error ("Connection from " . $t_proxy_socket->sockhost () . " unexpectedly closed.");
+			}
+	
+			return ($read, $data);
+		}
+
+		# Retry
+		$retries++;
+
+		# But check for error conditions first
+		if ($retries > $t_retries) {
+			error ("Connection from " . $t_proxy_socket->sockhost () . " timed out.");
+		}
+	}
+}
+################################################################################
+## SUB recv_data
+## Read data from the client socket. Returns the number of bytes read and the
+## string of bytes as a two element array.
+################################################################################
+sub recv_data {
+	my $data;
+	my $read;
+	my $retries = 0;
+	my $size = $_[0];
+
+	while (1) {
+
+		# Try to read data from the socket
+		if ($t_select->can_read ($t_timeout)) {
+			
+			# Read at most $size bytes
+			$read = sysread ($t_client_socket, $data, $size);
+
+			# Read error
+			if (! defined ($read)) {
+				error ("Read error from " . $t_client_socket->sockhost () . ": $!.");
+			}
+	
+			# EOF
+			if ($read == 0) {
+				error ("Connection from " . $t_client_socket->sockhost () . " unexpectedly closed.");
+			}
+	
+			return ($read, $data);
+		}
+
+		# Retry
+		$retries++;
+
+		# But check for error conditions first
+		if ($retries > $t_retries) {
+			error ("Connection from " . $t_client_socket->sockhost () . " timed out.");
+		}
+	}
+}
+
+################################################################################
+## SUB send_data
+## Write data to the client socket.
+################################################################################
+sub send_data {
+	my $data = $_[0];
+	my $block_size;
+	my $retries = 0;
+	my $size;
+	my $total = 0;
+	my $written;
+
+	$size = length ($data);
+
+	while (1) {
+
+		# Try to write data to the socket
+		if ($t_select->can_write ($t_timeout)) {
+
+			$block_size = ($size - $total) > $t_block_size ? $t_block_size : ($size - $total);
+			$written = syswrite ($t_client_socket, $data, $block_size, $total);
+
+			# Write error
+			if (! defined ($written)) {
+				error ("Connection error from " . $t_client_socket->sockhost () . ": $!.");
+			}
+			
+			# EOF
+			if ($written == 0) {
+				error ("Connection from " . $t_client_socket->sockhost () . " unexpectedly closed.");
+			}
+	
+			$total += $written;
+
+			# Check if all data was written
+			if ($total == $size) {
+				return;
+			}
+		}
+		# Retry
+		else {
+			$retries++;
+			if ($retries > $t_retries) {
+				error ("Connection from " . $t_client_socket->sockhost () . " timed out.");
+			}
+		}
+	}
+}
+
+################################################################################
+## SUB recv_command
+## Read a command from the client, ended by a new line character.
+################################################################################
+sub recv_command {
+	my $buffer;
+	my $char;
+	my $command = '';
+	my $read;
+	my $total = 0;
+
+	while (1) {
+		
+		($read, $buffer) = recv_data ($t_block_size);
+		$command .= $buffer;
+		$total += $read;
+
+		# Check if the command is complete
+		$char = chop ($command);
+		if ($char eq "\n") {
+			return $command;
+		}
+	
+		$command .= $char;
+
+		# Avoid overflow
+		if ($total > $t_block_size) {
+			error ("Received too much data from " . $t_client_socket->sockhost () . ".");
+		}
+	}
+}
+
+################################################################################
+## SUB recv_data_block
+## Read $_[0] bytes of data from the client.
+################################################################################
+sub recv_data_block {
+	my $buffer = '';
+	my $data = '';
+	my $read;
+	my $size = $_[0];
+	my $total = 0;
+
+	while (1) {
+
+		($read, $buffer) = recv_data ($size - $total);
+		$data .= $buffer;
+		$total += $read;
+
+		# Check if all data has been read
+		if ($total == $size) {
+			return $data;
+		}
+	}
+}
+
+################################################################################
+## SUB ask_passwd
+## Asks the user for a password.
+################################################################################
+sub ask_passwd {
+	my $msg1 = $_[0];
+	my $msg2 = $_[1];
+	my $pwd1;
+	my $pwd2;
+
+	require Term::ReadKey;
+
+	# Disable keyboard echo
+	Term::ReadKey::ReadMode('noecho');
+	
+	# Promt for password
+	print ($msg1);
+	$pwd1 = Term::ReadKey::ReadLine(0);
+	print ("\n$msg2");
+	$pwd2 = Term::ReadKey::ReadLine(0);
+	print ("\n");
+
+	# Restore original settings
+	Term::ReadKey::ReadMode('restore');
+
+	if ($pwd1 ne $pwd2) {
+		print ("Error: passwords do not match.\n");
+		exit 1;
+	}
+
+	# Remove the trailing new line character
+	chop $pwd1;
+
+	return $pwd1;
+}
+
+################################################################################
+## SUB apply_filters
+## Applies filters to the given file.
+################################################################################
+sub apply_filters ($) {
+	my ($file_name) = @_;
+
+	foreach my $filter (@t_filters) {
+		my ($regexp, $dir) = @{$filter};
+		if ($file_name =~ /$regexp/) {
+			print_log ("File '$file_name' matches filter '$regexp' (changing to directory '$dir')");
+			return $dir . '/';
+		}
+	}
+
+	return '';
+}
+
+################################################################################
+## SUB install_service
+## Install the Windows service.
+################################################################################
+sub install_service() {
+
+	my $service_path = $0;
+	my $service_params = $SERVICE_PARAMS;
+
+	# Change the service parameter from 'install' to 'run'.
+	$service_params =~ s/\-S\s+\S+/\-S run/;
+
+	my %service_hash = (
+		machine =>  '',
+		name	=>  'TENTACLESRV',
+		display =>  $SERVICE_NAME,
+		path	=>  $service_path,
+		user	=>  '',
+		pwd	 =>  '',
+		description => 'Tentacle Server http://sourceforge.net/projects/tentacled/',
+		parameters => $service_params
+	);
+	
+	if (Win32::Daemon::CreateService(\%service_hash)) {
+		print "Successfully added.\n";
+		exit 0;
+	} else {
+		print "Failed to add service: " . Win32::FormatMessage(Win32::Daemon::GetLastError()) . "\n";
+		exit 1;
+	}
+}
+
+################################################################################
+## SUB uninstall_service
+## Install the Windows service.
+################################################################################
+sub uninstall_service() {
+	if (Win32::Daemon::DeleteService('', 'TENTACLESRV')) {
+		print "Successfully deleted.\n";
+		exit 0;
+	} else {
+		print "Failed to delete service: " . Win32::FormatMessage(Win32::Daemon::GetLastError()) . "\n";
+		exit 1;
+	}
+}
+
+################################################################################
+## SUB callback_running
+## Windows service callback function for the running event.
+################################################################################
+sub callback_running {
+
+	if (Win32::Daemon::State() == WIN32_SERVICE_RUNNING) {
+	}
+}
+
+################################################################################
+## SUB callback_start
+## Windows service callback function for the start event.
+################################################################################
+sub callback_start {
+
+	# Accept_connections ();
+	my $thr = threads->create(\&accept_connections);
+	if (!defined($thr)) {
+		Win32::Daemon::State(WIN32_SERVICE_STOPPED);
+		Win32::Daemon::StopService();
+		return;
+	}
+	$thr->detach();
+
+	Win32::Daemon::State(WIN32_SERVICE_RUNNING);
+}
+
+################################################################################
+## SUB callback_stop
+## Windows service callback function for the stop event.
+################################################################################
+sub callback_stop {
+
+	foreach my $t_server_socket (@t_server_sockets) {
+		$t_server_socket->shutdown (2);
+		$t_server_socket->close ();
+	}
+
+	Win32::Daemon::State(WIN32_SERVICE_STOPPED);
+	Win32::Daemon::StopService();
+}
+
+
+################################################################################
+## SUB check_ssleay_version
+## Print a message if the installed version of Net::SSLeay may leak memory.
+################################################################################
+sub check_ssleay_version {
+	eval {
+		require Net::SSLeay;
+		return unless defined($Net::SSLeay::VERSION) && $Net::SSLeay::VERSION =~ m/^(\d+)\.(\d+)/ && $1 <= 1 && $2 < 88;
+		print_log ("Net::SSLeay version $Net::SSLeay::VERSION detected. Versions prior to 1.88 may leak memory. To upgrade it see: https://metacpan.org/pod/Net::SSLeay");
+	};
+}
+
+################################################################################
+# Main
+################################################################################
+
+# Never run as root
+if ($> == 0 && $^O ne 'MSWin32') {
+	print ("Error: for safety reasons $0 cannot be run with root privileges.\n");
+	exit 1;
+}
+
+# Parse command line options
+parse_options ();
+
+# Check command line arguments
+if ($#ARGV != -1) {
+	print_help ();
+	exit 1;
+}
+
+check_ssleay_version() if $t_ssl == 1;
+
+# Show IPv6 status
+if ($SOCKET_MODULE eq 'IO::Socket::INET') {
+	print_log ("IO::Socket::INET6 is not found. IPv6 is disabled.");
+}
+
+# Run as daemon?
+if ($t_daemon == 1 && $^O ne 'MSWin32') {
+	daemonize ();
+}
+
+# Handle ctr-c
+if ($^O eq 'MSWin32') {
+	no warnings;
+	$SIG{INT2} = \&stop_server;
+	use warnings;
+}
+else {
+	$SIG{INT} = \&stop_server;
+}
+
+# Accept connections
+accept_connections();
+
+__END__
+
+=head1 REQUIRED ARGUMENTES
+
+=over 
+
+=item B<< -s F<storage_directory> >>	Root directory to store the files received by the server
+
+=back 
+
+=head1 OPTIONS
+
+=over
+
+=item 	I<-a ip_address>	Address to B<listen> on (default I<0.0.0.0>).
+
+=item	I<-c number>		B<Maximum> number of simultaneous B<connections> (default I<10>).
+
+=item	I<-d>			Run as B<daemon>.
+
+=item	I<-e cert>		B<OpenSSL certificate> file. Enables SSL.
+
+=item	I<-f ca_cert>	Verify that the peer certificate is signed by a B<CA>.
+
+=item	I<-h>			Show B<help>.
+
+=item	I<-i>			B<Filters>.
+
+=item	I<-k key>		B<OpenSSL private key> file.
+
+=item	I<-m size>		B<Maximum file size> in bytes (default I<2000000b>).
+
+=item	I<-o>			Enable file B<overwrite>.
+
+=item	I<-p port>		B<Port to listen> on (default I<41121>).
+
+=item	I<-q>			B<Quiet>. Do now print error messages.
+
+=item	I<-r number>		B<Number of retries> for network opertions (default I<3>).
+
+=item	I<-t time>		B<Time-out> for network operations in B<seconds> (default I<1s>).
+
+=item	I<-v>			Be B<verbose>.
+
+=item	I<-w>			Prompt for B<OpenSSL private key password>.
+
+=item	I<-x> pwd		B<Server password>.
+
+=back
+
+=head1 EXIT STATUS
+
+=over 
+
+=item 0 on Success
+
+=item 1 on Error
+
+=back 
+
+=head1 CONFIGURATION
+
+Tentacle doesn't use any configurationf files, all the configuration is done by the options passed when it's started.
+
+=head1 DEPENDENCIES
+
+L<Getopt::Std>, L<IO::Select>, L<IO::Socket::INET>, L<Thread::Semaphore>, L<POSIX> 
+
+
+=head1 LICENSE
+
+This is released under the GNU Lesser General Public License.
+
+=head1 SEE ALSO
+
+L<Getopt::Std>, L<IO::Select>, L<IO::Socket::INET>, L<Thread::Semaphore>, L<POSIX> 
+
+Protocol description and more info at: L<< https://pandorafms.com/docs/index.php?title=Pandora:Documentation_en:Tentacle >>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2005-2010 Artica Soluciones Tecnologicas S.L
+
+=cut
+